summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
-rw-r--r--arch/arm/mach-imx/Kconfig22
1 files changed, 21 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 2b3a45c600..32367627d4 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -25,6 +25,7 @@ config ARCH_TEXT_BASE
default 0x93d00000 if MACH_TX25
default 0x7ff00000 if MACH_TQMA53
default 0x97f00000 if MACH_TX51
+ default 0x4fc00000 if MACH_MX6Q_ARM2
config BOARDINFO
default "Eukrea CPUIMX25" if MACH_EUKREA_CPUIMX25
@@ -48,6 +49,7 @@ config BOARDINFO
default "Ka-Ro tx25" if MACH_TX25
default "TQ tqma53" if MACH_TQMA53
default "Ka-Ro tx51" if MACH_TX51
+ default "Freescale i.MX6q armadillo2" if MACH_MX6Q_ARM2
choice
prompt "Select boot mode"
@@ -70,7 +72,7 @@ choice
config ARCH_IMX_INTERNAL_BOOT
bool "support internal boot mode"
- depends on ARCH_IMX25 || ARCH_IMX35 || ARCH_IMX51 || ARCH_IMX53
+ depends on ARCH_IMX25 || ARCH_IMX35 || ARCH_IMX51 || ARCH_IMX53 || ARCH_IMX6
config ARCH_IMX_EXTERNAL_BOOT
bool "support external boot mode"
@@ -167,6 +169,11 @@ config ARCH_IMX53
select CPU_V7
select ARCH_HAS_FEC_IMX
+config ARCH_IMX6
+ bool "i.MX6"
+ select ARCH_HAS_FEC_IMX
+ select CPU_V7
+
endchoice
# ----------------------------------------------------------
@@ -420,6 +427,19 @@ endchoice
endif
+if ARCH_IMX6
+
+choice
+
+ prompt "i.MX6 Board Type"
+
+config MACH_MX6Q_ARM2
+ bool "Freescale i.MX6q Armadillo2"
+
+endchoice
+
+endif
+
# ----------------------------------------------------------
menu "Board specific settings "