Merge branch 'master' of git://git.denx.de/u-boot-mmc

[oweals/u-boot.git] / arch / arm / lib / bootm.c

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index cdb19751058815b19e274ba32c7293690c5ce99f..f9ed7fe38ab8d790a0b712341a5af2ef576c0ed8 100644 (file)
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -15,10 +15,10 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
-#include <vxworks.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <libfdt.h>
+#include <mapmem.h>
 #include <fdt_support.h>
 #include <asm/bootm.h>
 #include <asm/secure.h>
@@ -26,7 +26,7 @@
 #include <bootm.h>
 #include <vxworks.h>
 
-#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
+#ifdef CONFIG_ARMV7_NONSEC
 #include <asm/armv7.h>
 #endif
 
@@ -192,7 +192,7 @@ __weak void setup_board_tags(struct tag **in_params) {}
 static void do_nonsec_virt_switch(void)
 {
        smp_kick_all_cpus();
-       flush_dcache_all();     /* flush cache before swtiching to EL2 */
+       dcache_disable();       /* flush cache before swtiching to EL2 */
        armv8_switch_to_el2();
 #ifdef CONFIG_ARMV8_SWITCH_TO_EL1
        armv8_switch_to_el1();
@@ -225,7 +225,17 @@ static void boot_prep_linux(bootm_headers_t *images)
                if (BOOTM_ENABLE_MEMORY_TAGS)
                        setup_memory_tags(gd->bd);
                if (BOOTM_ENABLE_INITRD_TAG) {
-                       if (images->rd_start && images->rd_end) {
+                       /*
+                        * In boot_ramdisk_high(), it may relocate ramdisk to
+                        * a specified location. And set images->initrd_start &
+                        * images->initrd_end to relocated ramdisk's start/end
+                        * addresses. So use them instead of images->rd_start &
+                        * images->rd_end when possible.
+                        */
+                       if (images->initrd_start && images->initrd_end) {
+                               setup_initrd_tag(gd->bd, images->initrd_start,
+                                                images->initrd_end);
+                       } else if (images->rd_start && images->rd_end) {
                                setup_initrd_tag(gd->bd, images->rd_start,
                                                 images->rd_end);
                        }
@@ -238,6 +248,26 @@ static void boot_prep_linux(bootm_headers_t *images)
        }
 }
 
+#ifdef CONFIG_ARMV7_NONSEC
+bool armv7_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)
 {
@@ -270,7 +300,10 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
 
        s = getenv("machid");
        if (s) {
-               strict_strtoul(s, 16, &machid);
+               if (strict_strtoul(s, 16, &machid) < 0) {
+                       debug("strict_strtoul failed!\n");
+                       return;
+               }
                printf("Using machid 0x%lx from environment\n", machid);
        }
 
@@ -285,13 +318,14 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
                r2 = gd->bd->bi_boot_params;
 
        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);
+#ifdef CONFIG_ARMV7_NONSEC
+               if (armv7_boot_nonsec()) {
+                       armv7_init_nonsec();
+                       secure_ram_addr(_do_nonsec_entry)(kernel_entry,
+                                                         0, machid, r2);
+               } else
 #endif
+                       kernel_entry(0, machid, r2);
        }
 #endif
 }
@@ -324,38 +358,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
        return 0;
 }
 
-#ifdef CONFIG_CMD_BOOTZ
-
-struct zimage_header {
-       uint32_t        code[9];
-       uint32_t        zi_magic;
-       uint32_t        zi_start;
-       uint32_t        zi_end;
-};
-
-#define        LINUX_ARM_ZIMAGE_MAGIC  0x016f2818
-
-int bootz_setup(ulong image, ulong *start, ulong *end)
-{
-       struct zimage_header *zi;
-
-       zi = (struct zimage_header *)map_sysmem(image, 0);
-       if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC) {
-               puts("Bad Linux ARM zImage magic!\n");
-               return 1;
-       }
-
-       *start = zi->zi_start;
-       *end = zi->zi_end;
-
-       printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n", image, *start,
-             *end);
-
-       return 0;
-}
-
-#endif /* CONFIG_CMD_BOOTZ */
-
 #if defined(CONFIG_BOOTM_VXWORKS)
 void boot_prep_vxworks(bootm_headers_t *images)
 {
@@ -365,8 +367,10 @@ void boot_prep_vxworks(bootm_headers_t *images)
        if (images->ft_addr) {
                off = fdt_path_offset(images->ft_addr, "/memory");
                if (off < 0) {
+#ifdef CONFIG_ARCH_FIXUP_FDT
                        if (arch_fixup_fdt(images->ft_addr))
                                puts("## WARNING: fixup memory failed!\n");
+#endif
                }
        }
 #endif