projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /home/sr/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
84499a0
..
c200fd8
100644
(file)
--- a/
common/cmd_bootm.c
+++ b/
common/cmd_bootm.c
@@
-261,7
+261,7
@@
int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
name = "Standalone Application";
/* A second argument overwrites the load address */
if (argc > 2) {
name = "Standalone Application";
/* A second argument overwrites the load address */
if (argc > 2) {
- hdr->ih_load =
simple_strtoul(argv[2], NULL, 16
);
+ hdr->ih_load =
htonl(simple_strtoul(argv[2], NULL, 16)
);
}
break;
case IH_TYPE_KERNEL:
}
break;
case IH_TYPE_KERNEL:
@@
-449,8
+449,8
@@
U_BOOT_CMD(
bootm, CFG_MAXARGS, 1, do_bootm,
"bootm - boot application image from memory\n",
"[addr [arg ...]]\n - boot application image stored in memory\n"
bootm, CFG_MAXARGS, 1, do_bootm,
"bootm - boot application image from memory\n",
"[addr [arg ...]]\n - boot application image stored in memory\n"
- "
passing arguments 'arg ...'; when booting a Linux kernel,\n"
- "
'arg' can be the address of an initrd image\n"
+ "
\t
passing arguments 'arg ...'; when booting a Linux kernel,\n"
+ "
\t
'arg' can be the address of an initrd image\n"
);
#ifdef CONFIG_SILENT_CONSOLE
);
#ifdef CONFIG_SILENT_CONSOLE
@@
-573,12
+573,19
@@
do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
/* convert all clock information to MHz */
kbd->bi_intfreq /= 1000000L;
kbd->bi_busfreq /= 1000000L;
/* convert all clock information to MHz */
kbd->bi_intfreq /= 1000000L;
kbd->bi_busfreq /= 1000000L;
-#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
+#if defined(CONFIG_MPC8220)
+ kbd->bi_inpfreq /= 1000000L;
+ kbd->bi_pcifreq /= 1000000L;
+ kbd->bi_pevfreq /= 1000000L;
+ kbd->bi_flbfreq /= 1000000L;
+ kbd->bi_vcofreq /= 1000000L;
+#endif
+#if defined(CONFIG_CPM2)
kbd->bi_cpmfreq /= 1000000L;
kbd->bi_brgfreq /= 1000000L;
kbd->bi_sccfreq /= 1000000L;
kbd->bi_vco /= 1000000L;
kbd->bi_cpmfreq /= 1000000L;
kbd->bi_brgfreq /= 1000000L;
kbd->bi_sccfreq /= 1000000L;
kbd->bi_vco /= 1000000L;
-#endif
/* CONFIG_8260 */
+#endif
#if defined(CONFIG_MPC5xxx)
kbd->bi_ipbfreq /= 1000000L;
kbd->bi_pcifreq /= 1000000L;
#if defined(CONFIG_MPC5xxx)
kbd->bi_ipbfreq /= 1000000L;
kbd->bi_pcifreq /= 1000000L;
@@
-1190,6
+1197,8
@@
print_type (image_header_t *hdr)
case IH_CPU_SPARC64: arch = "SPARC 64 Bit"; break;
case IH_CPU_M68K: arch = "M68K"; break;
case IH_CPU_MICROBLAZE: arch = "Microblaze"; break;
case IH_CPU_SPARC64: arch = "SPARC 64 Bit"; break;
case IH_CPU_M68K: arch = "M68K"; break;
case IH_CPU_MICROBLAZE: arch = "Microblaze"; break;
+ case IH_CPU_NIOS: arch = "Nios"; break;
+ case IH_CPU_NIOS2: arch = "Nios-II"; break;
default: arch = "Unknown Architecture"; break;
}
default: arch = "Unknown Architecture"; break;
}