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>

diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk
index 4102c6f54469159acedb69044ef1e2b4329eca9e..95cf7db2b400174a96b1e3a065a6aeb067e0b964 100644 (file)
--- 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)

diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h
index 04372525cc2470f8bb0141945e6675e7863a9d57..f0f3a395348afd2767053ae675d7859beb877ca9 100644 (file)
--- a/arch/blackfin/include/asm/config.h
+++ b/arch/blackfin/include/asm/config.h
@@ -12,6 +12,11 @@
 /* Some of our defines use this (like CONFIG_SYS_GBL_DATA_ADDR) */
 #include <asm-offsets.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 59a0810544665f0067d5166e8ab55f6dc1cae03d..2b1f78c636b8f27b5c70cfdecf12418251a7cdfb 100644 (file)
--- 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 = BFIN_CPU;
+       bd->bi_cpu = MK_STR(CONFIG_BFIN_CPU);
        bd->bi_board_name = BFIN_BOARD_NAME;
        bd->bi_vco = get_vco();
        bd->bi_cclk = get_cclk();

diff --git a/board/bct-brettl2/config.mk b/board/bct-brettl2/config.mk
index 6e7e543a29794f56654546b6938fd9dd9cd6c84f..799a6828ac015f700d70e7b8c72426e936ead30e 100644 (file)
--- a/board/bct-brettl2/config.mk
+++ b/board/bct-brettl2/config.mk
@@ -23,7 +23,5 @@
 # MA 02111-1307 USA
 #
 
-CONFIG_BFIN_CPU = bf536-0.3
-
 CFLAGS_lib += -O2
 CFLAGS_lib/lzma += -O2

diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk
index d9410920cb65a7d44dd61f4a616f47920497287f..799a6828ac015f700d70e7b8c72426e936ead30e 100644 (file)
--- a/board/bf518f-ezbrd/config.mk
+++ b/board/bf518f-ezbrd/config.mk
@@ -23,7 +23,5 @@
 # MA 02111-1307 USA
 #
 
-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 83fd42e8f1a34710f45bbdb09c4dc3dbfd34227b..799a6828ac015f700d70e7b8c72426e936ead30e 100644 (file)
--- a/board/bf526-ezbrd/config.mk
+++ b/board/bf526-ezbrd/config.mk
@@ -23,7 +23,5 @@
 # MA 02111-1307 USA
 #
 
-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 05c7d3bd928767f23ef144d48662d8977ae03a0f..799a6828ac015f700d70e7b8c72426e936ead30e 100644 (file)
--- a/board/bf527-ad7160-eval/config.mk
+++ b/board/bf527-ad7160-eval/config.mk
@@ -23,7 +23,5 @@
 # MA 02111-1307 USA
 #
 
-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 b10c3d2ca6a2a638885a20ded5e6482545fea9a4..799a6828ac015f700d70e7b8c72426e936ead30e 100644 (file)
--- a/board/bf527-ezkit/config.mk
+++ b/board/bf527-ezkit/config.mk
@@ -23,7 +23,5 @@
 # MA 02111-1307 USA
 #
 
-CONFIG_BFIN_CPU = bf527-0.0
-
 CFLAGS_lib += -O2
 CFLAGS_lib/lzma += -O2

diff --git a/board/bf527-sdp/config.mk b/board/bf527-sdp/config.mk
index 47c29892663a691de40447b1f5fa981f25da8be2..ce8f75cadcb876a302f8b9954f25aa859b3d895c 100644 (file)
--- a/board/bf527-sdp/config.mk
+++ b/board/bf527-sdp/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-CONFIG_BFIN_CPU = bf527-0.2
-
 CFLAGS_lib_generic += -O2
 CFLAGS_lzma += -O2
 

diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk
index c45a1978bb72ec68aa2e48b9b04c5da7feb1719a..c0cb9ffc41e1dab3ab1d37e59cd7a625b2c3cd18 100644 (file)
--- a/board/bf533-ezkit/config.mk
+++ b/board/bf533-ezkit/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 c45a1978bb72ec68aa2e48b9b04c5da7feb1719a..c0cb9ffc41e1dab3ab1d37e59cd7a625b2c3cd18 100644 (file)
--- a/board/bf533-stamp/config.mk
+++ b/board/bf533-stamp/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 f7aa8ef41a66f2ad5bb59b91102be93d91b3f2f2..4bb6506d84c1db4ca8868557b86c82a61d232191 100644 (file)
--- a/board/bf537-minotaur/config.mk
+++ b/board/bf537-minotaur/config.mk
@@ -23,7 +23,5 @@
 # MA 02111-1307 USA
 #
 
-CONFIG_BFIN_CPU = bf537-0.2
-
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6

diff --git a/board/bf537-pnav/config.mk b/board/bf537-pnav/config.mk
index b48bb00dc2e8adbb34fc8031d2bb2ff8c88ccb4b..25f4c15839e87efd71bbcb5fe2577ab7c52b700f 100644 (file)
--- a/board/bf537-pnav/config.mk
+++ b/board/bf537-pnav/config.mk
@@ -23,4 +23,3 @@
 # MA 02111-1307 USA
 #
 
-CONFIG_BFIN_CPU = bf537-0.2

diff --git a/board/bf537-srv1/config.mk b/board/bf537-srv1/config.mk
index f7aa8ef41a66f2ad5bb59b91102be93d91b3f2f2..4bb6506d84c1db4ca8868557b86c82a61d232191 100644 (file)
--- a/board/bf537-srv1/config.mk
+++ b/board/bf537-srv1/config.mk
@@ -23,7 +23,5 @@
 # MA 02111-1307 USA
 #
 
-CONFIG_BFIN_CPU = bf537-0.2
-
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6

diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk
index 2bb6b79b27041010c029f47c467e4b612d823a2d..7c023d1fea895366d6fe2f562d6d3b22b5201ae5 100644 (file)
--- a/board/bf537-stamp/config.mk
+++ b/board/bf537-stamp/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 9bae4d18b85aeda70f3a19c4b6cb5bacaa154f75..c0cb9ffc41e1dab3ab1d37e59cd7a625b2c3cd18 100644 (file)
--- a/board/bf538f-ezkit/config.mk
+++ b/board/bf538f-ezkit/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 97b64b9dc6a0635802668744775753b43da43a20..7f38b1469d40724c0c6915c3c329c28e39e1da3b 100644 (file)
--- a/board/bf548-ezkit/config.mk
+++ b/board/bf548-ezkit/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 5633b3b2a440ad518f4bdaf45b25c1991a1fc029..4c811ba35907794f771e42a8e3af00124d7b0468 100644 (file)
--- a/board/bf561-acvilon/config.mk
+++ b/board/bf561-acvilon/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 8b22d0d7988df0a3bbe15994c17384fb9d3010fb..4c811ba35907794f771e42a8e3af00124d7b0468 100644 (file)
--- a/board/bf561-ezkit/config.mk
+++ b/board/bf561-ezkit/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 5bf4189edd537f3bb5bedc7a5e04de9af5bdecc7..25f4c15839e87efd71bbcb5fe2577ab7c52b700f 100644 (file)
--- a/board/blackstamp/config.mk
+++ b/board/blackstamp/config.mk
@@ -23,4 +23,3 @@
 # MA 02111-1307 USA
 #
 
-CONFIG_BFIN_CPU = bf532-0.5

diff --git a/board/blackvme/config.mk b/board/blackvme/config.mk
index 620104ab79c848a1baf069672c976c68f33ce60a..dfcba5c1c81211ce8f17c4c6fcb88349fa93452c 100644 (file)
--- a/board/blackvme/config.mk
+++ b/board/blackvme/config.mk
@@ -22,5 +22,3 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
-
-CONFIG_BFIN_CPU = bf561-0.5

diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk
index b10c3d2ca6a2a638885a20ded5e6482545fea9a4..799a6828ac015f700d70e7b8c72426e936ead30e 100644 (file)
--- a/board/cm-bf527/config.mk
+++ b/board/cm-bf527/config.mk
@@ -23,7 +23,5 @@
 # MA 02111-1307 USA
 #
 
-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 c45a1978bb72ec68aa2e48b9b04c5da7feb1719a..c0cb9ffc41e1dab3ab1d37e59cd7a625b2c3cd18 100644 (file)
--- a/board/cm-bf533/config.mk
+++ b/board/cm-bf533/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 d5d6dd979c4a94dd3eabb163824f73fc541a686b..c0cb9ffc41e1dab3ab1d37e59cd7a625b2c3cd18 100644 (file)
--- a/board/cm-bf537e/config.mk
+++ b/board/cm-bf537e/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 d5d6dd979c4a94dd3eabb163824f73fc541a686b..c0cb9ffc41e1dab3ab1d37e59cd7a625b2c3cd18 100644 (file)
--- a/board/cm-bf537u/config.mk
+++ b/board/cm-bf537u/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 a28a42690385656ccdd02860eb4acf4918ee22b0..5adb6fc163d088cced21fcacfed08feca4dda2e3 100644 (file)
--- a/board/cm-bf548/config.mk
+++ b/board/cm-bf548/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 8b22d0d7988df0a3bbe15994c17384fb9d3010fb..4c811ba35907794f771e42a8e3af00124d7b0468 100644 (file)
--- a/board/cm-bf561/config.mk
+++ b/board/cm-bf561/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 7d25d0b7a2442463dd341a3f1764d5a8f09906bd..afa71418167500ee6655eace3a39f779e64478aa 100644 (file)
--- a/board/ibf-dsp561/config.mk
+++ b/board/ibf-dsp561/config.mk
@@ -23,7 +23,5 @@
 # MA 02111-1307 USA
 #
 
-CONFIG_BFIN_CPU = bf561-0.5
-
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16

diff --git a/board/ip04/config.mk b/board/ip04/config.mk
index 2e9ee28813a31f05e523d63a584f4f5b56676108..7c023d1fea895366d6fe2f562d6d3b22b5201ae5 100644 (file)
--- a/board/ip04/config.mk
+++ b/board/ip04/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-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 d9410920cb65a7d44dd61f4a616f47920497287f..799a6828ac015f700d70e7b8c72426e936ead30e 100644 (file)
--- a/board/tcm-bf518/config.mk
+++ b/board/tcm-bf518/config.mk
@@ -23,7 +23,5 @@
 # MA 02111-1307 USA
 #
 
-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 d5d6dd979c4a94dd3eabb163824f73fc541a686b..c0cb9ffc41e1dab3ab1d37e59cd7a625b2c3cd18 100644 (file)
--- a/board/tcm-bf537/config.mk
+++ b/board/tcm-bf537/config.mk
@@ -23,8 +23,6 @@
 # MA 02111-1307 USA
 #
 
-CONFIG_BFIN_CPU = bf537-0.2
-
 CFLAGS_lib += -O2
 CFLAGS_lib/lzma += -O2
 

diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index fa72c7f10f3fcb72affbd7997a16bd3ce2dc091d..a55e1786dd54ba2654c3e3baa6aad58d482e64b1 100644 (file)
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -11,7 +11,8 @@
 /*
  * Processor Settings
  */
-#define CONFIG_BFIN_BOOT_MODE      BFIN_BOOT_BYPASS
+#define CONFIG_BFIN_CPU             bf536-0.3
+#define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_BYPASS
 
 
 /*

diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 64ca9ed43935fa2676b0467b80f8af52d5ca1863..6eec1c91a7e870c9a731ee497e1d13ef44d51e95 100644 (file)
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -11,6 +11,7 @@
 /*
  * 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 4c30c25392dac2df3d57e399d754f634c1507e63..c28f86712ceeaefdef9a9344617d21f91a03333a 100644 (file)
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -11,6 +11,7 @@
 /*
  * 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 14ade1b1e641bd1f4bf001942955c2b3150cc805..889bfde2c4dea0c462e2493ac49a112479350855 100644 (file)
--- a/include/configs/bf527-ad7160-eval.h
+++ b/include/configs/bf527-ad7160-eval.h
@@ -11,6 +11,7 @@
 /*
  * 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 fa9053b618596f9ee75317083eabf0c6027eb3fe..22a5639e5626a29a9840daf0b12312cb974e6636 100644 (file)
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -11,6 +11,7 @@
 /*
  * Processor Settings
  */
+#define CONFIG_BFIN_CPU             bf527-0.0
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_PARA
 
 

diff --git a/include/configs/bf527-sdp.h b/include/configs/bf527-sdp.h
index 358284619c71b1c0da4d41e6fd868d0b96bb6c4d..c0e8b5adc8816133c5ede9be238450c1fab58b95 100644 (file)
--- a/include/configs/bf527-sdp.h
+++ b/include/configs/bf527-sdp.h
@@ -11,6 +11,7 @@
 /*
  * Processor Settings
  */
+#define CONFIG_BFIN_CPU             bf527-0.2
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_PARA
 
 

diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index e1bb594438888867669d6492af6ba7fb73d5f156..95d3afa85cc5faaf8ff4c82b6c00640dd4eb07be 100644 (file)
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -11,6 +11,7 @@
 /*
  * 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 bf0f063dc010bd29ff9a1ca90a6212de7f56b865..cb37ee797c6e1cd3a87c3b35d9513623b8a41f07 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -11,6 +11,7 @@
 /*
  * 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 0ba29bc0cd8b53de94825ae8b8213310af767ddf..86aa1f61e66148c857074b0885a24c5a29068dd5 100644 (file)
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -24,6 +24,7 @@
 /*
  * 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 da4f2f2f52ef3c0eb2534845d657ab87e211d429..0913ce4e6916593e4d3286ea0c573cb3f79d6c5d 100644 (file)
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -11,6 +11,7 @@
 /*
  * 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 559428f4845fe85a2473ccb5f6c9042b1cad04b0..7e9dd36bce25ab37db1d82c57938524d539e8873 100644 (file)
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -24,6 +24,7 @@
 /*
  * 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 2d1930c3665e367a996ba1521b905ac4ab0ad030..3da23752ebe7d0b316dc66d0cd602cfda9396088 100644 (file)
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -11,6 +11,7 @@
 /*
  * 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 2469c6a0f2228a4e38e988c21614134200ff5765..717a35a81f155ac4a01e639525d4ba4a34b5a53a 100644 (file)
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -11,6 +11,7 @@
 /*
  * 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 1c035cfcadad70948244e0ba5851a0048de5d51e..e862a8ae5e542026acaa2a4344c33285ca7aff59 100644 (file)
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -11,6 +11,7 @@
 /*
  * 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 2b12c3fbe11c31c9fb8790a781eb2482acf877b3..1490b2f9839e94b3515711bd4ccfc68ec0a2d4a3 100644 (file)
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -12,7 +12,8 @@
 /*
  * Processor Settings
  */
-#define CONFIG_BFIN_BOOT_MODE          BFIN_BOOT_BYPASS
+#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 7b020e67fec91b5a38d6b796745e4b9975a36499..7081d5f0db8ac769c4661bc6176dd014f7a52109 100644 (file)
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -11,6 +11,7 @@
 /*
  * 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 3f5c95917d00f3cb413106bcc25a331ff15c13f2..85f08ea88804dfa1d1bcaa3fdcd64173ee93f07c 100644 (file)
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -24,6 +24,7 @@
 /* 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/blackvme.h b/include/configs/blackvme.h
index e4688a27b4a81c791fec1bbc7e9e7e313bdd6736..9950e44f5207becddeec97519af1f93b02c88241 100644 (file)
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -23,7 +23,8 @@
 #define CONFIG_PANIC_HANG 0
 
 /* CPU Options */
-#define CONFIG_BFIN_BOOT_MODE  BFIN_BOOT_SPI_MASTER
+#define CONFIG_BFIN_CPU        bf561-0.5
+#define CONFIG_BFIN_BOOT_MODE  BFIN_BOOT_SPI_MASTER
 
 /*
  *             CLOCK SETTINGS CAVEAT

diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index 84c93099ce97ae2d292e63631dc7e3f9dc13568d..e0c6d53b2c7abf7273b5e303c68eba718dc203c9 100644 (file)
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -11,6 +11,7 @@
 /*
  * 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 dbc4a5b1002a22dcd8bda33279e51a9f4b576ca2..75152964b61d8c358971630357199d80f866a953 100644 (file)
--- a/include/configs/cm-bf533.h
+++ b/include/configs/cm-bf533.h
@@ -11,6 +11,7 @@
 /*
  * 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 c3de96a38065807e3af86e280bc571fb8613985e..934b74b579d43c6bee9f7bc88201d3b348054a10 100644 (file)
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -11,6 +11,7 @@
 /*
  * 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 e60ebf20f0a18de3849836f13ed7ca240fa3f446..c274c20ff5c8c114ae2b2430b332f767d4d6eb68 100644 (file)
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -11,6 +11,7 @@
 /*
  * 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 27b1cc519ccfd4ef9bbfd85aefd406892d51de5a..fa62a8e9c1da26bec526e475af39cd853e8f2e0d 100644 (file)
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -11,6 +11,7 @@
 /*
  * 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 8c350bc2639957332ea81843349b1531a574e813..c60401c8fecb3a33058b720820f58e9fed837f2d 100644 (file)
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -11,6 +11,7 @@
 /*
  * 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 e2dbbb151b8ef4f8711462ae2887b9c83deb71b0..f3d6c8bc7b18a99fac96464bc90de9641dcd5836 100644 (file)
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -11,6 +11,7 @@
 /*
  * 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 528363c6b492adb48d139e47b98d7a703cc29b6f..c024d78c18ac8a2bc972019a5e8f364be6774da2 100644 (file)
--- a/include/configs/ip04.h
+++ b/include/configs/ip04.h
@@ -20,6 +20,7 @@
 /*
  * 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 042d78915c81f58260edc573db66db45cc941cde..52055e80dcbd03fb6b34800aedcf2228c54fbdc8 100644 (file)
--- a/include/configs/tcm-bf518.h
+++ b/include/configs/tcm-bf518.h
@@ -11,6 +11,7 @@
 /*
  * 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 9036ce34186ea0219f45bf416100dd1cd28668bf..8ded17583c6685e62db40d1a8223baf79304c926 100644 (file)
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -11,6 +11,7 @@
 /*
  * Processor Settings
  */
+#define CONFIG_BFIN_CPU             bf537-0.2
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_BYPASS