diff options
| author | Christian Hemp <c.hemp@phytec.de> | 2014-09-12 15:33:46 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-15 07:31:51 +0200 |
| commit | c2a61d761d6f57fb0f476ae387abbab97511fee4 (patch) | |
| tree | e4f5d359e63532e33b13f12b29b6cb4a05fcd2e2 | |
| parent | 2d4bbed323342babb45611b0e755cabe4417e20e (diff) | |
| download | barebox-c2a61d761d6f57fb0f476ae387abbab97511fee4.tar.gz barebox-c2a61d761d6f57fb0f476ae387abbab97511fee4.tar.xz | |
dts:imx6:pfla02: Add env node for SPI-NOR and NAND
Add environment node for NAND and SPI-NOR
Move the environment property to the module file.
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/dts/imx6dl-phytec-pbab01.dts | 5 | ||||
| -rw-r--r-- | arch/arm/dts/imx6q-phytec-pbab01.dts | 5 | ||||
| -rw-r--r-- | arch/arm/dts/imx6qdl-phytec-pbab01.dtsi | 9 | ||||
| -rw-r--r-- | 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 0e90c47768..4b77838926 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@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 26046e01c3..580338dff8 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@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 7d31123855..157e130ff1 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@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 4b8e256924..5c7bcee7f7 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@0 { + label = "barebox"; + reg = <0x0 0x80000>; + }; + partition@1 { + label = "barebox-environment"; + reg = <0x80000 0x80000>; + }; }; |