diff options
| author | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2015-10-05 08:00:51 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2015-12-30 18:34:08 +0100 |
| commit | 8a13743569a8d1ac61b8a52d2dab621ff4041de2 (patch) | |
| tree | 4ee4ef61e8aab9d8ac72ad17390ae8c7c35350cb /src/cpu | |
| parent | acc94a73bab2ede4e876e58c2de53ee0551f703c (diff) | |
x86 chipsets: Link non-code flow CHIPSET_BOOTBLOCK_INCLUDE files
Non-code flow assembly stubs do not have to be included in
bootblock.S, now that we have more freedom in bootblock linking.
Rather than bringing these stubs to the config system, just link them
in the bootblock.
Note that we cannot fully remove CHIPSET_BOOTBLOCK_INCLUDE at this
point, as some intel SOCs use this stub for code flow.
objdump -h build/cbfs/fallback/bootblock.debug on a few random boards
confirms that the appropriate sections are still included in the
final binary.
Change-Id: Id3f9ece14e399c1cc83090f407780c4a05a076f0
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-on: https://review.coreboot.org/11856
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/dmp/vortex86ex/Kconfig | 4 | ||||
| -rw-r--r-- | src/cpu/dmp/vortex86ex/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/cpu/dmp/vortex86ex/biosdata.S (renamed from src/cpu/dmp/vortex86ex/biosdata.inc) | 0 | ||||
| -rw-r--r-- | src/cpu/dmp/vortex86ex/biosdata_ex.S (renamed from src/cpu/dmp/vortex86ex/biosdata_ex.inc) | 0 | ||||
| -rw-r--r-- | src/cpu/dmp/vortex86ex/chipset_bootblock.inc | 2 |
5 files changed, 2 insertions, 6 deletions
diff --git a/src/cpu/dmp/vortex86ex/Kconfig b/src/cpu/dmp/vortex86ex/Kconfig index 1f43f769b2..1af7ec4bf8 100644 --- a/src/cpu/dmp/vortex86ex/Kconfig +++ b/src/cpu/dmp/vortex86ex/Kconfig @@ -73,8 +73,4 @@ config PLL_500_375_33 endchoice -config CHIPSET_BOOTBLOCK_INCLUDE - string - default "cpu/dmp/vortex86ex/chipset_bootblock.inc" - endif diff --git a/src/cpu/dmp/vortex86ex/Makefile.inc b/src/cpu/dmp/vortex86ex/Makefile.inc index 76df34caae..6b4d0ba74e 100644 --- a/src/cpu/dmp/vortex86ex/Makefile.inc +++ b/src/cpu/dmp/vortex86ex/Makefile.inc @@ -21,5 +21,7 @@ subdirs-y += ../../x86/smm bootblock-y += biosdata.ld bootblock-y += biosdata_ex.ld +bootblock-y += biosdata.S +bootblock-y += biosdata_ex.S ROMCCFLAGS := -mcpu=i386 -O2 diff --git a/src/cpu/dmp/vortex86ex/biosdata.inc b/src/cpu/dmp/vortex86ex/biosdata.S index c08242adba..c08242adba 100644 --- a/src/cpu/dmp/vortex86ex/biosdata.inc +++ b/src/cpu/dmp/vortex86ex/biosdata.S diff --git a/src/cpu/dmp/vortex86ex/biosdata_ex.inc b/src/cpu/dmp/vortex86ex/biosdata_ex.S index 5ed17c67d1..5ed17c67d1 100644 --- a/src/cpu/dmp/vortex86ex/biosdata_ex.inc +++ b/src/cpu/dmp/vortex86ex/biosdata_ex.S diff --git a/src/cpu/dmp/vortex86ex/chipset_bootblock.inc b/src/cpu/dmp/vortex86ex/chipset_bootblock.inc deleted file mode 100644 index bdcda1d40f..0000000000 --- a/src/cpu/dmp/vortex86ex/chipset_bootblock.inc +++ /dev/null @@ -1,2 +0,0 @@ -#include "biosdata.inc" -#include "biosdata_ex.inc" |