diff options
| author | Tom Rini <trini@ti.com> | 2014-11-24 17:05:11 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-24 17:05:11 -0500 |
| commit | fce0a90a68de507dc827c1ff40d9e446047fa043 (patch) | |
| tree | 9b8aececd44fd791810d4fef68ac66f62e4a48bd /arch/arm/lib | |
| parent | f3a05c8f944ab2cd832e69a5705708ee7a1797fa (diff) | |
| parent | 8bc347e2ec17bca44b1639a001eeed50d042f0db (diff) | |
| download | talos-obmc-uboot-fce0a90a68de507dc827c1ff40d9e446047fa043.tar.gz talos-obmc-uboot-fce0a90a68de507dc827c1ff40d9e446047fa043.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/bootm.c | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 4949d573af..a7f7c67997 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -237,6 +237,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 = false; +#else + bool nonsec = true; +#endif + + if (s && !strcmp(s, "sec")) + nonsec = false; + + if (s && !strcmp(s, "nonsec")) + nonsec = true; + + return nonsec; +} +#endif + /* Subcommand: GO */ static void boot_jump_linux(bootm_headers_t *images, int flag) { @@ -285,12 +305,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); -#else - kernel_entry(0, machid, r2); + if (boot_nonsec()) { + armv7_init_nonsec(); + secure_ram_addr(_do_nonsec_entry)(kernel_entry, + 0, machid, r2); + } else #endif + kernel_entry(0, machid, r2); } #endif } |
