diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:41 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:41 +0200 |
| commit | 2a2a8b9052cf572ab13bcc3d8798addb2ed3470c (patch) | |
| tree | d0f489ced378ddd10dbb8f0c21c8ddb4aa042793 /arch/arm/configs | |
| parent | d0064495d3325cb630bc79550d60a4f4eef57e31 (diff) | |
| parent | 8b8ffecb640bc378a80d35fe79a265b5cfa77e56 (diff) | |
| download | barebox-2a2a8b9052cf572ab13bcc3d8798addb2ed3470c.tar.gz barebox-2a2a8b9052cf572ab13bcc3d8798addb2ed3470c.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index cad47fdff3..2c8eb856cf 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -1,6 +1,7 @@ CONFIG_ARCH_IMX=y CONFIG_IMX_MULTI_BOARDS=y CONFIG_MACH_EFIKA_MX_SMARTBOOK=y +CONFIG_MACH_EMBEDSKY_E9=y CONFIG_MACH_FREESCALE_MX51_PDK=y CONFIG_MACH_FREESCALE_MX53_LOCO=y CONFIG_MACH_TQMA53=y @@ -16,10 +17,10 @@ CONFIG_MACH_SABRELITE=y CONFIG_MACH_SABRESD=y CONFIG_MACH_NITROGEN6X=y CONFIG_MACH_SOLIDRUN_MICROSOM=y -CONFIG_MACH_EMBEDSKY_E9=y CONFIG_MACH_EMBEST_RIOTBOARD=y CONFIG_MACH_UDOO=y CONFIG_MACH_VARISCITE_MX6=y +CONFIG_MACH_GW_VENTANA=y CONFIG_IMX_IIM=y CONFIG_IMX_IIM_FUSE_BLOW=y CONFIG_IMX_OCOTP=y |