summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-04-13 10:52:46 -0400
committerTom Rini <trini@konsulko.com>2015-04-13 10:52:46 -0400
commit1d2f74690cace803844bce198a6d5fa1b6cd11f9 (patch)
treefe713c6eb089b5fb11af4135089fc977023fca41 /arch
parent787affb41b6f0cca797a36383705f30ce9ca5c25 (diff)
parent3bf801a2176e3330a3ef696d974d0d198d99b7e9 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig6
-rw-r--r--arch/arm/cpu/armv7/mx5/Kconfig27
2 files changed, 33 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 086ca8514f..7ed0e20521 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -437,6 +437,10 @@ config ARCH_MX6
bool "Freescale MX6"
select CPU_V7
+config ARCH_MX5
+ bool "Freescale MX5"
+ select CPU_V7
+
config TARGET_M53EVK
bool "Support m53evk"
select CPU_V7
@@ -741,6 +745,8 @@ source "arch/arm/mach-kirkwood/Kconfig"
source "arch/arm/cpu/armv7/mx6/Kconfig"
+source "arch/arm/cpu/armv7/mx5/Kconfig"
+
source "arch/arm/mach-nomadik/Kconfig"
source "arch/arm/cpu/armv7/omap3/Kconfig"
diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/cpu/armv7/mx5/Kconfig
new file mode 100644
index 0000000000..2d6c0ce29d
--- /dev/null
+++ b/arch/arm/cpu/armv7/mx5/Kconfig
@@ -0,0 +1,27 @@
+if ARCH_MX5
+
+config MX5
+ bool
+ default y
+
+config MX51
+ bool
+
+config MX53
+ bool
+
+choice
+ prompt "MX5 board select"
+
+config TARGET_USBARMORY
+ bool "Support USB armory"
+ select CPU_V7
+
+endchoice
+
+config SYS_SOC
+ default "mx5"
+
+source "board/inversepath/usbarmory/Kconfig"
+
+endif