Merge branch 'for-next/misc'

2 files changed, 78 insertions, 85 deletions

diff --git a/common/Kconfig b/common/Kconfig
index 9e175d36c4..d957970993 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1479,6 +1479,10 @@ config DEBUG_SUN20I
 	depends on SOC_ALLWINNER_SUN20I
 	select DEBUG_LL_NS16550
 
+config DEBUG_QEMU_ARM64_VIRT
+	bool "QEMU ARM64 Virt PL011 console"
+	depends on ARCH_ARM64_VIRT
+
 endchoice
 
 config DEBUG_LL_NS16550
diff --git a/common/boards/qemu-virt/overlay-of-flash.dts b/common/boards/qemu-virt/overlay-of-flash.dts
index 3f2beaac37..15c8cc450d 100644
--- a/common/boards/qemu-virt/overlay-of-flash.dts
+++ b/common/boards/qemu-virt/overlay-of-flash.dts
@@ -4,110 +4,99 @@
 /plugin/;
 
 #ifdef RISCV_VIRT
-#define PARTS_TARGET_PATH	"/flash@20000000"
+#define PARTS_TARGET_PATH	/flash@20000000
 #define ENV_DEVICE_PATH		"/flash@20000000/partitions/partition@3c00000"
 #else
-#define PARTS_TARGET_PATH	"/flash@0"
+#define PARTS_TARGET_PATH	/flash@0
 #define ENV_DEVICE_PATH		"/flash@0/partitions/partition@3c00000"
 #endif
 
-/ {
-	fragment@0 {
-		target-path = PARTS_TARGET_PATH;
-		__overlay__ {
-			partitions {
-				compatible = "fixed-partitions";
-				#address-cells = <1>;
-				#size-cells = <1>;
+&{PARTS_TARGET_PATH} {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-				partition@0 {
-					label = "initramfs";
-					reg = <0x0 0x3c00000>;
-				};
+		partition@0 {
+			label = "initramfs";
+			reg = <0x0 0x3c00000>;
+		};
 
-				environment_flash: partition@3c00000 {
-					label = "barebox-environment";
-					reg = <0x3c00000 0x200000>;
-				};
+		environment_flash: partition@3c00000 {
+			label = "barebox-environment";
+			reg = <0x3c00000 0x200000>;
+		};
 
-				backend_state_flash: partition@3e00000 {
-					label = "barebox-state";
-					reg = <0x3e00000 0x200000>;
-				};
-			};
+		backend_state_flash: partition@3e00000 {
+			label = "barebox-state";
+			reg = <0x3e00000 0x200000>;
 		};
 	};
+};
 
-	fragment@1 {
-		target-path = "/chosen";
-		__overlay__ {
-			environment {
-				compatible = "barebox,environment";
-				device-path = ENV_DEVICE_PATH;
-			};
-		};
+&{/chosen} {
+	environment {
+		compatible = "barebox,environment";
+		device-path = ENV_DEVICE_PATH;
+	};
+};
+
+&{/} {
+	aliases {
+		state = "/state";
 	};
 
-	fragment@2 {
-		target-path = "/";
-		__overlay__ {
-			aliases {
-				state = "/state";
+	state {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "barebox,state";
+		magic = <0x290cf8c6>;
+		backend-type = "raw";
+		backend = < &backend_state_flash >;
+		backend-stridesize = <0x200>;
+
+		bootstate {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			system0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				remaining_attempts@0 {
+					reg = <0x0 0x4>;
+					type = "uint32";
+					default = <3>;
+				};
+
+				priority@4 {
+					reg = <0x4 0x4>;
+					type = "uint32";
+					default = <20>;
+				};
 			};
 
-			state {
+			system1 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "barebox,state";
-				magic = <0x290cf8c6>;
-				backend-type = "raw";
-				backend = < &backend_state_flash >;
-				backend-stridesize = <0x200>;
-
-				bootstate {
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					system0 {
-						#address-cells = <1>;
-						#size-cells = <1>;
-
-						remaining_attempts@0 {
-							reg = <0x0 0x4>;
-							type = "uint32";
-							default = <3>;
-						};
-
-						priority@4 {
-							reg = <0x4 0x4>;
-							type = "uint32";
-							default = <20>;
-						};
-					};
-
-					system1 {
-						#address-cells = <1>;
-						#size-cells = <1>;
-
-						remaining_attempts@8 {
-							reg = <0x8 0x4>;
-							type = "uint32";
-							default = <3>;
-						};
-
-						priority@c {
-							reg = <0xc 0x4>;
-							type = "uint32";
-							default = <21>;
-						};
-					};
-
-					last_chosen@10 {
-						reg = <0x10 0x4>;
-						type = "uint32";
-					};
+
+				remaining_attempts@8 {
+					reg = <0x8 0x4>;
+					type = "uint32";
+					default = <3>;
+				};
+
+				priority@c {
+					reg = <0xc 0x4>;
+					type = "uint32";
+					default = <21>;
 				};
 			};
+
+			last_chosen@10 {
+				reg = <0x10 0x4>;
+				type = "uint32";
+			};
 		};
 	};
 };