diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-24 10:38:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-24 10:38:23 +0200 |
| commit | ba361ee78f915aa9e26acbbdf6f57712c69506d2 (patch) | |
| tree | 60fb18386ba11f4b8653133abbf630e98aa2f8f6 /arch/arm/mach-imx/Kconfig | |
| parent | b108afa01ac0ceb72db750fefd32a67c0247c9ca (diff) | |
| parent | fd9c7d412ee7ff7b351be35afa01ccfc48404080 (diff) | |
| download | barebox-ba361ee78f915aa9e26acbbdf6f57712c69506d2.tar.gz barebox-ba361ee78f915aa9e26acbbdf6f57712c69506d2.tar.xz | |
Merge branch 'pu/mx6-v2' into next
Conflicts:
arch/arm/Makefile
arch/arm/mach-imx/Kconfig
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 2b3a45c60..32367627d 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 " |