summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-01-11 13:11:06 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-01-11 13:11:06 +0100
commitb9a2512aaa22086dc84db3f55a0d912b206c11e3 (patch)
tree38cfaccf38003f10032808354fce63d1b369c9e2 /arch/arm/configs
parentb1ebbe76eb48b56ccd804636edcb5fb0b49da98a (diff)
parent0295088d53cd605aaf2a2accfd65c19c0f8a0cf0 (diff)
downloadbarebox-b9a2512aaa22086dc84db3f55a0d912b206c11e3.tar.gz
barebox-b9a2512aaa22086dc84db3f55a0d912b206c11e3.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/socfpga_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index 0a31de518d..7fbe045e27 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -67,6 +67,7 @@ CONFIG_NET=y
CONFIG_NET_NETCONSOLE=y
CONFIG_NET_RESOLV=y
CONFIG_OF_BAREBOX_DRIVERS=y
+CONFIG_OF_BAREBOX_ENV_IN_FS=y
CONFIG_DRIVER_SERIAL_NS16550=y
CONFIG_DRIVER_NET_DESIGNWARE=y
CONFIG_MCI=y