diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:22:48 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:22:48 +0100 |
| commit | 0cb6f2c19e6fa41af25a0adaea651b29ef19c482 (patch) | |
| tree | dd7c099a598dde44c157e01f4c8e74237b01ea1c /arch/arm/mach-imx | |
| parent | 28124d02f2979a41b8f635e531c6e422a42ba816 (diff) | |
| parent | f87af10fb158033b922f19828c1164325df4974e (diff) | |
| download | barebox-0cb6f2c19e6fa41af25a0adaea651b29ef19c482.tar.gz barebox-0cb6f2c19e6fa41af25a0adaea651b29ef19c482.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 973aa3755b..c405b2703d 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -20,6 +20,7 @@ config ARCH_TEXT_BASE default 0x97f00000 if MACH_FREESCALE_MX51_PDK default 0x7ff00000 if MACH_FREESCALE_MX53_LOCO default 0x7ff00000 if MACH_FREESCALE_MX53_SMD + default 0x7ff00000 if MACH_FREESCALE_MX53_VMX53 default 0x87f00000 if MACH_GUF_CUPID default 0x93d00000 if MACH_TX25 default 0x7ff00000 if MACH_TQMA53 @@ -197,6 +198,13 @@ config MACH_FREESCALE_MX53_LOCO bool "Freescale i.MX53 LOCO" select ARCH_IMX53 +config MACH_FREESCALE_MX53_VMX53 + bool "Voipac i.MX53" + select ARCH_IMX53 + help + Say Y here if you are using the Voipac Technologies X53-DMM-668 + module equipped with a Freescale i.MX53 Processor + config MACH_PHYTEC_PFLA02 bool "Phytec phyFLEX-i.MX6 Ouad" select ARCH_IMX6 @@ -219,6 +227,16 @@ config MACH_TQMA6X bool "TQ tqma6x on mba6x" select ARCH_IMX6 +config MACH_SABRELITE + bool "Freescale i.MX6 Sabre Lite" + select ARCH_IMX6 + select HAVE_DEFAULT_ENVIRONMENT_NEW + select HAVE_PBL_MULTI_IMAGES + +config MACH_SOLIDRUN_CARRIER1 + bool "SolidRun CuBox-i Carrier-1" + select ARCH_IMX6 + endif # ---------------------------------------------------------- @@ -449,11 +467,6 @@ config MACH_MX6Q_ARM2 bool "Freescale i.MX6q Armadillo2" select ARCH_IMX6 -config MACH_SABRELITE - bool "Freescale i.MX6 Sabre Lite" - select ARCH_IMX6 - select HAVE_DEFAULT_ENVIRONMENT_NEW - config MACH_SABRESD bool "Freescale i.MX6 SabreSD" select ARCH_IMX6 |