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>

25 files changed, 50 insertions, 0 deletions

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