diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2016-01-21 00:08:17 -0600 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2016-01-23 18:25:48 +0100 |
| commit | eb907b3c9047fc262893a57c42777928b50c17d9 (patch) | |
| tree | 5e42d469d9594eccfac5fbd511a0abf86b191063 /src/lib | |
| parent | 1b915b89044c06ae7957544b97d6c30d496366e0 (diff) | |
| download | coreboot-eb907b3c9047fc262893a57c42777928b50c17d9.tar.xz | |
arch/x86: link bootblock like other stages for C_ENVIRONMENT_BOOTBLOCK
When C_ENVIRONMENT_BOOTBLOCK is selected link bootblock using the
memlayout.ld scripts and infrastructure. This allows bootblock on
x86 to utilize all the other coreboot infrastructure without
relying romcc.
Change-Id: Ie3e077d553360853bf33f30cf8a347ba1df1e389
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/13069
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Makefile.inc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 30638bcf6d..5e788c0589 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -181,11 +181,8 @@ romstage-y += halt.c ramstage-y += halt.c smm-y += halt.c -ifneq ($(CONFIG_ARCH_X86),y) -# X86 bootblock uses custom ldscripts that are all glued together, -# so we need to exclude it here or it would pick these up as well -bootblock-y += program.ld -endif +# Use program.ld for all the platforms which use C fo the bootblock. +bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += program.ld romstage-y += program.ld ramstage-y += program.ld |