Change in coreboot[master]: lib/program.ld: Replace CONFIG(ARCH_xx) tests

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42160 )

Change subject: lib/program.ld: Replace CONFIG(ARCH_xx) tests
......................................................................

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 
---
M src/lib/program.ld
1 file changed, 1 insertion(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/42160/1

diff --git a/src/lib/program.ld b/src/lib/program.ld
index 17aa3db..88a3126 100644
--- a/src/lib/program.ld
+++ b/src/lib/program.ld
@@ -15,10 +15,7 @@
    _text = .;
    *(.text._start);
    *(.text.stage_entry);
-#if (ENV_DECOMPRESSOR || ENV_BOOTBLOCK && \
-		!CONFIG(COMPRESS_BOOTBLOCK)) && \
-    !(CONFIG(ARCH_BOOTBLOCK_X86_32) || \
-      CONFIG(ARCH_BOOTBLOCK_X86_64))
+#if !ENV_X86 && (ENV_DECOMPRESSOR || ENV_BOOTBLOCK && !CONFIG(COMPRESS_BOOTBLOCK))
    KEEP(*(.id));
 #endif
    *(.text);

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42160 )

Change subject: lib/program.ld: Replace CONFIG(ARCH_xx) tests
......................................................................

Patch Set 1: Code-Review+1

[Patrick Georgi (Code Review)]

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42160 )

Change subject: lib/program.ld: Replace CONFIG(ARCH_xx) tests
......................................................................

Patch Set 1: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42160 )

Change subject: lib/program.ld: Replace CONFIG(ARCH_xx) tests
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42160
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Patrick Georgi 
---
M src/lib/program.ld
1 file changed, 1 insertion(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved
  Angel Pons: Looks good to me, but someone else must approve

diff --git a/src/lib/program.ld b/src/lib/program.ld
index 17aa3db..88a3126 100644
--- a/src/lib/program.ld
+++ b/src/lib/program.ld
@@ -15,10 +15,7 @@
    _text = .;
    *(.text._start);
    *(.text.stage_entry);
-#if (ENV_DECOMPRESSOR || ENV_BOOTBLOCK && \
-		!CONFIG(COMPRESS_BOOTBLOCK)) && \
-    !(CONFIG(ARCH_BOOTBLOCK_X86_32) || \
-      CONFIG(ARCH_BOOTBLOCK_X86_64))
+#if !ENV_X86 && (ENV_DECOMPRESSOR || ENV_BOOTBLOCK && !CONFIG(COMPRESS_BOOTBLOCK))
    KEEP(*(.id));
 #endif
    *(.text);