summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2022-12-08 23:33:57 +0300
committerAndre Przywara <andre.przywara@arm.com>2023-04-12 02:17:22 +0300
commit342abc1472248b38698a52a6e4c66e30c9bfaad7 (patch)
tree868bf1e39bf3f880c259f132c1c930d838735f22 /arch/arm/include/asm
parentdeb77f18bf68eef3a94ae9e63498d67ee7be7151 (diff)
downloadu-boot-342abc1472248b38698a52a6e4c66e30c9bfaad7.tar.xz
sunxi: boot0.h: allow RVBAR MMIO address customisation
To switch the ARMv8 Allwinner SoCs into the 64-bit AArch64 ISA, we need to program the 64-bit start code address into an MMIO mapped register that shadows the architectural RVBAR register. This address is SoC specific, with just two versions out there so far. Now a third address emerged, on a *variant* of an existing SoC (H616). Change the boot0.h start code to make this address a Kconfig selectable option, to allow easier maintenance. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/arch-sunxi/boot0.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/boot0.h b/arch/arm/include/asm/arch-sunxi/boot0.h
index 46b7e073b5..59ea75a96b 100644
--- a/arch/arm/include/asm/arch-sunxi/boot0.h
+++ b/arch/arm/include/asm/arch-sunxi/boot0.h
@@ -39,11 +39,8 @@
.word 0xf57ff06f // isb sy
.word 0xe320f003 // wfi
.word 0xeafffffd // b @wfi
-#ifndef CONFIG_SUN50I_GEN_H6
- .word 0x017000a0 // writeable RVBAR mapping address
-#else
- .word 0x09010040 // writeable RVBAR mapping address
-#endif
+
+ .word CONFIG_SUNXI_RVBAR_ADDRESS // writable RVBAR mapping addr
#ifdef CONFIG_SPL_BUILD
.word CONFIG_SPL_TEXT_BASE
#else