From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Mon, 11 Jan 2021 20:11:48 +0000 (+0100)
Subject: sunxi: Add H616 FEL support
X-Git-Tag: v2025.01-rc5-pxa1908~2042^2~4
X-Git-Url: http://git.dujemihanovic.xyz/img/html/static/%7B%7B?a=commitdiff_plain;h=3d594efdd0df23d0b38b55da929c004a4f1dca67;p=u-boot.git

sunxi: Add H616 FEL support

H616 uses different address for reset. Add it.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---

diff --git a/arch/arm/cpu/armv8/fel_utils.S b/arch/arm/cpu/armv8/fel_utils.S
index 9510dcd9e4..7def44ad1d 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_R_CPUCFG_BASE + 0x1c0)
+	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