summaryrefslogtreecommitdiff
path: root/arch/blackfin/config.mk
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-12-23 14:58:37 -0500
committerMike Frysinger <vapier@gentoo.org>2011-04-08 00:44:26 -0400
commitfbcf8e8c753d1afa8a22b9e8d66bafe8b4a05f18 (patch)
tree0dfb7c2d54fa43795a7766117e7203488f0f4f9d /arch/blackfin/config.mk
parentec4c6933ff754d8dcc0dc3f2fce19a81babe2fd3 (diff)
downloadu-boot-imx-fbcf8e8c753d1afa8a22b9e8d66bafe8b4a05f18.zip
u-boot-imx-fbcf8e8c753d1afa8a22b9e8d66bafe8b4a05f18.tar.gz
u-boot-imx-fbcf8e8c753d1afa8a22b9e8d66bafe8b4a05f18.tar.bz2
Blackfin: move CONFIG_BFIN_CPU back to board config.h
This is a revert of 821ad16fa9900c as Wolfgang doesn't like the new code. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/config.mk')
-rw-r--r--arch/blackfin/config.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk
index 4102c6f..95cf7db 100644
--- a/arch/blackfin/config.mk
+++ b/arch/blackfin/config.mk
@@ -25,6 +25,13 @@ CROSS_COMPILE ?= bfin-uclinux-
STANDALONE_LOAD_ADDR = 0x1000 -m elf32bfin
+ifeq ($(CONFIG_BFIN_CPU),)
+CONFIG_BFIN_CPU := \
+ $(shell awk '$$2 == "CONFIG_BFIN_CPU" { print $$3 }' \
+ $(src)include/configs/$(BOARD).h)
+else
+CONFIG_BFIN_CPU := $(strip $(subst ",,$(CONFIG_BFIN_CPU)))
+endif
CONFIG_BFIN_BOOT_MODE := $(strip $(subst ",,$(CONFIG_BFIN_BOOT_MODE)))
PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic
@@ -34,7 +41,6 @@ LDFLAGS_FINAL += --gc-sections
LDFLAGS += -m elf32bfin
PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
-PLATFORM_CPPFLAGS += -DBFIN_CPU='"$(CONFIG_BFIN_CPU)"'
PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU)
ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)