diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:24:46 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:24:46 +0100 |
| commit | 9c2aa617030a44f3d336b5fef3861eac142290d2 (patch) | |
| tree | 5d7781f36a0c5677c6c49431f79a3760da46b5b3 /arch/arm/dts/imx6qdl-sabresd.dtsi | |
| parent | 048b03641e9350bbf6672ce22003a663eebe0c3f (diff) | |
| parent | d7db7df1879e17d547e123f9a56abeac26aab203 (diff) | |
| download | barebox-9c2aa617030a44f3d336b5fef3861eac142290d2.tar.gz barebox-9c2aa617030a44f3d336b5fef3861eac142290d2.tar.xz | |
Merge branch 'for-next/imx-image'
Conflicts:
arch/arm/dts/Makefile
Diffstat (limited to 'arch/arm/dts/imx6qdl-sabresd.dtsi')
| -rw-r--r-- | arch/arm/dts/imx6qdl-sabresd.dtsi | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/dts/imx6qdl-sabresd.dtsi b/arch/arm/dts/imx6qdl-sabresd.dtsi index 78c9fd54eb..88a9a646ee 100644 --- a/arch/arm/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/dts/imx6qdl-sabresd.dtsi @@ -311,4 +311,17 @@ cd-gpios = <&gpio2 0 0>; wp-gpios = <&gpio2 1 0>; status = "okay"; + + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "barebox"; + reg = <0x0 0x80000>; + }; + + partition@1 { + label = "barebox-environment"; + reg = <0x80000 0x80000>; + }; }; |