diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:16 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:16 +0100 |
| commit | fcad6e3394943e32bc9e08d971f2c6511a99a151 (patch) | |
| tree | f8f4ad6996ef81492d49c36273ef78aac75bd781 /arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | |
| parent | 394b88e6872c607e5317cf57c61c641288555311 (diff) | |
| parent | e6e12e9368f730d5e50c9495c2332abe2ad6abf0 (diff) | |
| download | barebox-fcad6e3394943e32bc9e08d971f2c6511a99a151.tar.gz barebox-fcad6e3394943e32bc9e08d971f2c6511a99a151.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi')
| -rw-r--r-- | arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi index 918b62f794..e99846c2b6 100644 --- a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi @@ -29,7 +29,7 @@ environment-spinor { compatible = "barebox,environment"; - device-path = &m25p80, "partname:barebox-environment"; + device-path = &m25p80, "partname:nor.barebox-environment"; status = "disabled"; }; }; @@ -86,22 +86,22 @@ #size-cells = <1>; partition@0 { - label = "barebox"; + label = "nor.barebox"; reg = <0x0 0x100000>; }; partition@100000 { - label = "barebox-environment"; + label = "nor.barebox-environment"; reg = <0x100000 0x20000>; }; partition@120000 { - label = "oftree"; + label = "nor.oftree"; reg = <0x120000 0x20000>; }; partition@140000 { - label = "kernel"; + label = "nor.kernel"; reg = <0x140000 0x0>; }; }; |