Added MMCR reset functionality
[platform/kernel/u-boot.git] / common / cmd_bootm.c
index b87ac49..a8f85e9 100644 (file)
@@ -34,6 +34,7 @@
 #include <bzlib.h>
 #include <environment.h>
 #include <lmb.h>
+#include <linux/ctype.h>
 #include <asm/byteorder.h>
 
 #if defined(CONFIG_CMD_USB)
@@ -102,13 +103,23 @@ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 typedef int boot_os_fn (int flag, int argc, char *argv[],
                        bootm_headers_t *images); /* pointers to os/initrd/fdt */
 
+#define CONFIG_BOOTM_LINUX 1
+#define CONFIG_BOOTM_NETBSD 1
+#define CONFIG_BOOTM_RTEMS 1
+
+#ifdef CONFIG_BOOTM_LINUX
 extern boot_os_fn do_bootm_linux;
+#endif
+#ifdef CONFIG_BOOTM_NETBSD
 static boot_os_fn do_bootm_netbsd;
+#endif
 #if defined(CONFIG_LYNXKDI)
 static boot_os_fn do_bootm_lynxkdi;
 extern void lynxkdi_boot (image_header_t *);
 #endif
+#ifdef CONFIG_BOOTM_RTEMS
 static boot_os_fn do_bootm_rtems;
+#endif
 #if defined(CONFIG_CMD_ELF)
 static boot_os_fn do_bootm_vxworks;
 static boot_os_fn do_bootm_qnxelf;
@@ -120,12 +131,18 @@ static boot_os_fn do_bootm_integrity;
 #endif
 
 boot_os_fn * boot_os[] = {
+#ifdef CONFIG_BOOTM_LINUX
        [IH_OS_LINUX] = do_bootm_linux,
+#endif
+#ifdef CONFIG_BOOTM_NETBSD
        [IH_OS_NETBSD] = do_bootm_netbsd,
+#endif
 #ifdef CONFIG_LYNXKDI
        [IH_OS_LYNXOS] = do_bootm_lynxkdi,
 #endif
+#ifdef CONFIG_BOOTM_RTEMS
        [IH_OS_RTEMS] = do_bootm_rtems,
+#endif
 #if defined(CONFIG_CMD_ELF)
        [IH_OS_VXWORKS] = do_bootm_vxworks,
        [IH_OS_QNX] = do_bootm_qnxelf,
@@ -296,7 +313,7 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
 
        images.os.start = (ulong)os_hdr;
-       images.valid = 1;
+       images.state = BOOTM_STATE_START;
 
        return 0;
 }
@@ -399,6 +416,121 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
        return 0;
 }
 
+/* we overload the cmd field with our state machine info instead of a
+ * function pointer */
+cmd_tbl_t cmd_bootm_sub[] = {
+       U_BOOT_CMD_MKENT(start, 0, 1, (void *)BOOTM_STATE_START, "", ""),
+       U_BOOT_CMD_MKENT(loados, 0, 1, (void *)BOOTM_STATE_LOADOS, "", ""),
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC)
+       U_BOOT_CMD_MKENT(ramdisk, 0, 1, (void *)BOOTM_STATE_RAMDISK, "", ""),
+#endif
+#ifdef CONFIG_OF_LIBFDT
+       U_BOOT_CMD_MKENT(fdt, 0, 1, (void *)BOOTM_STATE_FDT, "", ""),
+#endif
+       U_BOOT_CMD_MKENT(bdt, 0, 1, (void *)BOOTM_STATE_OS_BD_T, "", ""),
+       U_BOOT_CMD_MKENT(cmdline, 0, 1, (void *)BOOTM_STATE_OS_CMDLINE, "", ""),
+       U_BOOT_CMD_MKENT(prep, 0, 1, (void *)BOOTM_STATE_OS_PREP, "", ""),
+       U_BOOT_CMD_MKENT(go, 0, 1, (void *)BOOTM_STATE_OS_GO, "", ""),
+};
+
+int do_bootm_subcommand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+       int ret = 0;
+       int state;
+       cmd_tbl_t *c;
+       boot_os_fn *boot_fn;
+
+       c = find_cmd_tbl(argv[1], &cmd_bootm_sub[0], ARRAY_SIZE(cmd_bootm_sub));
+
+       if (c) {
+               state = (int)c->cmd;
+
+               /* treat start special since it resets the state machine */
+               if (state == BOOTM_STATE_START) {
+                       argc--;
+                       argv++;
+                       return bootm_start(cmdtp, flag, argc, argv);
+               }
+       }
+       /* Unrecognized command */
+       else {
+               printf ("Usage:\n%s\n", cmdtp->usage);
+               return 1;
+       }
+
+       if (images.state >= state) {
+               printf ("Trying to execute a command out of order\n");
+               printf ("Usage:\n%s\n", cmdtp->usage);
+               return 1;
+       }
+
+       images.state |= state;
+       boot_fn = boot_os[images.os.os];
+
+       switch (state) {
+               ulong load_end;
+               case BOOTM_STATE_START:
+                       /* should never occur */
+                       break;
+               case BOOTM_STATE_LOADOS:
+                       ret = bootm_load_os(images.os, &load_end, 0);
+                       if (ret)
+                               return ret;
+
+                       lmb_reserve(&images.lmb, images.os.load,
+                                       (load_end - images.os.load));
+                       break;
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC)
+               case BOOTM_STATE_RAMDISK:
+               {
+                       ulong rd_len = images.rd_end - images.rd_start;
+                       char str[17];
+
+                       ret = boot_ramdisk_high(&images.lmb, images.rd_start,
+                               rd_len, &images.initrd_start, &images.initrd_end);
+                       if (ret)
+                               return ret;
+
+                       sprintf(str, "%lx", images.initrd_start);
+                       setenv("initrd_start", str);
+                       sprintf(str, "%lx", images.initrd_end);
+                       setenv("initrd_end", str);
+               }
+                       break;
+#endif
+#ifdef CONFIG_OF_LIBFDT
+               case BOOTM_STATE_FDT:
+               {
+                       ulong bootmap_base = getenv_bootm_low();
+                       ret = boot_relocate_fdt(&images.lmb, bootmap_base,
+                               &images.ft_addr, &images.ft_len);
+                       break;
+               }
+#endif
+               case BOOTM_STATE_OS_CMDLINE:
+                       ret = boot_fn(BOOTM_STATE_OS_CMDLINE, argc, argv, &images);
+                       if (ret)
+                               printf ("cmdline subcommand not supported\n");
+                       break;
+               case BOOTM_STATE_OS_BD_T:
+                       ret = boot_fn(BOOTM_STATE_OS_BD_T, argc, argv, &images);
+                       if (ret)
+                               printf ("bdt subcommand not supported\n");
+                       break;
+               case BOOTM_STATE_OS_PREP:
+                       ret = boot_fn(BOOTM_STATE_OS_PREP, argc, argv, &images);
+                       if (ret)
+                               printf ("prep subcommand not supported\n");
+                       break;
+               case BOOTM_STATE_OS_GO:
+                       disable_interrupts();
+                       boot_fn(BOOTM_STATE_OS_GO, argc, argv, &images);
+                       break;
+       }
+
+       return ret;
+}
+
 /*******************************************************************/
 /* bootm - boot application image from image in memory */
 /*******************************************************************/
@@ -419,6 +551,23 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                relocated = 1;
        }
 
+       /* determine if we have a sub command */
+       if (argc > 1) {
+               char *endp;
+
+               simple_strtoul(argv[1], &endp, 16);
+               /* endp pointing to NULL means that argv[1] was just a
+                * valid number, pass it along to the normal bootm processing
+                *
+                * If endp is ':' or '#' assume a FIT identifier so pass
+                * along for normal processing.
+                *
+                * Right now we assume the first arg should never be '-'
+                */
+               if ((*endp != 0) && (*endp != ':') && (*endp != '#'))
+                       return do_bootm_subcommand(cmdtp, flag, argc, argv);
+       }
+
        if (bootm_start(cmdtp, flag, argc, argv))
                return 1;
 
@@ -783,6 +932,21 @@ U_BOOT_CMD(
        "\tUse iminfo command to get the list of existing component\n"
        "\timages and configurations.\n"
 #endif
+       "\nSub-commands to do part of the bootm sequence.  The sub-commands "
+       "must be\n"
+       "issued in the order below (it's ok to not issue all sub-commands):\n"
+       "\tstart [addr [arg ...]]\n"
+       "\tloados  - load OS image\n"
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC)
+       "\tramdisk - relocate initrd, set env initrd_start/initrd_end\n"
+#endif
+#if defined(CONFIG_OF_LIBFDT)
+       "\tfdt     - relocate flat device tree\n"
+#endif
+       "\tbdt     - OS specific bd_t processing\n"
+       "\tcmdline - OS specific command line processing/setup\n"
+       "\tprep    - OS specific prep before relocation or go\n"
+       "\tgo      - start OS\n"
 );
 
 /*******************************************************************/
@@ -1013,6 +1177,7 @@ static void fixup_silent_linux ()
 /* OS booting routines */
 /*******************************************************************/
 
+#ifdef CONFIG_BOOTM_NETBSD
 static int do_bootm_netbsd (int flag, int argc, char *argv[],
                            bootm_headers_t *images)
 {
@@ -1022,6 +1187,9 @@ static int do_bootm_netbsd (int flag, int argc, char *argv[],
        char *consdev;
        char *cmdline;
 
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
 #if defined(CONFIG_FIT)
        if (!images->legacy_hdr_valid) {
                fit_unsupported_reset ("NetBSD");
@@ -1095,6 +1263,7 @@ static int do_bootm_netbsd (int flag, int argc, char *argv[],
 
        return 1;
 }
+#endif /* CONFIG_BOOTM_NETBSD*/
 
 #ifdef CONFIG_LYNXKDI
 static int do_bootm_lynxkdi (int flag, int argc, char *argv[],
@@ -1102,6 +1271,9 @@ static int do_bootm_lynxkdi (int flag, int argc, char *argv[],
 {
        image_header_t *hdr = &images->legacy_hdr_os_copy;
 
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
 #if defined(CONFIG_FIT)
        if (!images->legacy_hdr_valid) {
                fit_unsupported_reset ("Lynx");
@@ -1115,11 +1287,15 @@ static int do_bootm_lynxkdi (int flag, int argc, char *argv[],
 }
 #endif /* CONFIG_LYNXKDI */
 
+#ifdef CONFIG_BOOTM_RTEMS
 static int do_bootm_rtems (int flag, int argc, char *argv[],
                           bootm_headers_t *images)
 {
        void (*entry_point)(bd_t *);
 
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
 #if defined(CONFIG_FIT)
        if (!images->legacy_hdr_valid) {
                fit_unsupported_reset ("RTEMS");
@@ -1142,6 +1318,7 @@ static int do_bootm_rtems (int flag, int argc, char *argv[],
 
        return 1;
 }
+#endif /* CONFIG_BOOTM_RTEMS */
 
 #if defined(CONFIG_CMD_ELF)
 static int do_bootm_vxworks (int flag, int argc, char *argv[],
@@ -1149,6 +1326,9 @@ static int do_bootm_vxworks (int flag, int argc, char *argv[],
 {
        char str[80];
 
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
 #if defined(CONFIG_FIT)
        if (!images->legacy_hdr_valid) {
                fit_unsupported_reset ("VxWorks");
@@ -1169,6 +1349,9 @@ static int do_bootm_qnxelf(int flag, int argc, char *argv[],
        char *local_args[2];
        char str[16];
 
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
 #if defined(CONFIG_FIT)
        if (!images->legacy_hdr_valid) {
                fit_unsupported_reset ("QNX");
@@ -1191,6 +1374,9 @@ static int do_bootm_integrity (int flag, int argc, char *argv[],
 {
        void (*entry_point)(void);
 
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
 #if defined(CONFIG_FIT)
        if (!images->legacy_hdr_valid) {
                fit_unsupported_reset ("INTEGRITY");