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/southbridge/via | |
| parent | acc94a73bab2ede4e876e58c2de53ee0551f703c (diff) | |
| download | coreboot-8a13743569a8d1ac61b8a52d2dab621ff4041de2.tar.xz | |
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/southbridge/via')
| -rw-r--r-- | src/southbridge/via/k8t890/Kconfig | 4 | ||||
| -rw-r--r-- | src/southbridge/via/k8t890/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/southbridge/via/k8t890/romstrap.S (renamed from src/southbridge/via/k8t890/romstrap.inc) | 0 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/southbridge/via/k8t890/Kconfig b/src/southbridge/via/k8t890/Kconfig index 76be0c1b4f..f6e51dccd1 100644 --- a/src/southbridge/via/k8t890/Kconfig +++ b/src/southbridge/via/k8t890/Kconfig @@ -51,8 +51,4 @@ config VIDEO_MB default -1 if K8M890_VIDEO_MB_CMOS depends on SOUTHBRIDGE_VIA_K8M890_VGA_EN -config CHIPSET_BOOTBLOCK_INCLUDE - string - default "southbridge/via/k8t890/romstrap.inc" - endif # SOUTHBRIDGE_K8T890 diff --git a/src/southbridge/via/k8t890/Makefile.inc b/src/southbridge/via/k8t890/Makefile.inc index 2789499ee2..ed6d3edc78 100644 --- a/src/southbridge/via/k8t890/Makefile.inc +++ b/src/southbridge/via/k8t890/Makefile.inc @@ -11,5 +11,6 @@ ramstage-y += error.c ramstage-y += chrome.c bootblock-y += romstrap.ld +bootblock-y += romstrap.S endif diff --git a/src/southbridge/via/k8t890/romstrap.inc b/src/southbridge/via/k8t890/romstrap.S index 2115eaa723..2115eaa723 100644 --- a/src/southbridge/via/k8t890/romstrap.inc +++ b/src/southbridge/via/k8t890/romstrap.S |