summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-12-07 23:55:12 +0000
committerwdenk <wdenk>2003-12-07 23:55:12 +0000
commit9fd5e31fe0245c44a11d35a8603bb6b25c97b5c8 (patch)
treebbb665de89d40b6584076a60f138616fcf373c70 /Makefile
parent3bbc899fc0bba51db83e4b3960f32c3ad6ba813c (diff)
downloadu-boot-imx-9fd5e31fe0245c44a11d35a8603bb6b25c97b5c8.zip
u-boot-imx-9fd5e31fe0245c44a11d35a8603bb6b25c97b5c8.tar.gz
u-boot-imx-9fd5e31fe0245c44a11d35a8603bb6b25c97b5c8.tar.bz2
* Patch by Pierre Aubert, 24 Nov 2003:
- add a return value for the fpga command - add ide_preinit() function called in ide_init if CONFIG_IDE_PREINIT is defined. If ide_preinit fails, ide_init is aborted. - fix an endianess problem in fat.h
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index cf5fe54..5defc87 100644
--- a/Makefile
+++ b/Makefile
@@ -80,19 +80,20 @@ export CROSS_COMPILE
#########################################################################
# U-Boot objects....order is important (i.e. start must be first)
-OBJS = cpu/$(CPU)/start.o
+OBJS = cpu/$(CPU)/start.o
ifeq ($(CPU),i386)
-OBJS += cpu/$(CPU)/start16.o
-OBJS += cpu/$(CPU)/reset.o
+OBJS += cpu/$(CPU)/start16.o
+OBJS += cpu/$(CPU)/reset.o
endif
ifeq ($(CPU),ppc4xx)
-OBJS += cpu/$(CPU)/resetvec.o
+OBJS += cpu/$(CPU)/resetvec.o
endif
ifeq ($(CPU),mpc85xx)
OBJS += cpu/$(CPU)/resetvec.o
endif
-LIBS = board/$(BOARDDIR)/lib$(BOARD).a
+LIBS = lib_generic/libgeneric.a
+LIBS += board/$(BOARDDIR)/lib$(BOARD).a
LIBS += cpu/$(CPU)/lib$(CPU).a
LIBS += lib_$(ARCH)/lib$(ARCH).a
LIBS += fs/jffs2/libjffs2.a fs/fdos/libfdos.a fs/fat/libfat.a
@@ -104,7 +105,7 @@ LIBS += drivers/libdrivers.a
LIBS += drivers/sk98lin/libsk98lin.a
LIBS += post/libpost.a post/cpu/libcpu.a
LIBS += common/libcommon.a
-LIBS += lib_generic/libgeneric.a
+.PHONY : $(LIBS)
# Add GCC lib
PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
@@ -150,7 +151,6 @@ $(LIBS):
$(MAKE) -C `dirname $@`
$(SUBDIRS):
- @echo "#### MAKE $@ ####"
$(MAKE) -C $@ all
gdbtools: