From d8bf22a8635b300e93d0cda83ee87d1d8ad39b72 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Mon, 8 Jun 2020 06:05:03 +0300
Subject: binaryPI: Replace CONFIG(ARCH_xx) test
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.

Not strictly required for binaryPI boards, but do this for
consistency.

Change-Id: Id0bbbfb6f695c4bb920bc57a1e9362a23884efb3
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42161
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/drivers/amd/agesa/def_callouts.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/drivers/amd/agesa/def_callouts.c b/src/drivers/amd/agesa/def_callouts.c
index 3b2d35c1a3..07f717324e 100644
--- a/src/drivers/amd/agesa/def_callouts.c
+++ b/src/drivers/amd/agesa/def_callouts.c
@@ -12,12 +12,9 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <northbridge/amd/agesa/dimmSpd.h>
 
-#if CONFIG(NORTHBRIDGE_AMD_PI)
-#if CONFIG(ARCH_ROMSTAGE_X86_64) || \
-	CONFIG(ARCH_RAMSTAGE_X86_64)
+#if ENV_X86_64 && CONFIG(NORTHBRIDGE_AMD_PI)
 #error "FIXME: CALLOUT_ENTRY is UINT32 Data, not UINT Data"
 #endif
-#endif
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINTN Data, VOID *ConfigPtr)
 {
-- 
cgit v1.2.3