[PATCH 4/4] socfpga: Find partition with environment via device tree

[Sascha Hauer]

On Thu, Dec 17, 2015 at 12:53:59AM +0000, Trent Piepho wrote:
> 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 at kymetacorp.com>
> ---
>  arch/arm/configs/socfpga_defconfig |  1 +
>  arch/arm/dts/socfpga.dtsi          |  8 ++++++++
>  arch/arm/mach-socfpga/generic.c    | 38 --------------------------------------
>  3 files changed, 9 insertions(+), 38 deletions(-)
> 
> diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
> index 0a31de5..7fbe045 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
> diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
> index d4d498b..d16758f 100644
> --- a/arch/arm/dts/socfpga.dtsi
> +++ b/arch/arm/dts/socfpga.dtsi
> @@ -1,4 +1,12 @@
>  / {
> +	chosen {
> +		environment at 0 {
> +			compatible = "barebox,environment";
> +			device-path = &mmc, "partname:1";
> +			file-path = "barebox.env";
> +		};
> +	};
> +

I applied this series as is. We might have to move this to the board dts
files later as putting this into the SoC dtsi file does not allow the
boards to put the environment somewhere else. That was not possible
before this patch either, so this doesn't change much at the moment.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |