Merge git://www.denx.de/git/u-boot

[platform/kernel/u-boot.git] / common / cmd_bootm.c

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 9f5e0b4..9546729 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -260,6 +260,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if (hdr->ih_arch != IH_CPU_NIOS2)
 #elif defined(__PPC__)
        if (hdr->ih_arch != IH_CPU_PPC)
+#elif defined(__sh__)
+       if (hdr->ih_arch != IH_CPU_SH)
 #else
 # error Unknown CPU type
 #endif
@@ -466,7 +468,7 @@ U_BOOT_CMD(
        "\t'arg' can be the address of an initrd image\n"
 #if defined(CONFIG_OF_FLAT_TREE) || defined(CONFIG_OF_LIBFDT)
        "\tWhen booting a Linux kernel which requires a flat device-tree\n"
-       "\ta third argument is required which is the address of the of the\n"
+       "\ta third argument is required which is the address of the\n"
        "\tdevice-tree blob. To boot that kernel without an initrd image,\n"
        "\tuse a '-' for the second argument. If you do not pass a third\n"
        "\ta bd_info struct will be passed instead\n"
@@ -834,9 +836,11 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
                        of_flat_tree += 4 - tail;
                }
 
+#ifndef CFG_NO_FLASH
                /* move the blob if it is in flash (set of_data to !null) */
                if (addr2info ((ulong)of_flat_tree) != NULL)
                        of_data = (ulong)of_flat_tree;
+#endif
 
 
 #if defined(CONFIG_OF_FLAT_TREE)