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)
 {