lib/program.ld: Replace CONFIG(ARCH_xx) tests
Once we support building stages for different architectures, such CONFIG(ARCH_xx) tests do not evaluate correctly anymore. For x86 we define .id linking explicitly elsewhere. Change-Id: I43f849465e985068cd0b8a1944213b7c26245b8d Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/42160 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
parent
9fb3d792be
commit
9d1cbf1033
|
@ -15,10 +15,7 @@
|
||||||
_text = .;
|
_text = .;
|
||||||
*(.text._start);
|
*(.text._start);
|
||||||
*(.text.stage_entry);
|
*(.text.stage_entry);
|
||||||
#if (ENV_DECOMPRESSOR || ENV_BOOTBLOCK && \
|
#if !ENV_X86 && (ENV_DECOMPRESSOR || ENV_BOOTBLOCK && !CONFIG(COMPRESS_BOOTBLOCK))
|
||||||
!CONFIG(COMPRESS_BOOTBLOCK)) && \
|
|
||||||
!(CONFIG(ARCH_BOOTBLOCK_X86_32) || \
|
|
||||||
CONFIG(ARCH_BOOTBLOCK_X86_64))
|
|
||||||
KEEP(*(.id));
|
KEEP(*(.id));
|
||||||
#endif
|
#endif
|
||||||
*(.text);
|
*(.text);
|
||||||
|
|
Loading…
Reference in New Issue