Merge branch 'for-next/misc' into master

4 files changed, 16 insertions, 21 deletions

diff --git a/arch/arm/dts/am335x-baltos-minimal.dts b/arch/arm/dts/am335x-baltos-minimal.dts
index 137c177b2f..a57bb6c802 100644
--- a/arch/arm/dts/am335x-baltos-minimal.dts
+++ b/arch/arm/dts/am335x-baltos-minimal.dts
@@ -22,6 +22,11 @@
 
 	chosen {
 		stdout-path = &uart0;
+
+		environment-nand {
+			compatible = "barebox,environment";
+			device-path = &environment_nand;
+		};
 	};
 
 	cpus {
@@ -179,7 +184,7 @@
 	ranges = <0 0 0x08000000 0x10000000>;	/* CS0: NAND */
 	status = "okay";
 
-	nand@0,0 {
+	nand: nand@0,0 {
 		reg = <0 0 0>; /* CS0, offset 0 */
 		nand-bus-width = <8>;
 		ti,nand-ecc-opt = "bch8";
@@ -226,8 +231,8 @@
 		       label = "SPL.backup2";
 		       reg = <0x40000 0x20000>;
 		};
-		boot@60000 {
-		       label = "SPL.backup3";
+		environment_nand: boot@60000 {
+		       label = "bareboxenv";
 		       reg = <0x60000 0x20000>;
 		};
 		boot@80000 {
diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts
index 2fce0114c8..6071dbfb49 100644
--- a/arch/arm/dts/socfpga_arria10_achilles.dts
+++ b/arch/arm/dts/socfpga_arria10_achilles.dts
@@ -106,24 +106,6 @@
 			};
 		};
 	};
-
-	bootstate: bootstate {
-		compatible = "barebox,bootstate";
-		backend-type = "state"; // or "nv", or "efivar"
-		backend = <&state>;
-
-		system0 {
-			default_attempts = <3>;
-		};
-
-		system1 {
-			default_attempts = <3>;
-		};
-
-		factory {
-			default_attempts = <3>;
-		};
-	};
 };
 
 &{/soc/clkmgr@ffd04000/clocks/osc1} {
diff --git a/arch/arm/dts/vexpress-v2p-ca15.dts b/arch/arm/dts/vexpress-v2p-ca15.dts
index 69e93ee7b2..78d0025909 100644
--- a/arch/arm/dts/vexpress-v2p-ca15.dts
+++ b/arch/arm/dts/vexpress-v2p-ca15.dts
@@ -5,6 +5,10 @@
 		compatible = "barebox,environment";
 		device-path = &barebox_env;
 	};
+
+	chosen {
+		stdout-path = &v2m_serial0;
+	};
 };
 
 &nor_flash {
diff --git a/arch/arm/dts/vexpress-v2p-ca9.dts b/arch/arm/dts/vexpress-v2p-ca9.dts
index cb4afef185..8be04b174b 100644
--- a/arch/arm/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/dts/vexpress-v2p-ca9.dts
@@ -10,6 +10,10 @@
 		state = &state;
 	};
 
+	chosen {
+		stdout-path = &v2m_serial0;
+	};
+
 	/* State: mutable part */
 	state: state {
 		magic = <0x4d433230>;