summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-10-17 08:10:19 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-10-17 08:10:19 +0200
commitb4e30bb8b73c9702d3283e1b514d672978b6951d (patch)
treeeed477fdd1b707261022bb8785ef2a3d707ce118 /arch/arm/configs
parent97f279282bddf9017837c44830d6079637768607 (diff)
parent94e2382281ba950d63df78ead7fc5ca9aad72cda (diff)
downloadbarebox-b4e30bb8b73c9702d3283e1b514d672978b6951d.tar.gz
barebox-b4e30bb8b73c9702d3283e1b514d672978b6951d.tar.xz
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/imx_v7_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index 18c2775687..8b8178a96f 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -27,6 +27,7 @@ CONFIG_MACH_NITROGEN6=y
CONFIG_MACH_SOLIDRUN_MICROSOM=y
CONFIG_MACH_TECHNEXION_PICO_HOBBIT=y
CONFIG_MACH_TECHNEXION_WANDBOARD=y
+CONFIG_MACH_EMBEST_MARSBOARD=y
CONFIG_MACH_EMBEST_RIOTBOARD=y
CONFIG_MACH_UDOO=y
CONFIG_MACH_VARISCITE_MX6=y