X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=common%2Fcmd_bootm.c;h=2fa906bae6010efde3c082a5dba3345ef5e0ea71;hb=b8685affe614ccf5f4ec66252b30e2e524d18948;hp=9f5e0b4ee4c03d9c3fd2a1d5485bbab071df81c8;hpb=fd63d832cd929f8e8d8fcac9b3e55b1091588a43;p=platform%2Fkernel%2Fu-boot.git

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 9f5e0b4..2fa906b 100644
--- 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
@@ -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)