diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:06 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:06 +0100 |
| commit | b1ebbe76eb48b56ccd804636edcb5fb0b49da98a (patch) | |
| tree | a86a92356e9648a07dc800cd094cb7c4ef0383f3 /arch | |
| parent | a7964180e1d7ee8fbddd087ad45dbb96c23c8c1e (diff) | |
| parent | 1b099f06ca4124db7e82f79fdeb8f648c36ad0ac (diff) | |
| download | barebox-b1ebbe76eb48b56ccd804636edcb5fb0b49da98a.tar.gz barebox-b1ebbe76eb48b56ccd804636edcb5fb0b49da98a.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/imx6q-embedsky-e9.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/dts/imx6q-embedsky-e9.dts b/arch/arm/dts/imx6q-embedsky-e9.dts index 4514d4e433..726d620681 100644 --- a/arch/arm/dts/imx6q-embedsky-e9.dts +++ b/arch/arm/dts/imx6q-embedsky-e9.dts @@ -22,13 +22,13 @@ environment-mmc1 { compatible = "barebox,environment"; - device-path = &usdhc2, "partname:barebox-environment"; + device-path = &environment_mmc1; status = "disabled"; }; environment-mmc3 { compatible = "barebox,environment"; - device-path = &usdhc4, "partname:barebox-environment"; + device-path = &environment_mmc3; status = "disabled"; }; @@ -43,7 +43,7 @@ label = "barebox"; reg = <0x0 0x80000>; }; - partition@1 { + environment_mmc1: partition@1 { label = "barebox-environment"; reg = <0x80000 0x80000>; }; @@ -57,7 +57,7 @@ label = "barebox"; reg = <0x0 0x80000>; }; - partition@1 { + environment_mmc3: partition@1 { label = "barebox-environment"; reg = <0x80000 0x80000>; }; |