summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorTrent Piepho <tpiepho@kymetacorp.com>2015-12-17 00:53:59 +0000
committerSascha Hauer <s.hauer@pengutronix.de>2016-01-08 08:30:56 +0100
commit76b059f311a3e79afea055618f692591c618e6d6 (patch)
treedb293e013da9fee4a3e5ff17f826e058748958c2 /arch/arm/configs
parent3a0e9b49e7f167e1bec2257b44e4f0ca91497cc6 (diff)
downloadbarebox-76b059f311a3e79afea055618f692591c618e6d6.tar.gz
barebox-76b059f311a3e79afea055618f692591c618e6d6.tar.xz
socfpga: Find partition with environment via device tree
socfpga would load the environment from a file named "barebox.env" located on the device "/dev/mmc0.1". Both those names are hard-coded in the socfpga code and can't be changed. Barebox supports selecting the location of the environment using a "barebox,environment" node in device tree's "chosen" node. And recently supports specifying that the env should come from a file on this device. Change socfpga to use this mechanism by adding the appropriate device node. Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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