GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86: Rename bootblock.S to bootblock_romcc.S 

bootblock.S was used strictly for setting up the system so that the
assembly generated by ROMCC could be executed. Since the
infrastructure now exists to run a bootblock wihtout ROMCC, rename
this file accordingly. this is done to prevent any future confusion.

Change-Id: Icbf5804b66b9517f9ceb352bed86978dcf92228f
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-on: https://review.coreboot.org/11784
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Alexandru Gagniuc 2015-10-02 12:42:26 -07:00 committed by Stefan Reinauer
parent 3141eac900
commit f8e491339f
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/arch/x86/Makefile.inc
View File

@ -107,9 +107,6 @@ bootblock-y += memcpy.c
bootblock-y += memset.c bootblock-y += memset.c
bootblock-y += mmap_boot.c bootblock-y += mmap_boot.c
# Add the assembly file that pulls in the rest of the dependencies in
# the right order. Make sure the auto generated bootblock.inc is a proper
# dependency. Make the same true for the linker sript.
bootblock-y += id.S bootblock-y += id.S
$(call src-to-obj,bootblock,$(dir)/id.S): $(obj)/build.h $(call src-to-obj,bootblock,$(dir)/id.S): $(obj)/build.h
@ -132,9 +129,12 @@ else
LDFLAGS_bootblock += -m elf_x86_64 --oformat elf64-x86-64 LDFLAGS_bootblock += -m elf_x86_64 --oformat elf64-x86-64
endif endif
bootblock-y += bootblock.S # Add the assembly file that pulls in the rest of the dependencies in
# the right order. Make sure the auto generated bootblock.inc is a proper
# dependency. Make the same true for the linker sript.
bootblock-y += bootblock_romcc.S
bootblock-y += walkcbfs.S bootblock-y += walkcbfs.S
$(call src-to-obj,bootblock,$(dir)/bootblock.S): $(objgenerated)/bootblock.inc $(call src-to-obj,bootblock,$(dir)/bootblock_romcc.S): $(objgenerated)/bootblock.inc
bootblock-y += bootblock.ld bootblock-y += bootblock.ld
$(call src-to-obj,bootblock,$(dir)/bootblock.ld): $(objgenerated)/bootblock.ld $(call src-to-obj,bootblock,$(dir)/bootblock.ld): $(objgenerated)/bootblock.ld

17
src/arch/x86/bootblock.S → src/arch/x86/bootblock_romcc.S
View File

@ -13,9 +13,22 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
/* This file assembles the bootblock program by the order of the includes. Thus, /*
* This is the original bootblock used by coreboot on x86 systems. It contains
* a monolithic code flow, assembled from the following stages:
* - reset16.inc: the reset vector
* - entry16.inc: protected mode setup
* - entry32.inc: segment descriptor setup
* - CONFIG_CHIPSET_BOOTBLOCK_INCLUDE: chipset-specific initialization
* - generated/bootblock.inc: ROMCC part of the bootblock
*
* This is used on platforms which do not select C_ENVIRONMENT_BOOTBLOCK, and it
* tries to do the absolute minimum before walking CBFS and jumping to romstage.
*
* This file assembles the bootblock program by the order of the includes. Thus,
* it's extremely important that one pays very careful attention to the order * it's extremely important that one pays very careful attention to the order
* of the includes. */ * of the includes.
*/
#include <arch/x86/prologue.inc> #include <arch/x86/prologue.inc>
#include <cpu/x86/16bit/entry16.inc> #include <cpu/x86/16bit/entry16.inc>