diff options
| author | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2018-01-10 09:19:12 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-11 09:35:51 +0100 |
| commit | beb402ada8371ec2f6be6cbe6693c47fe59a05fc (patch) | |
| tree | a0a6cc677662e315471c5cccdd85523549af6d15 /arch | |
| parent | b9bddd84dd9e379ba7f094ffab70528a4402a54b (diff) | |
| download | barebox-beb402ada8371ec2f6be6cbe6693c47fe59a05fc.tar.gz barebox-beb402ada8371ec2f6be6cbe6693c47fe59a05fc.tar.xz | |
ARM: socfpga: move environment from dtsi to board dts
Currently all upstream boards use the same barebox-environment setup.
It is however problematic to add new boards, that have a different setup.
Instead of having to /delete-node/ the file-path property in those boards,
move the environment to the specific board files.
This also has the charme of - maybe one day - getting rid of a barebox-version
of socfpga.dtsi :-)
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/socfpga.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts | 6 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_socdk.dts | 8 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_sockit.dts | 6 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_socrates.dts | 6 |
5 files changed, 26 insertions, 8 deletions
diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi index 2fe8f86875..7789c9d3b5 100644 --- a/arch/arm/dts/socfpga.dtsi +++ b/arch/arm/dts/socfpga.dtsi @@ -1,12 +1,4 @@ / { - chosen { - environment@0 { - compatible = "barebox,environment"; - device-path = &mmc, "partname:1"; - file-path = "barebox.env"; - }; - }; - aliases { mmc0 = &mmc; }; diff --git a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts index 087fc71e60..8854ade434 100644 --- a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts +++ b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts @@ -24,6 +24,12 @@ chosen { stdout-path = &uart0; + + environment@0 { + compatible = "barebox,environment"; + device-path = &mmc, "partname:1"; + file-path = "barebox.env"; + }; }; leds: gpio-leds { diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts index f93ac105c4..dfb6273cae 100644 --- a/arch/arm/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts @@ -21,6 +21,14 @@ / { model = "Altera SOCFPGA Cyclone V SoC Development Kit"; compatible = "altr,socdk", "altr,socfpga-cyclone5", "altr,socfpga"; + + chosen { + environment@0 { + compatible = "barebox,environment"; + device-path = &mmc, "partname:1"; + file-path = "barebox.env"; + }; + }; }; &qspi { diff --git a/arch/arm/dts/socfpga_cyclone5_sockit.dts b/arch/arm/dts/socfpga_cyclone5_sockit.dts index 7cb9b96005..8830afeb9a 100644 --- a/arch/arm/dts/socfpga_cyclone5_sockit.dts +++ b/arch/arm/dts/socfpga_cyclone5_sockit.dts @@ -24,5 +24,11 @@ chosen { stdout-path = &uart0; + + environment@0 { + compatible = "barebox,environment"; + device-path = &mmc, "partname:1"; + file-path = "barebox.env"; + }; }; }; diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts index ea7e6cc102..93253af7ec 100644 --- a/arch/arm/dts/socfpga_cyclone5_socrates.dts +++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts @@ -21,6 +21,12 @@ / { chosen { stdout-path = &uart0; + + environment@0 { + compatible = "barebox,environment"; + device-path = &mmc, "partname:1"; + file-path = "barebox.env"; + }; }; aliases { |