diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-31 07:48:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-31 07:48:47 -0400 |
| commit | dd85c9500cbccbe9d8166053255f3ef4c908f0e1 (patch) | |
| tree | 836fb1d9af44942ccf70d1ce07d1e65bd1f72fa4 | |
| parent | d8eafb16c85bc3b5d85d7ba8ebb1438cc0ae168f (diff) | |
| parent | 62acef239f77583f3083f8c842ea2d28f4a1623c (diff) | |
| download | u-boot-dd85c9500cbccbe9d8166053255f3ef4c908f0e1.zip u-boot-dd85c9500cbccbe9d8166053255f3ef4c908f0e1.tar.gz u-boot-dd85c9500cbccbe9d8166053255f3ef4c908f0e1.tar.bz2 | |
Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi
- H616 fixes to keep it in sync with upstream TF-A
| -rw-r--r-- | arch/arm/dts/sun50i-h616.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/dts/sunxi-u-boot.dtsi | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi index 953e8fa..dd4d2f3 100644 --- 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 index abe629c..cd096bf 100644 --- 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 |