diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-09 23:59:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-09 23:59:11 +0200 |
| commit | 52bacb9879e14e39dbb523c90981698927767a7f (patch) | |
| tree | 7b0055e4148b7b4ccb71b9ecd4ebd73b55365df2 /common | |
| parent | 4bc07c368076560ed7fa4c9f987c71a8521488a9 (diff) | |
| parent | 8b9e4787641719d709bfa2ebeb72e8bd4952bee7 (diff) | |
| download | u-boot-imx-52bacb9879e14e39dbb523c90981698927767a7f.zip u-boot-imx-52bacb9879e14e39dbb523c90981698927767a7f.tar.gz u-boot-imx-52bacb9879e14e39dbb523c90981698927767a7f.tar.bz2 | |
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 6 | ||||
| -rw-r--r-- | common/cmd_mem.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 861712b..9c63e04 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -251,6 +251,7 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } #if defined(CONFIG_OF_LIBFDT) +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC) /* find flattened device tree */ ret = boot_get_fdt (flag, argc, argv, &images, &images.ft_addr, &images.ft_len); @@ -261,6 +262,7 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) set_working_fdt_addr(images.ft_addr); #endif +#endif } images.os.start = (ulong)os_hdr; @@ -337,13 +339,13 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) return BOOTM_ERR_UNIMPLEMENTED; } puts ("OK\n"); - debug (" kernel loaded at 0x%08lx, end = 0x%8p\n", load, load_end); + debug (" kernel loaded at 0x%08lx, end = 0x%08lx\n", load, *load_end); if (boot_progress) show_boot_progress (7); if ((load < blob_end) && (*load_end > blob_start)) { debug ("images.os.start = 0x%lX, images.os.end = 0x%lx\n", blob_start, blob_end); - debug ("images.os.load = 0x%lx, load_end = 0x%p\n", load, load_end); + debug ("images.os.load = 0x%lx, load_end = 0x%lx\n", load, *load_end); return BOOTM_ERR_OVERLAP; } diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 4766c24..d0a6ca8 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -1227,7 +1227,6 @@ int do_unzip ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /**************************************************/ -#if defined(CONFIG_CMD_MEMORY) U_BOOT_CMD( md, 3, 1, do_mem_md, "md - memory display\n", @@ -1338,4 +1337,3 @@ U_BOOT_CMD( #endif /* CONFIG_CMD_UNZIP */ #endif -#endif |