Merge branch 'core/urgent' into x86/urgent, to pick up objtool fix

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / at91-sama5d3_xplained.dts

diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 02c1d2958d7809e597c630fc15270f4da965311f..322a744e4363374e4dbc10f6c54d0cbd59a2320c 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -297,12 +297,17 @@
 
                                                bootloader@40000 {
                                                        label = "bootloader";
-                                                       reg = <0x40000 0x80000>;
+                                                       reg = <0x40000 0xc0000>;
                                                };
 
-                                               bootloaderenv@c0000 {
+                                               bootloaderenvred@100000 {
+                                                       label = "bootloader env redundant";
+                                                       reg = <0x100000 0x40000>;
+                                               };
+
+                                               bootloaderenv@140000 {
                                                        label = "bootloader env";
-                                                       reg = <0xc0000 0xc0000>;
+                                                       reg = <0x140000 0x40000>;
                                                };
 
                                                dtb@180000 {