summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 137834e7ee..e531edbfa9 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 7455685057..215e0f2918 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 7643250da3..94fbbfe99c 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 3f9d41f371..30b92a3c43 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 3f9d41f371..aaf4541feb 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 3f9d41f371..9784810af7 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 3f9d41f371..78eebff324 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 bc046f129f..60ec6b6c14 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 bc046f129f..60ec6b6c14 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 d8308433b0..59e9a9c447 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 eaa09ff795..ce8ef3b499 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 d8308433b0..59e9a9c447 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 5766829115..3bac0adf3b 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 bc046f129f..170a2d56db 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 ce96c0d479..ec3c28e0b7 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 a90b193388..221de6524f 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 a90b193388..ff19190a26 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 eaa09ff795..5035cb9c58 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 3f9d41f371..78eebff324 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 bc046f129f..60ec6b6c14 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 bc046f129f..1281da4bef 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 bc046f129f..1281da4bef 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 f071a39d75..bce60e5baa 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 a90b193388..ff19190a26 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 77c888b3bd..1fec4d020d 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 5766829115..683101b827 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 3f9d41f371..30b92a3c43 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 bc046f129f..1281da4bef 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 6eec1c91a7..64ca9ed439 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 82396d0ed2..eeca9caf8b 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 eb3a2b7dc1..fbcf019051 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 07e4ce86e1..54fc063f9a 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 95d3afa85c..e1bb594438 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 f39bfee0a4..b8cea99959 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 86aa1f61e6..0ba29bc0cd 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 39bbb41fb3..30607d91fd 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 7e9dd36bce..559428f484 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 fc9784e083..60087da114 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 1c14b6bdd3..1d475647aa 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 60cca0c07a..d299dc18f5 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 0c0204fbd7..2b12c3fbe1 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 4e293b58a8..1557e14f52 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 85f08ea888..3f5c95917d 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 e0c6d53b2c..84c93099ce 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 75152964b6..dbc4a5b100 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 742df9c019..df3fe48f65 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 9def99f728..e5b0ecfc5e 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 fa62a8e9c1..27b1cc519c 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 c60401c8fe..8c350bc263 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 53b5197112..cd856ac79c 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 c024d78c18..528363c6b4 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 52055e80dc..042d78915c 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 24ce8f854a..dceff308b8 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