diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-08-03 08:08:23 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-08-03 08:08:23 +0200 |
commit | 14e04d019b70cb8711b005bc316ac6a52d61db39 (patch) | |
tree | 0ea694070006e8de3ab372a67cf7c51b6ce9b259 /arch/arm/configs | |
parent | 6a86c6d40468a04c94b859b8b497e6dcff6dcc83 (diff) | |
parent | 74102fdf730b89cbc6dd0fe34c0d9b5f86ed7d8c (diff) | |
download | barebox-14e04d019b70cb8711b005bc316ac6a52d61db39.tar.gz barebox-14e04d019b70cb8711b005bc316ac6a52d61db39.tar.xz |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 8594965b54..e3a8f478d2 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -18,7 +18,7 @@ CONFIG_MACH_TX6X=y CONFIG_MACH_SABRELITE=y CONFIG_MACH_SABRESD=y CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB=y -CONFIG_MACH_NITROGEN6X=y +CONFIG_MACH_NITROGEN6=y CONFIG_MACH_SOLIDRUN_MICROSOM=y CONFIG_MACH_TECHNEXION_WANDBOARD=y CONFIG_MACH_EMBEST_RIOTBOARD=y |