diff options
Diffstat (limited to 'lib_nios')
| -rw-r--r-- | lib_nios/Makefile | 13 | ||||
| -rw-r--r-- | lib_nios/board.c | 10 | ||||
| -rw-r--r-- | lib_nios/bootm.c (renamed from lib_nios/nios_linux.c) | 2 |
3 files changed, 20 insertions, 5 deletions
diff --git a/lib_nios/Makefile b/lib_nios/Makefile index 7c9d62cf7c..c41d981a3e 100644 --- a/lib_nios/Makefile +++ b/lib_nios/Makefile @@ -25,12 +25,17 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(ARCH).a -SOBJS = +SOBJS-y += -COBJS = board.o cache.o divmod.o nios_linux.o mult.o time.o +COBJS-y += board.o +COBJS-y += bootm.o +COBJS-y += cache.o +COBJS-y += divmod.o +COBJS-y += mult.o +COBJS-y += time.o -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) $(LIB): $(obj).depend $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS) diff --git a/lib_nios/board.c b/lib_nios/board.c index 0a0d2e38fd..cdaf753ac7 100644 --- a/lib_nios/board.c +++ b/lib_nios/board.c @@ -190,3 +190,13 @@ void hang (void) puts("### ERROR ### Please reset board ###\n"); for (;;); } + +unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char *argv[]) +{ + /* + * x86 does not use a dedicated register to pass the pointer + * to the global_data + */ + argv[-1] = (char *)gd; + return entry (argc, argv); +} diff --git a/lib_nios/nios_linux.c b/lib_nios/bootm.c index eef17573f9..fb2e9b5205 100644 --- a/lib_nios/nios_linux.c +++ b/lib_nios/bootm.c @@ -29,6 +29,6 @@ * */ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], - ulong addr, ulong *len_ptr, int verify) + bootm_headers_t *images) { } |