[U-Boot,2/2] ARM: bootm: Allow booting in secure mode on hyp capable systems
Message ID
-14491-3-git-send-email-
Superseded
Delegated to:
Ian Campbell
Commit Message
Older Linux kernels will not properly boot in hyp mode, add support for a
bootm_boot_mode environment variable, which can be set to &sec& or &nonsec&
to force booting in secure or non-secure mode when build with non-sec support.
The default behavior can be selected through CONFIG_ARMV7_BOOT_SEC_DEFAULT,
when this is set booting in secure mode is the default. The default setting
for this Kconfig option is N, preserving the current behavior of booting in
non-secure mode by default when non-secure mode is supported.
Signed-off-by: Hans de Goede &&
Acked-by: Marc Zyngier &marc.&
Acked-by: Siarhei Siamashka &siarhei.&
Changes in v2:
-Allow changing the default boot mode to secure through defining
CONFIG_ARMV7_BOOT_SEC_DEFAULT, this is useful for archs which have a Kconfig
option for compatibility with older kernels
Changes in v3:
-Add an else at the end of the #ifdef NONSEC block so that if do_nonsec_entry
fails we do not end up re-trying in secure mode
Changes in v4:
-Add a Kconfig option to select to boot in secure or non-secure mode by default
arch/arm/cpu/armv7/Kconfig | 11 +++++++++++
arch/arm/lib/bootm.c
| 31 ++++++++++++++++++++++++++-----
2 files changed, 37 insertions(+), 5 deletions(-)
@@ -9,6 +9,17 @@
config ARMV7_NONSEC
---help---
Say Y here to enable support for booting in non-secure / SVC mode.
+config ARMV7_BOOT_SEC_DEFAULT
+ boolean &Boot in secure mode by default& if EXPERT
+ depends on ARMV7_NONSEC
+ default n
+ ---help---
+ Say Y here to boot in secure mode by default even if non-secure mode
+ is supported. This option is useful to boot kernels which do not
+ suppport booting in secure mode. Only set this if you need it.
+ This can be overriden at run-time by setting the bootm_boot_mode env.
+ variable to &sec& or &nonsec&.
# FIXME, needs a &depends on ARMV7_HAS_VIRT&
config ARMV7_VIRT
boolean &Enable support for hardware virtualization& if EXPERT
@@ -235,6 +235,26 @@
static void boot_prep_linux(bootm_headers_t *images)
+#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
+static bool boot_nonsec(void)
+ char *s = getenv(&bootm_boot_mode&);
+#ifdef CONFIG_ARMV7_BOOT_SEC_DEFAULT
+ bool nonsec =
+ bool nonsec =
+ if (s && !strcmp(s, &sec&))
+ if (s && !strcmp(s, &nonsec&))
/* Subcommand: GO */
static void boot_jump_linux(bootm_headers_t *images, int flag)
@@ -283,12 +303,13 @@
static void boot_jump_linux(bootm_headers_t *images, int flag)
if (!fake) {
#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
armv7_init_nonsec();
secure_ram_addr(_do_nonsec_entry)(kernel_entry,
0, machid, r2);
kernel_entry(0, machid, r2);
if (boot_nonsec()) {
armv7_init_nonsec();
secure_ram_addr(_do_nonsec_entry)(kernel_entry,
0, machid, r2);
kernel_entry(0, machid, r2);戴尔笔记本不能正常开机，出现boot mode is set to legacy secure boot of, 戴尔笔记本不能正常开机，出现b
戴尔笔记本不能正常开机，出现boot mode is set to legacy secure boot of 型号是灵越14R-5420，问题如图，请问有什么解决办法？
wheelpine 戴尔笔记本不能正常开机，出现boot mode is set to legacy secure boot of
进入BLOS，设置硬盘启动，就可以了。
热心网友
你的系统是win7}