diff options
| author | Gerald Van Baren <vanbaren@cideas.com> | 2008-03-29 18:08:02 -0400 |
|---|---|---|
| committer | Gerald Van Baren <vanbaren@cideas.com> | 2008-03-29 18:08:02 -0400 |
| commit | 3596d55eb22703d3f4f1b839fe4b000fabe081b3 (patch) | |
| tree | 96d1ce693dc72c2fbc63da37928afd4761e82fd2 /lib_nios | |
| parent | 493a2b1dc97367e904bf83869501f6290f3b374e (diff) | |
| parent | 74d1e66d22dac91388bc538b2fe19f735edc5b82 (diff) | |
| download | u-boot-imx-3596d55eb22703d3f4f1b839fe4b000fabe081b3.zip u-boot-imx-3596d55eb22703d3f4f1b839fe4b000fabe081b3.tar.gz u-boot-imx-3596d55eb22703d3f4f1b839fe4b000fabe081b3.tar.bz2 | |
Merge git://www.denx.de/git/u-boot into uboot
Diffstat (limited to 'lib_nios')
| -rw-r--r-- | lib_nios/Makefile | 13 | ||||
| -rw-r--r-- | lib_nios/bootm.c (renamed from lib_nios/nios_linux.c) | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib_nios/Makefile b/lib_nios/Makefile index 7c9d62c..c41d981 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/nios_linux.c b/lib_nios/bootm.c index eef1757..fb2e9b5 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) { } |