From 82850f3d32a2661868ec6876bed7a22c55cef718 Mon Sep 17 00:00:00 2001
From: Marian Balakowicz <m8@semihalf.com>
Date: Thu, 31 Jan 2008 13:20:06 +0100
Subject: [PATCH] [new uImage] Use image API in SH do_bootm_linux() routine
Introduce image handling API for lately added Hitachi SH architecture.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
---
lib_sh/bootm.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c
index 14b6815cd4..4e5fe775de 100644
--- a/lib_sh/bootm.c
+++ b/lib_sh/bootm.c
@@ -25,8 +25,6 @@
#include <command.h>
#include <asm/byteorder.h>
-extern image_header_t header; /* common/cmd_bootm.c */
-
/* The SH kernel reads arguments from the empty zero page at location
* 0 at the start of SDRAM. The following are copied from
* arch/sh/kernel/setup.c and may require tweaking if the kernel sources
@@ -60,11 +58,10 @@ static void hexdump (unsigned char *buf, int len)
#endif
void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
- ulong addr, ulong *len_ptr, int verify)
+ image_header_t *hdr, int verify)
{
- image_header_t *hdr = &header;
char *bootargs = getenv("bootargs");
- void (*kernel) (void) = (void (*)(void)) ntohl (hdr->ih_ep);
+ void (*kernel) (void) = (void (*)(void))image_get_ep (hdr);
/* Setup parameters */
memset(PARAM, 0, 0x1000); /* Clear zero page */
--
2.39.5