diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2009-02-04 08:49:45 (GMT) |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2009-02-04 08:49:45 (GMT) |
commit | 2f89c0632f6e27cc3e5eb66605490ddf67ef4953 (patch) | |
tree | 15a6cd1b4dcb31914433c348f647eb47fb92dd25 /arch/blackfin | |
parent | d3522648676d4c8869e5539bca081820e69e24a4 (diff) | |
download | linux-fsl-qoriq-2f89c0632f6e27cc3e5eb66605490ddf67ef4953.tar.xz |
Blackfin arch: add support for mobile ddr bf54x parts
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/Kconfig | 52 | ||||
-rw-r--r-- | arch/blackfin/Makefile | 10 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/include/mach/bf548.h | 12 |
3 files changed, 63 insertions, 11 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index a949c4f..8f1f97d 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -169,26 +169,51 @@ config BF542 help BF542 Processor Support. +config BF542M + bool "BF542m" + help + BF542 Processor Support. + config BF544 bool "BF544" help BF544 Processor Support. +config BF544M + bool "BF544m" + help + BF544 Processor Support. + config BF547 bool "BF547" help BF547 Processor Support. +config BF547M + bool "BF547m" + help + BF547 Processor Support. + config BF548 bool "BF548" help BF548 Processor Support. +config BF548M + bool "BF548m" + help + BF548 Processor Support. + config BF549 bool "BF549" help BF549 Processor Support. +config BF549M + bool "BF549m" + help + BF549 Processor Support. + config BF561 bool "BF561" help @@ -224,39 +249,39 @@ config TICK_SOURCE_SYSTMR0 config BF_REV_MIN int - default 0 if (BF51x || BF52x || BF54x) + default 0 if (BF51x || BF52x || (BF54x && !BF54xM)) default 2 if (BF537 || BF536 || BF534) - default 3 if (BF561 ||BF533 || BF532 || BF531) + default 3 if (BF561 || BF533 || BF532 || BF531 || BF54xM) default 4 if (BF538 || BF539) config BF_REV_MAX int - default 2 if (BF51x || BF52x || BF54x) - default 3 if (BF537 || BF536 || BF534) + default 2 if (BF51x || BF52x || (BF54x && !BF54xM)) + default 3 if (BF537 || BF536 || BF534 || BF54xM) default 5 if (BF561 || BF538 || BF539) default 6 if (BF533 || BF532 || BF531) choice prompt "Silicon Rev" - default BF_REV_0_1 if (BF51x || BF52x || BF54x) + default BF_REV_0_1 if (BF51x || BF52x || (BF54x && !BF54xM)) default BF_REV_0_2 if (BF534 || BF536 || BF537) - default BF_REV_0_3 if (BF531 || BF532 || BF533 || BF561) + default BF_REV_0_3 if (BF531 || BF532 || BF533 || BF54xM || BF561) config BF_REV_0_0 bool "0.0" - depends on (BF51x || BF52x || BF54x) + depends on (BF51x || BF52x || (BF54x && !BF54xM)) config BF_REV_0_1 bool "0.1" - depends on (BF52x || BF54x) + depends on (BF52x || (BF54x && !BF54xM)) config BF_REV_0_2 bool "0.2" - depends on (BF52x || BF537 || BF536 || BF534 || BF54x) + depends on (BF52x || BF537 || BF536 || BF534 || (BF54x && !BF54xM)) config BF_REV_0_3 bool "0.3" - depends on (BF561 || BF537 || BF536 || BF534 || BF533 || BF532 || BF531) + depends on (BF54xM || BF561 || BF537 || BF536 || BF534 || BF533 || BF532 || BF531) config BF_REV_0_4 bool "0.4" @@ -293,9 +318,14 @@ config BF53x 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) + depends on (BF542 || BF544 || BF547 || BF548 || BF549 || BF54xM) default y config MEM_GENERIC_BOARD diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index e550c8d..8dd003b 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile @@ -40,10 +40,15 @@ machine-$(CONFIG_BF537) := bf537 machine-$(CONFIG_BF538) := bf538 machine-$(CONFIG_BF539) := bf538 machine-$(CONFIG_BF542) := bf548 +machine-$(CONFIG_BF542M) := bf548 machine-$(CONFIG_BF544) := bf548 +machine-$(CONFIG_BF544M) := bf548 machine-$(CONFIG_BF547) := bf548 +machine-$(CONFIG_BF547M) := bf548 machine-$(CONFIG_BF548) := bf548 +machine-$(CONFIG_BF548M) := bf548 machine-$(CONFIG_BF549) := bf548 +machine-$(CONFIG_BF549M) := bf548 machine-$(CONFIG_BF561) := bf561 MACHINE := $(machine-y) export MACHINE @@ -67,10 +72,15 @@ cpu-$(CONFIG_BF537) := bf537 cpu-$(CONFIG_BF538) := bf538 cpu-$(CONFIG_BF539) := bf539 cpu-$(CONFIG_BF542) := bf542 +cpu-$(CONFIG_BF542M) := bf542m cpu-$(CONFIG_BF544) := bf544 +cpu-$(CONFIG_BF544M) := bf544m cpu-$(CONFIG_BF547) := bf547 +cpu-$(CONFIG_BF547M) := bf547m cpu-$(CONFIG_BF548) := bf548 +cpu-$(CONFIG_BF548M) := bf548m cpu-$(CONFIG_BF549) := bf549 +cpu-$(CONFIG_BF549M) := bf549m cpu-$(CONFIG_BF561) := bf561 rev-$(CONFIG_BF_REV_0_0) := 0.0 diff --git a/arch/blackfin/mach-bf548/include/mach/bf548.h b/arch/blackfin/mach-bf548/include/mach/bf548.h index f0e5699..cd31f72 100644 --- a/arch/blackfin/mach-bf548/include/mach/bf548.h +++ b/arch/blackfin/mach-bf548/include/mach/bf548.h @@ -104,6 +104,18 @@ #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 |