summaryrefslogtreecommitdiff
path: root/lib_blackfin
diff options
context:
space:
mode:
Diffstat (limited to 'lib_blackfin')
-rw-r--r--lib_blackfin/Makefile2
-rw-r--r--lib_blackfin/bootm.c (renamed from lib_blackfin/bf533_linux.c)5
2 files changed, 3 insertions, 4 deletions
diff --git a/lib_blackfin/Makefile b/lib_blackfin/Makefile
index a7aaef7a3..ac3fb2855 100644
--- a/lib_blackfin/Makefile
+++ b/lib_blackfin/Makefile
@@ -31,7 +31,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS = memcpy.o memcmp.o memset.o memmove.o
-COBJS = post.o tests.o board.o bf533_linux.o bf533_string.o cache.o muldi3.o
+COBJS = post.o tests.o board.o bootm.o bf533_string.o cache.o muldi3.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_blackfin/bf533_linux.c b/lib_blackfin/bootm.c
index 80a3dc7d6..6299415b1 100644
--- a/lib_blackfin/bf533_linux.c
+++ b/lib_blackfin/bootm.c
@@ -42,13 +42,12 @@
extern void swap_to(int device_id);
#endif
-extern image_header_t header;
extern void flush_instruction_cache(void);
extern void flush_data_cache(void);
static char *make_command_line(void);
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)
{
int (*appl) (char *cmdline);
char *cmdline;
@@ -57,7 +56,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
swap_to(FLASH);
#endif
- appl = (int (*)(char *))ntohl(header.ih_ep);
+ appl = (int (*)(char *))image_get_ep (hdr);
printf("Starting Kernel at = %x\n", appl);
cmdline = make_command_line();
if (icache_status()) {