Merge branch 'master' of git://git.denx.de/u-boot-imx

[oweals/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9292e9878df39111aaddfc309e5b0485de4ebc1e..80b0d34190fc3bafb834ca8dc039ef8466b20255 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -428,6 +428,10 @@ config ARCH_KEYSTONE
        select CPU_V7
        select SUPPORT_SPL
 
+config ARCH_MX6
+       bool "Freescale MX6"
+       select CPU_V7
+
 config TARGET_M53EVK
        bool "Support m53evk"
        select CPU_V7
@@ -730,6 +734,8 @@ source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
+source "arch/arm/cpu/armv7/mx6/Kconfig"
+
 source "arch/arm/mach-nomadik/Kconfig"
 
 source "arch/arm/cpu/armv7/omap3/Kconfig"
@@ -756,6 +762,8 @@ source "arch/arm/cpu/armv7/Kconfig"
 
 source "arch/arm/cpu/armv8/Kconfig"
 
+source "arch/arm/imx-common/Kconfig"
+
 source "board/aristainetos/Kconfig"
 source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"