Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi

- H616 fixes to keep it in sync with upstream TF-A
sigmaris · Mar 31, 2021 · dd85c95 · dd85c95
2 parents d8eafb1 + 62acef2
commit dd85c95
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi
@@ -51,18 +51,6 @@
 		};
 	};
 
-	reserved-memory {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		/* 512KiB reserved for ARM Trusted Firmware (BL31) */
-		secmon_reserved: secmon@40000000 {
-			reg = <0x0 0x40000000 0x0 0x80000>;
-			no-map;
-		};
-	};
-
 	osc24M: osc24M_clk {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";

diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -4,7 +4,7 @@
 #define BL31_ADDR 0x104000
 #define  SCP_ADDR 0x114000
 #elif defined(CONFIG_MACH_SUN50I_H616)
-#define BL31_ADDR 0x40004000
+#define BL31_ADDR 0x40000000
 #else
 #define BL31_ADDR  0x44000
 #define  SCP_ADDR  0x50000