summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/bdinfo.c4
-rw-r--r--cmd/booti.c5
-rw-r--r--cmd/bootm.c2
-rw-r--r--cmd/bootz.c2
4 files changed, 7 insertions, 6 deletions
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index b7f5f710b49..8b2c105e777 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -45,7 +45,7 @@ void bdinfo_print_mhz(const char *name, unsigned long hz)
printf("%-12s= %6s MHz\n", name, strmhz(buf, hz));
}
-static void print_bi_dram(const bd_t *bd)
+static void print_bi_dram(const struct bd_info *bd)
{
#ifdef CONFIG_NR_DRAM_BANKS
int i;
@@ -66,7 +66,7 @@ __weak void arch_print_bdinfo(void)
int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
- bd_t *bd = gd->bd;
+ struct bd_info *bd = gd->bd;
#ifdef DEBUG
bdinfo_print_num("bd address", (ulong)bd);
diff --git a/cmd/booti.c b/cmd/booti.c
index af0603b96e5..76d1255ec58 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -79,7 +79,8 @@ static int booti_start(struct cmd_tbl *cmdtp, int flag, int argc,
/* Handle BOOTM_STATE_LOADOS */
if (relocated_addr != ld) {
- debug("Moving Image from 0x%lx to 0x%lx\n", ld, relocated_addr);
+ printf("Moving Image from 0x%lx to 0x%lx, end=%lx\n", ld,
+ relocated_addr, relocated_addr + image_size);
memmove((void *)relocated_addr, (void *)ld, image_size);
}
@@ -93,7 +94,7 @@ static int booti_start(struct cmd_tbl *cmdtp, int flag, int argc,
* Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
* have a header that provide this informaiton.
*/
- if (bootm_find_images(flag, argc, argv))
+ if (bootm_find_images(flag, argc, argv, relocated_addr, image_size))
return 1;
return 0;
diff --git a/cmd/bootm.c b/cmd/bootm.c
index d5f877cb545..e6b0e04413c 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -185,7 +185,7 @@ static char bootm_help_text[] =
"\tfdt - relocate flat device tree\n"
#endif
"\tcmdline - OS specific command line processing/setup\n"
- "\tbdt - OS specific bd_t processing\n"
+ "\tbdt - OS specific bd_info processing\n"
"\tprep - OS specific prep before relocation or go\n"
#if defined(CONFIG_TRACE)
"\tfake - OS specific fake start without go\n"
diff --git a/cmd/bootz.c b/cmd/bootz.c
index bc15fd8ec47..1c8b0cf89f9 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -54,7 +54,7 @@ static int bootz_start(struct cmd_tbl *cmdtp, int flag, int argc,
* Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
* have a header that provide this informaiton.
*/
- if (bootm_find_images(flag, argc, argv))
+ if (bootm_find_images(flag, argc, argv, zi_start, zi_end - zi_start))
return 1;
return 0;