diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
commit | 363a1343698aa2d3aeaee8f7d115ca01e3ae7b32 (patch) | |
tree | f4cf75be855f292ce721c611615981617025ba9d /arch/arm/mach-mxs | |
parent | 80fb825db28eb04ffa62453bd9a5ecce341f01c3 (diff) | |
parent | 6ee264d8e5db749b1568b6c9fe7e60bf0430124f (diff) | |
download | barebox-363a1343698aa2d3aeaee8f7d115ca01e3ae7b32.tar.gz barebox-363a1343698aa2d3aeaee8f7d115ca01e3ae7b32.tar.xz |
Merge branch 'for-next/cfa-10036'
Diffstat (limited to 'arch/arm/mach-mxs')
-rw-r--r-- | arch/arm/mach-mxs/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index 746c986083..6f324a0af8 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig @@ -6,12 +6,14 @@ config ARCH_TEXT_BASE default 0x42000000 if MACH_CHUMBY default 0x47000000 if MACH_TX28 default 0x47000000 if MACH_MX28EVK + default 0x47000000 if MACH_CFA10036 config BOARDINFO default "Freescale i.MX23-EVK" if MACH_MX23EVK default "Chumby Falconwing" if MACH_CHUMBY default "Karo TX28" if MACH_TX28 default "Freescale i.MX28-EVK" if MACH_MX28EVK + default "Crystalfontz CFA-10036" if MACH_CFA10036 comment "Freescale i.MX System-on-Chip" @@ -65,6 +67,12 @@ config MACH_MX28EVK help Say Y here if you are using the Freescale i.MX28-EVK board +config MACH_CFA10036 + bool "cfa-10036" + select HAVE_DEFAULT_ENVIRONMENT_NEW + help + Say Y here if you are using the Crystalfontz CFA-10036 module + endchoice endif |