From 9d1cbf1033165486c43b23fad5dcb90473153168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 8 Jun 2020 06:05:03 +0300
Subject: lib/program.ld: Replace CONFIG(ARCH_xx) tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/lib/program.ld b/src/lib/program.ld
index 17aa3db72c..88a3126038 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);
-- 
cgit v1.2.3