On 1/11/21 2:11 PM, Jernej Skrabec wrote:
H616 uses different address for reset. Add it.
Signed-off-by: Jernej Skrabec jernej.skrabec@siol.net
arch/arm/cpu/armv8/fel_utils.S | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/cpu/armv8/fel_utils.S b/arch/arm/cpu/armv8/fel_utils.S index 9510dcd9e4c1..2dbd4b365221 100644 --- a/arch/arm/cpu/armv8/fel_utils.S +++ b/arch/arm/cpu/armv8/fel_utils.S @@ -40,7 +40,10 @@ ENTRY(return_to_fel) str w2, [x1]
ldr x0, =0xfa50392f // CPU hotplug magic -#ifdef CONFIG_MACH_SUN50I_H6 +#ifdef CONFIG_MACH_SUN50I_H616
- ldr x2, =(SUNXI_RTC_BASE + 0x5c0)
This is more accurately (SUNXI_R_CPUCFG_BASE + 0x1c0).
This is noticeable in secure mode, where the RTC is accessible but R_CPUCFG is not.
Cheers, Samuel
- str w0, [x2], #0x4
+#elif CONFIG_MACH_SUN50I_H6 ldr x2, =(SUNXI_RTC_BASE + 0x1b8) // BOOT_CPU_HP_FLAG_REG str w0, [x2], #0x4 #else