bdinfo: Drop print_cpu_word_size()

[platform/kernel/u-boot.git] / cmd / bootz.c

diff --git a/cmd/bootz.c b/cmd/bootz.c
index 74be62c..bc15fd8 100644 (file)
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -7,8 +7,10 @@
 #include <common.h>
 #include <bootm.h>
 #include <command.h>
+#include <image.h>
 #include <irq_func.h>
 #include <lmb.h>
+#include <log.h>
 #include <linux/compiler.h>
 
 int __weak bootz_setup(ulong image, ulong *start, ulong *end)
@@ -22,8 +24,8 @@ int __weak bootz_setup(ulong image, ulong *start, ulong *end)
 /*
  * zImage booting support
  */
-static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
-                       char * const argv[], bootm_headers_t *images)
+static int bootz_start(struct cmd_tbl *cmdtp, int flag, int argc,
+                      char *const argv[], bootm_headers_t *images)
 {
        int ret;
        ulong zi_start, zi_end;
@@ -33,9 +35,9 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
 
        /* Setup Linux kernel zImage entry point */
        if (!argc) {
-               images->ep = load_addr;
+               images->ep = image_load_addr;
                debug("*  kernel: default image load address = 0x%08lx\n",
-                               load_addr);
+                               image_load_addr);
        } else {
                images->ep = simple_strtoul(argv[0], NULL, 16);
                debug("*  kernel: cmdline image address = 0x%08lx\n",
@@ -58,7 +60,7 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
        return 0;
 }
 
-int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_bootz(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        int ret;