* [PATCH 2/2] ARM: socfpga: move environment from dtsi to board dts
2018-01-10 8:19 [PATCH 1/2] ARM: socfpga: get rid of clock-frequency assignments Steffen Trumtrar
@ 2018-01-10 8:19 ` Steffen Trumtrar
2018-01-11 8:36 ` [PATCH 1/2] ARM: socfpga: get rid of clock-frequency assignments Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Steffen Trumtrar @ 2018-01-10 8:19 UTC (permalink / raw)
To: barebox; +Cc: Steffen Trumtrar
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>
---
arch/arm/dts/socfpga.dtsi | 8 --------
arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts | 6 ++++++
arch/arm/dts/socfpga_cyclone5_socdk.dts | 8 ++++++++
arch/arm/dts/socfpga_cyclone5_sockit.dts | 6 ++++++
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 2fe8f8687593..7789c9d3b5c2 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 087fc71e60ef..8854ade43468 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 f93ac105c46f..dfb6273cae15 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 7cb9b9600563..8830afeb9a6b 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 ea7e6cc102bd..93253af7ec0f 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 {
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] ARM: socfpga: get rid of clock-frequency assignments
2018-01-10 8:19 [PATCH 1/2] ARM: socfpga: get rid of clock-frequency assignments Steffen Trumtrar
2018-01-10 8:19 ` [PATCH 2/2] ARM: socfpga: move environment from dtsi to board dts Steffen Trumtrar
@ 2018-01-11 8:36 ` Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2018-01-11 8:36 UTC (permalink / raw)
To: Steffen Trumtrar; +Cc: barebox
On Wed, Jan 10, 2018 at 09:19:11AM +0100, Steffen Trumtrar wrote:
> The clock framework used to need the clock-frequency property,
> even if 0, to work correctly.
> This is no longer necessary. So, get rid of the assignments.
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
> arch/arm/dts/socfpga.dtsi | 11 -----------
> 1 file changed, 11 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
> index b3a7f69ffe09..2fe8f8687593 100644
> --- a/arch/arm/dts/socfpga.dtsi
> +++ b/arch/arm/dts/socfpga.dtsi
> @@ -11,17 +11,6 @@
> mmc0 = &mmc;
> };
> };
> -&osc2 {
> - clock-frequency = <0>;
> -};
> -
> -&f2s_periph_ref_clk {
> - clock-frequency = <0>;
> -};
> -
> -&f2s_sdram_ref_clk {
> - clock-frequency = <0>;
> -};
>
> &watchdog0 {
> resets = <&rst L4WD0_RESET>;
> --
> 2.11.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
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 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread