diff --git a/arch/arm/dts/vexpress-v2p-ca15.dts b/arch/arm/dts/vexpress-v2p-ca15.dts
index 211eacc..a4cdc8d 100644
--- a/arch/arm/dts/vexpress-v2p-ca15.dts
+++ b/arch/arm/dts/vexpress-v2p-ca15.dts
@@ -5,23 +5,19 @@
 		compatible = "barebox,environment";
 		device-path = &barebox_env;
 	};
+};
 
-	smb@8000000 {
-		motherboard {
-			flash@0,00000000 {
-				#address-cells = <1>;
-				#size-cells = <1>;
+&{/bus@8000000/motherboard/flash@0,00000000} {
+	#address-cells = <1>;
+	#size-cells = <1>;
 
-				partition@0 {
-					label = "barebox";
-					reg = <0x0 0x80000>;
-				};
+	partition@0 {
+		label = "barebox";
+		reg = <0x0 0x80000>;
+	};
 
-				barebox_env: partition@80000 {
-					label = "barebox-environment";
-					reg = <0x80000 0x80000>;
-				};
-			};
-		};
+	barebox_env: partition@80000 {
+		label = "barebox-environment";
+		reg = <0x80000 0x80000>;
 	};
 };
diff --git a/arch/arm/dts/vexpress-v2p-ca9.dts b/arch/arm/dts/vexpress-v2p-ca9.dts
index b13c114..cb4afef 100644
--- a/arch/arm/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/dts/vexpress-v2p-ca9.dts
@@ -10,34 +10,6 @@
 		state = &state;
 	};
 
-	smb@4000000 {
-		motherboard {
-			flash@0,00000000 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-
-					partition@0 {
-						label = "barebox";
-						reg = <0x0 0x80000>;
-					};
-
-					barebox_env: partition@80000 {
-						label = "barebox-environment";
-						reg = <0x80000 0x80000>;
-					};
-
-					state_storage: partition@100000 {
-						label = "barebox-state";
-						reg = <0x100000 0x100000>;
-					};
-				};
-			};
-		};
-	};
-
 	/* State: mutable part */
 	state: state {
 		magic = <0x4d433230>;
@@ -92,3 +64,26 @@
 		};
 	};
 };
+
+&{/bus@4000000/motherboard/flash@0,00000000} {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition@0 {
+			label = "barebox";
+			reg = <0x0 0x80000>;
+		};
+
+		barebox_env: partition@80000 {
+			label = "barebox-environment";
+			reg = <0x80000 0x80000>;
+		};
+
+		state_storage: partition@100000 {
+			label = "barebox-state";
+			reg = <0x100000 0x100000>;
+		};
+	};
+};