Change in coreboot[master]: binaryPI: Replace CONFIG(ARCH_xx) test

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

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

Change subject: binaryPI: Replace CONFIG(ARCH_xx) test
......................................................................

binaryPI: Replace CONFIG(ARCH_xx) test

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 
---
M src/drivers/amd/agesa/def_callouts.c
1 file changed, 1 insertion(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/42161/1

diff --git a/src/drivers/amd/agesa/def_callouts.c b/src/drivers/amd/agesa/def_callouts.c
index 3b2d35c..07f7173 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)
 {

[Angel Pons (Code Review)]

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

Change subject: binaryPI: Replace CONFIG(ARCH_xx) test
......................................................................

Patch Set 1: Code-Review+1

[Angel Pons (Code Review)]

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

Change subject: binaryPI: Replace CONFIG(ARCH_xx) test
......................................................................

Patch Set 1: Code-Review+2

If this does not result in build failures now, it should be good.

[Patrick Georgi (Code Review)]

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

Change subject: binaryPI: Replace CONFIG(ARCH_xx) test
......................................................................

binaryPI: Replace CONFIG(ARCH_xx) test

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42161
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
---
M src/drivers/amd/agesa/def_callouts.c
1 file changed, 1 insertion(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/src/drivers/amd/agesa/def_callouts.c b/src/drivers/amd/agesa/def_callouts.c
index 3b2d35c..07f7173 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)
 {