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/northbridge | |
| 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/northbridge')
| -rw-r--r-- | src/northbridge/via/vx800/Kconfig | 8 | ||||
| -rw-r--r-- | src/northbridge/via/vx800/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/northbridge/via/vx800/romstrap.S (renamed from src/northbridge/via/vx800/romstrap.inc) | 0 | ||||
| -rw-r--r-- | src/northbridge/via/vx900/Kconfig | 4 | ||||
| -rw-r--r-- | src/northbridge/via/vx900/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/northbridge/via/vx900/romstrap.S (renamed from src/northbridge/via/vx900/romstrap.inc) | 0 |
6 files changed, 2 insertions, 12 deletions
diff --git a/src/northbridge/via/vx800/Kconfig b/src/northbridge/via/vx800/Kconfig index d7d5349685..9eb84fb14e 100644 --- a/src/northbridge/via/vx800/Kconfig +++ b/src/northbridge/via/vx800/Kconfig @@ -3,11 +3,3 @@ config NORTHBRIDGE_VIA_VX800 select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_SMBUS select LATE_CBMEM_INIT - -if NORTHBRIDGE_VIA_VX800 - -config CHIPSET_BOOTBLOCK_INCLUDE - string - default "northbridge/via/vx800/romstrap.inc" - -endif diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc index 069ea8e1b7..90574eda67 100644 --- a/src/northbridge/via/vx800/Makefile.inc +++ b/src/northbridge/via/vx800/Makefile.inc @@ -22,5 +22,6 @@ ramstage-y += lpc.c ramstage-y += ide.c bootblock-y += romstrap.ld +bootblock-y += romstrap.S endif diff --git a/src/northbridge/via/vx800/romstrap.inc b/src/northbridge/via/vx800/romstrap.S index 82b5b4b63b..82b5b4b63b 100644 --- a/src/northbridge/via/vx800/romstrap.inc +++ b/src/northbridge/via/vx800/romstrap.S diff --git a/src/northbridge/via/vx900/Kconfig b/src/northbridge/via/vx900/Kconfig index c7641d14ce..2d2dffaa69 100644 --- a/src/northbridge/via/vx900/Kconfig +++ b/src/northbridge/via/vx900/Kconfig @@ -39,8 +39,4 @@ config VGA_BIOS_ID string default "1106,7122" -config CHIPSET_BOOTBLOCK_INCLUDE - string - default "northbridge/via/vx900/romstrap.inc" - endif diff --git a/src/northbridge/via/vx900/Makefile.inc b/src/northbridge/via/vx900/Makefile.inc index 4cac1e7d1f..44f0ae01ce 100644 --- a/src/northbridge/via/vx900/Makefile.inc +++ b/src/northbridge/via/vx900/Makefile.inc @@ -44,5 +44,6 @@ ramstage-y += ./../../../drivers/pc80/vga/vga_io.c bootblock-y += romstrap.ld +bootblock-y += romstrap.S endif diff --git a/src/northbridge/via/vx900/romstrap.inc b/src/northbridge/via/vx900/romstrap.S index 26c1ee694a..26c1ee694a 100644 --- a/src/northbridge/via/vx900/romstrap.inc +++ b/src/northbridge/via/vx900/romstrap.S |