Commit 5df326ac authored by Mike Frysinger's avatar Mike Frysinger

Blackfin: push BF5Xx configs down into mach-specific Kconfigs

While we're moving the BF54x code, have the BF54xM variants select the
normal BF54x values so that the rest of the Kconfig tree doesn't need to
check the BF54xM variant everytime it wants to check the BF54x.
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 2f5a0864
...@@ -176,7 +176,7 @@ config BF539 ...@@ -176,7 +176,7 @@ config BF539
help help
BF539 Processor Support. BF539 Processor Support.
config BF542 config BF542_std
bool "BF542" bool "BF542"
help help
BF542 Processor Support. BF542 Processor Support.
...@@ -186,7 +186,7 @@ config BF542M ...@@ -186,7 +186,7 @@ config BF542M
help help
BF542 Processor Support. BF542 Processor Support.
config BF544 config BF544_std
bool "BF544" bool "BF544"
help help
BF544 Processor Support. BF544 Processor Support.
...@@ -196,7 +196,7 @@ config BF544M ...@@ -196,7 +196,7 @@ config BF544M
help help
BF544 Processor Support. BF544 Processor Support.
config BF547 config BF547_std
bool "BF547" bool "BF547"
help help
BF547 Processor Support. BF547 Processor Support.
...@@ -206,7 +206,7 @@ config BF547M ...@@ -206,7 +206,7 @@ config BF547M
help help
BF547 Processor Support. BF547 Processor Support.
config BF548 config BF548_std
bool "BF548" bool "BF548"
help help
BF548 Processor Support. BF548 Processor Support.
...@@ -216,7 +216,7 @@ config BF548M ...@@ -216,7 +216,7 @@ config BF548M
help help
BF548 Processor Support. BF548 Processor Support.
config BF549 config BF549_std
bool "BF549" bool "BF549"
help help
BF549 Processor Support. BF549 Processor Support.
...@@ -310,31 +310,11 @@ config BF_REV_NONE ...@@ -310,31 +310,11 @@ config BF_REV_NONE
endchoice 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 config BF53x
bool bool
depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537) depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537)
default y 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 config MEM_GENERIC_BOARD
bool bool
depends on GENERIC_BOARD depends on GENERIC_BOARD
......
config BF51x
def_bool y
depends on (BF512 || BF514 || BF516 || BF518)
if (BF51x) if (BF51x)
source "arch/blackfin/mach-bf518/boards/Kconfig" source "arch/blackfin/mach-bf518/boards/Kconfig"
......
config BF52x
def_bool y
depends on (BF522 || BF523 || BF524 || BF525 || BF526 || BF527)
if (BF52x) if (BF52x)
source "arch/blackfin/mach-bf527/boards/Kconfig" source "arch/blackfin/mach-bf527/boards/Kconfig"
......
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) if (BF54x)
source "arch/blackfin/mach-bf548/boards/Kconfig" source "arch/blackfin/mach-bf548/boards/Kconfig"
......
...@@ -81,18 +81,6 @@ ...@@ -81,18 +81,6 @@
#define AMGCTLVAL (V_AMBEN | V_AMCKEN) #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) #if defined(CONFIG_BF542)
# define CPU "BF542" # define CPU "BF542"
# define CPUID 0x27de # define CPUID 0x27de
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment