From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 26 Sep 2010 07:00:38 +0000 (+0000)
Subject: Blackfin: propagate target cpu defines when building embedded env
X-Git-Tag: v2010.12-rc1~169^2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=48c00fe25c77d646313b90106a945917a62c5319;p=u-boot

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 <vivi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk
index e531edbfa9..a3300841a0 100644
--- 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