[PATCH 09/10] dts:imx6:pfla02: Add env node for SPI-NOR and NAND
Christian Hemp
c.hemp at phytec.de
Fri Sep 12 06:33:46 PDT 2014
Add environment node for NAND and SPI-NOR
Move the environment property to the module file.
Signed-off-by: Christian Hemp <c.hemp at phytec.de>
---
arch/arm/dts/imx6dl-phytec-pbab01.dts | 5 ----
arch/arm/dts/imx6q-phytec-pbab01.dts | 5 ----
arch/arm/dts/imx6qdl-phytec-pbab01.dtsi | 9 --------
arch/arm/dts/imx6qdl-phytec-pfla02.dtsi | 34 +++++++++++++++++++++++++++++++
4 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/arch/arm/dts/imx6dl-phytec-pbab01.dts b/arch/arm/dts/imx6dl-phytec-pbab01.dts
index 0e90c47..4b77838 100644
--- a/arch/arm/dts/imx6dl-phytec-pbab01.dts
+++ b/arch/arm/dts/imx6dl-phytec-pbab01.dts
@@ -20,10 +20,5 @@
chosen {
linux,stdout-path = &uart4;
-
- environment at 0 {
- compatible = "barebox,environment";
- device-path = &flash, "partname:barebox-environment";
- };
};
};
diff --git a/arch/arm/dts/imx6q-phytec-pbab01.dts b/arch/arm/dts/imx6q-phytec-pbab01.dts
index 26046e0..580338d 100644
--- a/arch/arm/dts/imx6q-phytec-pbab01.dts
+++ b/arch/arm/dts/imx6q-phytec-pbab01.dts
@@ -19,10 +19,5 @@
chosen {
linux,stdout-path = &uart4;
-
- environment at 0 {
- compatible = "barebox,environment";
- device-path = &flash, "partname:barebox-environment";
- };
};
};
diff --git a/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi b/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi
index 7d31123..157e130 100644
--- a/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi
@@ -9,15 +9,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-/ {
- chosen {
- environment at 0 {
- compatible = "barebox,environment";
- device-path = &flash, "partname:barebox-environment";
- };
- };
-};
-
&fec {
status = "okay";
};
diff --git a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
index 4b8e256..5c7bcee 100644
--- a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
@@ -9,6 +9,28 @@
* http://www.gnu.org/copyleft/gpl.html
*/
+/ {
+ chosen {
+ environment-nand {
+ compatible = "barebox,environment";
+ device-path = &gpmi, "partname:barebox-environment";
+ status = "disabled";
+ };
+
+ environment-spinor {
+ compatible = "barebox,environment";
+ device-path = &flash, "partname:barebox-environment";
+ status = "disabled";
+ };
+
+ environment-sd {
+ compatible = "barebox,environment";
+ device-path = &usdhc3, "partname:barebox-environment";
+ status = "disabled";
+ };
+ };
+};
+
&ecspi3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>;
@@ -214,4 +236,16 @@
cd-gpios = <&gpio1 27 0>;
wp-gpios = <&gpio1 29 0>;
status = "disabled";
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "barebox";
+ reg = <0x0 0x80000>;
+ };
+ partition at 1 {
+ label = "barebox-environment";
+ reg = <0x80000 0x80000>;
+ };
};
--
1.7.0.4
More information about the barebox
mailing list