summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-08-09 17:57:47 -0400
committerMike Frysinger <vapier@gentoo.org>2010-10-02 16:00:38 -0400
commit821ad16fa9900c9b48e9af678b4a5d7808a58f7c (patch)
tree522cfcdc596a042b9ee2593dfa803f73cb0c1561
parent543ef365865abed36b120ae5b05fbb64d092877f (diff)
Blackfin: move CONFIG_BFIN_CPU to board config.mk
The CONFIG_BFIN_CPU option is largely used in the build system, so move it out of the board config.h and into the board config.mk. It'd be nice to keep everything in the config.h, but the patch to extract that value early was rejected. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--arch/blackfin/config.mk4
-rw-r--r--arch/blackfin/include/asm/config.h5
-rw-r--r--arch/blackfin/lib/board.c2
-rw-r--r--board/bf518f-ezbrd/config.mk2
-rw-r--r--board/bf526-ezbrd/config.mk2
-rw-r--r--board/bf527-ad7160-eval/config.mk2
-rw-r--r--board/bf527-ezkit/config.mk2
-rw-r--r--board/bf533-ezkit/config.mk2
-rw-r--r--board/bf533-stamp/config.mk2
-rw-r--r--board/bf537-minotaur/config.mk2
-rw-r--r--board/bf537-pnav/config.mk2
-rw-r--r--board/bf537-srv1/config.mk2
-rw-r--r--board/bf537-stamp/config.mk2
-rw-r--r--board/bf538f-ezkit/config.mk2
-rw-r--r--board/bf548-ezkit/config.mk2
-rw-r--r--board/bf561-acvilon/config.mk2
-rw-r--r--board/bf561-ezkit/config.mk2
-rw-r--r--board/blackstamp/config.mk2
-rw-r--r--board/cm-bf527/config.mk2
-rw-r--r--board/cm-bf533/config.mk2
-rw-r--r--board/cm-bf537e/config.mk2
-rw-r--r--board/cm-bf537u/config.mk2
-rw-r--r--board/cm-bf548/config.mk2
-rw-r--r--board/cm-bf561/config.mk2
-rw-r--r--board/ibf-dsp561/config.mk2
-rw-r--r--board/ip04/config.mk2
-rw-r--r--board/tcm-bf518/config.mk2
-rw-r--r--board/tcm-bf537/config.mk2
-rw-r--r--include/configs/bf518f-ezbrd.h1
-rw-r--r--include/configs/bf526-ezbrd.h1
-rw-r--r--include/configs/bf527-ad7160-eval.h1
-rw-r--r--include/configs/bf527-ezkit.h1
-rw-r--r--include/configs/bf533-ezkit.h1
-rw-r--r--include/configs/bf533-stamp.h1
-rw-r--r--include/configs/bf537-minotaur.h1
-rw-r--r--include/configs/bf537-pnav.h1
-rw-r--r--include/configs/bf537-srv1.h1
-rw-r--r--include/configs/bf537-stamp.h1
-rw-r--r--include/configs/bf538f-ezkit.h1
-rw-r--r--include/configs/bf548-ezkit.h1
-rw-r--r--include/configs/bf561-acvilon.h1
-rw-r--r--include/configs/bf561-ezkit.h1
-rw-r--r--include/configs/blackstamp.h1
-rw-r--r--include/configs/cm-bf527.h1
-rw-r--r--include/configs/cm-bf533.h1
-rw-r--r--include/configs/cm-bf537e.h1
-rw-r--r--include/configs/cm-bf537u.h1
-rw-r--r--include/configs/cm-bf548.h1
-rw-r--r--include/configs/cm-bf561.h1
-rw-r--r--include/configs/ibf-dsp561.h1
-rw-r--r--include/configs/ip04.h1
-rw-r--r--include/configs/tcm-bf518.h1
-rw-r--r--include/configs/tcm-bf537.h1
53 files changed, 52 insertions, 34 deletions
diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk
index 137834e7eed..e531edbfa98 100644
--- a/arch/blackfin/config.mk
+++ b/arch/blackfin/config.mk
@@ -25,7 +25,6 @@ CROSS_COMPILE ?= bfin-uclinux-
STANDALONE_LOAD_ADDR = 0x1000 -m elf32bfin
-CONFIG_BFIN_CPU := $(strip $(subst ",,$(CONFIG_BFIN_CPU)))
CONFIG_BFIN_BOOT_MODE := $(strip $(subst ",,$(CONFIG_BFIN_BOOT_MODE)))
CONFIG_ENV_OFFSET := $(strip $(subst ",,$(CONFIG_ENV_OFFSET)))
CONFIG_ENV_SIZE := $(strip $(subst ",,$(CONFIG_ENV_SIZE)))
@@ -36,9 +35,8 @@ PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN
LDFLAGS += --gc-sections -m elf32bfin
PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
-ifneq (,$(CONFIG_BFIN_CPU))
+PLATFORM_CPPFLAGS += -DBFIN_CPU='"$(CONFIG_BFIN_CPU)"'
PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU)
-endif
ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
ALL += $(obj)u-boot.ldr
diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h
index 74556850573..215e0f29183 100644
--- a/arch/blackfin/include/asm/config.h
+++ b/arch/blackfin/include/asm/config.h
@@ -9,11 +9,6 @@
#ifndef __ASM_BLACKFIN_CONFIG_POST_H__
#define __ASM_BLACKFIN_CONFIG_POST_H__
-/* Sanity check CONFIG_BFIN_CPU */
-#ifndef CONFIG_BFIN_CPU
-# error CONFIG_BFIN_CPU: your board config needs to define this
-#endif
-
#ifndef CONFIG_BFIN_SCRATCH_REG
# define CONFIG_BFIN_SCRATCH_REG retn
#endif
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index 7643250da37..94fbbfe99ce 100644
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -254,7 +254,7 @@ void board_init_f(ulong bootflag)
memset((void *)bd, 0, sizeof(bd_t));
bd->bi_r_version = version_string;
- bd->bi_cpu = MK_STR(CONFIG_BFIN_CPU);
+ bd->bi_cpu = BFIN_CPU;
bd->bi_board_name = BFIN_BOARD_NAME;
bd->bi_vco = get_vco();
bd->bi_cclk = get_cclk();
diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk
index 3f9d41f3715..30b92a3c43a 100644
--- a/board/bf518f-ezbrd/config.mk
+++ b/board/bf518f-ezbrd/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf518-0.0
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk
index 3f9d41f3715..aaf4541feb8 100644
--- a/board/bf526-ezbrd/config.mk
+++ b/board/bf526-ezbrd/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf526-0.0
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/bf527-ad7160-eval/config.mk b/board/bf527-ad7160-eval/config.mk
index 3f9d41f3715..9784810af78 100644
--- a/board/bf527-ad7160-eval/config.mk
+++ b/board/bf527-ad7160-eval/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf527-0.2
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk
index 3f9d41f3715..78eebff3246 100644
--- a/board/bf527-ezkit/config.mk
+++ b/board/bf527-ezkit/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf527-0.0
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk
index bc046f129f0..60ec6b6c141 100644
--- a/board/bf533-ezkit/config.mk
+++ b/board/bf533-ezkit/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf533-0.3
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk
index bc046f129f0..60ec6b6c141 100644
--- a/board/bf533-stamp/config.mk
+++ b/board/bf533-stamp/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf533-0.3
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/bf537-minotaur/config.mk b/board/bf537-minotaur/config.mk
index d8308433b00..59e9a9c4475 100644
--- a/board/bf537-minotaur/config.mk
+++ b/board/bf537-minotaur/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf537-0.2
+
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6
LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/bf537-pnav/config.mk b/board/bf537-pnav/config.mk
index eaa09ff7958..ce8ef3b4997 100644
--- a/board/bf537-pnav/config.mk
+++ b/board/bf537-pnav/config.mk
@@ -26,5 +26,7 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf537-0.2
+
# Set some default LDR flags based on boot mode.
LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/bf537-srv1/config.mk b/board/bf537-srv1/config.mk
index d8308433b00..59e9a9c4475 100644
--- a/board/bf537-srv1/config.mk
+++ b/board/bf537-srv1/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf537-0.2
+
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6
LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk
index 57668291155..3bac0adf3b4 100644
--- a/board/bf537-stamp/config.mk
+++ b/board/bf537-stamp/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf537-0.2
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk
index bc046f129f0..170a2d56db9 100644
--- a/board/bf538f-ezkit/config.mk
+++ b/board/bf538f-ezkit/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf538-0.4
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk
index ce96c0d4793..ec3c28e0b78 100644
--- a/board/bf548-ezkit/config.mk
+++ b/board/bf548-ezkit/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf548-0.0
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/bf561-acvilon/config.mk b/board/bf561-acvilon/config.mk
index a90b1933880..221de6524f6 100644
--- a/board/bf561-acvilon/config.mk
+++ b/board/bf561-acvilon/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf561-0.5
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk
index a90b1933880..ff19190a26f 100644
--- a/board/bf561-ezkit/config.mk
+++ b/board/bf561-ezkit/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf561-0.3
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/blackstamp/config.mk b/board/blackstamp/config.mk
index eaa09ff7958..5035cb9c584 100644
--- a/board/blackstamp/config.mk
+++ b/board/blackstamp/config.mk
@@ -26,5 +26,7 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf532-0.5
+
# Set some default LDR flags based on boot mode.
LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk
index 3f9d41f3715..78eebff3246 100644
--- a/board/cm-bf527/config.mk
+++ b/board/cm-bf527/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf527-0.0
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk
index bc046f129f0..60ec6b6c141 100644
--- a/board/cm-bf533/config.mk
+++ b/board/cm-bf533/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf533-0.3
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk
index bc046f129f0..1281da4befe 100644
--- a/board/cm-bf537e/config.mk
+++ b/board/cm-bf537e/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf537-0.2
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/cm-bf537u/config.mk b/board/cm-bf537u/config.mk
index bc046f129f0..1281da4befe 100644
--- a/board/cm-bf537u/config.mk
+++ b/board/cm-bf537u/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf537-0.2
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk
index f071a39d75e..bce60e5baa2 100644
--- a/board/cm-bf548/config.mk
+++ b/board/cm-bf548/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf548-0.0
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk
index a90b1933880..ff19190a26f 100644
--- a/board/cm-bf561/config.mk
+++ b/board/cm-bf561/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf561-0.3
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/ibf-dsp561/config.mk b/board/ibf-dsp561/config.mk
index 77c888b3bd3..1fec4d020dc 100644
--- a/board/ibf-dsp561/config.mk
+++ b/board/ibf-dsp561/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf561-0.5
+
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/ip04/config.mk b/board/ip04/config.mk
index 57668291155..683101b8279 100644
--- a/board/ip04/config.mk
+++ b/board/ip04/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf532-0.5
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/tcm-bf518/config.mk b/board/tcm-bf518/config.mk
index 3f9d41f3715..30b92a3c43a 100644
--- a/board/tcm-bf518/config.mk
+++ b/board/tcm-bf518/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf518-0.0
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/board/tcm-bf537/config.mk b/board/tcm-bf537/config.mk
index bc046f129f0..1281da4befe 100644
--- a/board/tcm-bf537/config.mk
+++ b/board/tcm-bf537/config.mk
@@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
+CONFIG_BFIN_CPU = bf537-0.2
+
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 6eec1c91a7e..64ca9ed4393 100644
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf518-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index 82396d0ed25..eeca9caf8bc 100644
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf526-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h
index eb3a2b7dc11..fbcf019051c 100644
--- a/include/configs/bf527-ad7160-eval.h
+++ b/include/configs/bf527-ad7160-eval.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf527-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index 07e4ce86e12..54fc063f9a1 100644
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf527-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 95d3afa85cc..e1bb5944388 100644
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf533-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index f39bfee0a4f..b8cea99959d 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf533-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 86aa1f61e66..0ba29bc0cd8 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -24,7 +24,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 39bbb41fb3e..30607d91fd1 100644
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 7e9dd36bce2..559428f4845 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -24,7 +24,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index fc9784e0830..60087da1142 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index 1c14b6bdd37..1d475647aac 100644
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf538-0.4
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 60cca0c07a3..d299dc18f5f 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf548-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
index 0c0204fbd79..2b12c3fbe11 100644
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -12,7 +12,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf561-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 4e293b58a82..1557e14f523 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf561-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index 85f08ea8880..3f5c95917d0 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -24,7 +24,6 @@
/* CPU Options
* Be sure to set the Silicon Revision Correctly
*/
-#define CONFIG_BFIN_CPU bf532-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
/*
diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index e0c6d53b2c7..84c93099ce9 100644
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf527-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
diff --git a/include/configs/cm-bf533.h b/include/configs/cm-bf533.h
index 75152964b61..dbc4a5b1002 100644
--- a/include/configs/cm-bf533.h
+++ b/include/configs/cm-bf533.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf533-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 742df9c0199..df3fe48f655 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 9def99f7283..e5b0ecfc5e9 100644
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index fa62a8e9c1d..27b1cc519cc 100644
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf548-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index c60401c8fec..8c350bc2639 100644
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf561-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 53b5197112e..cd856ac79c3 100644
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf561-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
diff --git a/include/configs/ip04.h b/include/configs/ip04.h
index c024d78c18a..528363c6b49 100644
--- a/include/configs/ip04.h
+++ b/include/configs/ip04.h
@@ -20,7 +20,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf532-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_NAND
diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h
index 52055e80dcb..042d78915c8 100644
--- a/include/configs/tcm-bf518.h
+++ b/include/configs/tcm-bf518.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf518-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 24ce8f854a1..dceff308b8b 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -11,7 +11,6 @@
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS