Blackfin: propagate target cpu defines when building embedded env

Since we're no longer extracting the env from the target ELF file (since
upstream wouldn't take that change), we're back to the problem of cpu
defines not properly propagating to the env setup stage.  So the embedded
env built by the host compiler doesn't match the one that is linked into
the u-boot env.

Reported-by: Vivi Li <[email protected]>
Signed-off-by: Mike Frysinger <[email protected]>

diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk
index e531edbfa981b7bd44a1c1927103eadeb14208c6..a3300841a0c3bb4349b3cd58353f94bae0febfe3 100644 (file)
--- a/arch/blackfin/config.mk
+++ b/arch/blackfin/config.mk
@@ -43,6 +43,9 @@ ALL += $(obj)u-boot.ldr
 endif
 ifeq ($(CONFIG_ENV_IS_EMBEDDED_IN_LDR),y)
 CREATE_LDR_ENV = $(obj)tools/envcrc --binary > $(obj)env-ldr.o
+HOSTCFLAGS_NOPED += \
+       $(shell $(CPP) -dD - -mcpu=$(CONFIG_BFIN_CPU) </dev/null \
+               | awk '$$2 ~ /ADSP/ { print "-D" $$2 }')
 else
 CREATE_LDR_ENV =
 endif