5 files changed, 37 insertions, 37 deletions

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index af44a06e07c5..d703247caf20 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -176,7 +176,7 @@ config BF539
         help
           BF539 Processor Support.
 
-config BF542
+config BF542_std
         bool "BF542"
         help
           BF542 Processor Support.
@@ -186,7 +186,7 @@ config BF542M
         help
           BF542 Processor Support.
 
-config BF544
+config BF544_std
         bool "BF544"
         help
           BF544 Processor Support.
@@ -196,7 +196,7 @@ config BF544M
         help
           BF544 Processor Support.
 
-config BF547
+config BF547_std
         bool "BF547"
         help
           BF547 Processor Support.
@@ -206,7 +206,7 @@ config BF547M
         help
           BF547 Processor Support.
 
-config BF548
+config BF548_std
         bool "BF548"
         help
           BF548 Processor Support.
@@ -216,7 +216,7 @@ config BF548M
         help
           BF548 Processor Support.
 
-config BF549
+config BF549_std
         bool "BF549"
         help
           BF549 Processor Support.
@@ -310,31 +310,11 @@ config BF_REV_NONE
 
 endchoice
 
-config BF51x
-        bool
-        depends on (BF512 || BF514 || BF516 || BF518)
-        default y
-
-config BF52x
-        bool
-        depends on (BF522 || BF523 || BF524 || BF525 || BF526 || BF527)
-        default y
-
 config BF53x
         bool
         depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537)
         default y
 
-config BF54xM
-        bool
-        depends on (BF542M || BF544M || BF547M || BF548M || BF549M)
-        default y
-
-config BF54x
-        bool
-        depends on (BF542 || BF544 || BF547 || BF548 || BF549 || BF54xM)
-        default y
-
 config MEM_GENERIC_BOARD
         bool
         depends on GENERIC_BOARD
diff --git a/arch/blackfin/mach-bf518/Kconfig b/arch/blackfin/mach-bf518/Kconfig
index 4c76fefb7a3b..4ab2d166c832 100644
--- a/arch/blackfin/mach-bf518/Kconfig
+++ b/arch/blackfin/mach-bf518/Kconfig
@@ -1,3 +1,7 @@
+config BF51x
+        def_bool y
+        depends on (BF512 || BF514 || BF516 || BF518)
+
 if (BF51x)
 
 source "arch/blackfin/mach-bf518/boards/Kconfig"
diff --git a/arch/blackfin/mach-bf527/Kconfig b/arch/blackfin/mach-bf527/Kconfig
index 848ac6f86823..1f8cbe9d6b9a 100644
--- a/arch/blackfin/mach-bf527/Kconfig
+++ b/arch/blackfin/mach-bf527/Kconfig
@@ -1,3 +1,7 @@
+config BF52x
+        def_bool y
+        depends on (BF522 || BF523 || BF524 || BF525 || BF526 || BF527)
+
 if (BF52x)
 
 source "arch/blackfin/mach-bf527/boards/Kconfig"
diff --git a/arch/blackfin/mach-bf548/Kconfig b/arch/blackfin/mach-bf548/Kconfig
index a09623dfd550..70189a0d1a19 100644
--- a/arch/blackfin/mach-bf548/Kconfig
+++ b/arch/blackfin/mach-bf548/Kconfig
@@ -1,3 +1,27 @@
+config BF542
+        def_bool y
+        depends on BF542_std || BF542M
+config BF544
+        def_bool y
+        depends on BF544_std || BF544M
+config BF547
+        def_bool y
+        depends on BF547_std || BF547M
+config BF548
+        def_bool y
+        depends on BF548_std || BF548M
+config BF549
+        def_bool y
+        depends on BF549_std || BF549M
+
+config BF54xM
+        def_bool y
+        depends on (BF542M || BF544M || BF547M || BF548M || BF549M)
+
+config BF54x
+        def_bool y
+        depends on (BF542 || BF544 || BF547 || BF548 || BF549)
+
 if (BF54x)
 
 source "arch/blackfin/mach-bf548/boards/Kconfig"
diff --git a/arch/blackfin/mach-bf548/include/mach/bf548.h b/arch/blackfin/mach-bf548/include/mach/bf548.h
index 7bead5ce0f3b..751e5e11ecf8 100644
--- a/arch/blackfin/mach-bf548/include/mach/bf548.h
+++ b/arch/blackfin/mach-bf548/include/mach/bf548.h
@@ -81,18 +81,6 @@
 
 #define AMGCTLVAL       (V_AMBEN | V_AMCKEN)
 
-#if defined(CONFIG_BF542M)
-# define CONFIG_BF542
-#elif defined(CONFIG_BF544M)
-# define CONFIG_BF544
-#elif defined(CONFIG_BF547M)
-# define CONFIG_BF547
-#elif defined(CONFIG_BF548M)
-# define CONFIG_BF548
-#elif defined(CONFIG_BF549M)
-# define CONFIG_BF549
-#endif
-
 #if defined(CONFIG_BF542)
 # define CPU   "BF542"
 # define CPUID 0x27de