WIP: arm64: dts: meson: add BL32 reserved memory region to Beelink G1…

…2B devices Add an additional reserved memory region for the BL32 trusted firmware shipping in Beelink g12b devices. This fixes a long running issue with boxes booting from Vendor u-boot where the board wedges during boot or soon after due to the (un)reserved region being overwritten. Fixes 93db2ce ("arm64: dts: meson: add initial Beelink GS-King-X device-tree") Fixes c5522ff ("arm64: dts: meson-g12b-gtking: add initial device-tree") Fixes 0b928e4 ("arm64: dts: meson-g12b-gtking-pro: add initial device-tree") Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> (GS-King-X) Tested-by: Furkan Kardame <furkan@fkardame.com> (GT-King/GT-King Pro)
chewitt · Jan 21, 2022 · 1fbdab9 · 1fbdab9
1 parent 68bde7f
commit 1fbdab9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts
@@ -20,6 +20,14 @@
 		rtc1 = &vrtc;
 	};
 
+	reserved-memory {
+		/* 32 MiB reserved for ARM Trusted Firmware (BL32) */
+		secmon_reserved_bl32: secmon@5300000 {
+			reg = <0x0 0x05300000 0x0 0x2000000>;
+			no-map;
+		};
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts
@@ -19,6 +19,14 @@
 		rtc1 = &vrtc;
 	};
 
+	reserved-memory {
+		/* 32 MiB reserved for ARM Trusted Firmware (BL32) */
+		secmon_reserved_bl32: secmon@5300000 {
+			reg = <0x0 0x05300000 0x0 0x2000000>;
+			no-map;
+		};
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts
@@ -19,6 +19,14 @@
 		rtc1 = &vrtc;
 	};
 
+	reserved-memory {
+		/* 32 MiB reserved for ARM Trusted Firmware (BL32) */
+		secmon_reserved_bl32: secmon@5300000 {
+			reg = <0x0 0x05300000 0x0 0x2000000>;
+			no-map;
+		};
+	};
+
 	spdif_dit: audio-codec-1 {
 		#sound-dai-cells = <0>;
 		compatible = "linux,spdif-dit";