Skip to contentSkip to conversation

sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set

PATCH New Hans de Goede 2 participants 3 messages Nov 24, 2014 – Nov 25, 2014 Arm/Allwinner sunXi SoC support

lore
Share & tools
lore
#0 lore raw

cover sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set

Hi Ian,

Thanks for the quick review on the 2 display fixes. With Albert's pull-req of today the dependencies for this fix are going upstream as soon as Tom merges the pull-req.

Can you review this one too please ?

Thanks & Regards,

Hans

#1 lore raw

PATCH 1/1 sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set

Old kernels cannot handle booting in non-secure (hyp) mode, so when OLD_SUNXI_KERNEL_COMPAT is set, also set ARMV7_BOOT_SEC_DEFAULT.

Note that whether to booting secure or non-secure can always be overriden using the bootm_boot_mode environment variable.

--
Changes in v2:
-Use Kconfig rather the a hard-define in include/configs/sun7i.h

---
 board/sunxi/Kconfig | 1 +
 1 file changed, 1 insertion(+)
board/sunxi/Kconfig +1 -0
index e20ea1b..246cd9a 100644
@@ -24,6 +24,7 @@ config MACH_SUN7I
 	select CPU_V7_HAS_NONSEC
 	select CPU_V7_HAS_VIRT
 	select SUPPORT_SPL
+	select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
 
 config MACH_SUN8I
 	bool "sun8i (Allwinner A23)"
Signature · 1 line
2.1.0
#2 lore raw

PATCH 1/1 sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set

Quoted 7 lines · Hans de Goede

Old kernels cannot handle booting in non-secure (hyp) mode, so when OLD_SUNXI_KERNEL_COMPAT is set, also set ARMV7_BOOT_SEC_DEFAULT.

Note that whether to booting secure or non-secure can always be overriden using the bootm_boot_mode environment variable.