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

arch/x86/bootblock: Do not include non-code files in bootblock.S 

Since we now have more freedom in the bootblock linking step it no
longer makes sense to use a monolithic bootblock.S. Code segments must
still be included as the order in bootblock.S determines code flow.
However, non-code flow related assembly stubs don't need to be directly
included in bootblock.S

Change-Id: I08e86e92d82bd2138194ed42652f268b0764aa54
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-on: http://review.coreboot.org/11792
Tested-by: build bot (Jenkins)
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Alexandru Gagniuc 2015-10-04 17:47:36 -07:00
parent c46a39237a
commit ee2740b7f6
6 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,7 @@ endif
# Add the assembly file that pulls in the rest of the dependencies in # 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 # the right order. Make sure the auto generated bootblock.inc is a proper
# dependency. Make the same true for the linker sript. # dependency. Make the same true for the linker sript.
bootblock-y += id.S
bootblock-y += bootblock.S bootblock-y += bootblock.S
bootblock-y += walkcbfs.S bootblock-y += walkcbfs.S
$(obj)/arch/x86/bootblock.bootblock.o: $(objgenerated)/bootblock.inc $(obj)/arch/x86/bootblock.bootblock.o: $(objgenerated)/bootblock.inc

5
src/arch/x86/bootblock.S
View File

@ -25,11 +25,6 @@
#include <cpu/x86/16bit/entry16.inc> #include <cpu/x86/16bit/entry16.inc>
#include <cpu/x86/16bit/reset16.inc> #include <cpu/x86/16bit/reset16.inc>
#include <cpu/x86/32bit/entry32.inc> #include <cpu/x86/32bit/entry32.inc>
#include <arch/x86/id.inc>
#if IS_ENABLED(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE)
#include <cpu/intel/fit/fit.inc>
#endif
#ifdef CONFIG_CHIPSET_BOOTBLOCK_INCLUDE #ifdef CONFIG_CHIPSET_BOOTBLOCK_INCLUDE
#include CONFIG_CHIPSET_BOOTBLOCK_INCLUDE #include CONFIG_CHIPSET_BOOTBLOCK_INCLUDE

0
src/arch/x86/id.inc → src/arch/x86/id.S
View File

1
src/cpu/intel/Makefile.inc
View File

@ -3,6 +3,7 @@
# #
# Therefore: ONLY include Makefile.inc from socket directories! # Therefore: ONLY include Makefile.inc from socket directories!
subdirs-$(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE) += fit
subdirs-$(CONFIG_CPU_INTEL_SOCKET_441) += socket_441 subdirs-$(CONFIG_CPU_INTEL_SOCKET_441) += socket_441
subdirs-$(CONFIG_CPU_INTEL_SOCKET_BGA956) += socket_BGA956 subdirs-$(CONFIG_CPU_INTEL_SOCKET_BGA956) += socket_BGA956
subdirs-$(CONFIG_CPU_INTEL_EP80579) += ep80579 subdirs-$(CONFIG_CPU_INTEL_EP80579) += ep80579

1
src/cpu/intel/fit/Makefile.inc Normal file
View File

@ -0,0 +1 @@
bootblock-y += fit.S

0
src/cpu/intel/fit/fit.inc → src/cpu/intel/fit/fit.S
View File