ppc4xx: Remove redundant ft_board_setup() functions from some 4xx boards

[karo-tx-uboot.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index aa4af1823b7810715e0afc1aae0eb6dee75a61ed..8533a8e5ced63f717dd1700cd502dbc8d66e6f85 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -23,7 +23,7 @@
 
 BIN_FILES      = img2srec$(SFX) mkimage$(SFX) envcrc$(SFX) ubsha1$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX)
 
-OBJ_LINKS      = environment.o crc32.o sha1.o image.o
+OBJ_LINKS      = environment.o crc32.o md5.o sha1.o image.o
 OBJ_FILES      = img2srec.o mkimage.o envcrc.o ubsha1.o gen_eth_addr.o bmp_logo.o
 
 ifeq ($(ARCH),mips)
@@ -37,13 +37,17 @@ endif
 #OBJ_FILES     += mpc86x_clk.o
 #endif
 
-LIBFDT_OBJ_FILES       = fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_wip.o
+LIBFDT_OBJ_FILES       = $(obj)fdt.o $(obj)fdt_ro.o $(obj)fdt_rw.o $(obj)fdt_strerror.o $(obj)fdt_wip.o
 
 LOGO_H = $(OBJTREE)/include/bmp_logo.h
 
 ifeq ($(LOGO_BMP),)
 LOGO_BMP= logos/denx.bmp
 endif
+ifeq ($(VENDOR),atmel)
+LOGO_BMP= logos/atmel.bmp
+endif
+
 
 #-------------------------------------------------------------------------
 
@@ -143,7 +147,7 @@ $(obj)img2srec$(SFX):       $(obj)img2srec.o
                $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
                $(STRIP) $@
 
-$(obj)mkimage$(SFX):   $(obj)mkimage.o $(obj)crc32.o $(obj)image.o $(obj)sha1.o $(LIBFDT_OBJ_FILES)
+$(obj)mkimage$(SFX):   $(obj)mkimage.o $(obj)crc32.o $(obj)image.o $(obj)md5.o $(obj)sha1.o $(LIBFDT_OBJ_FILES)
                $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
                $(STRIP) $@
 
@@ -176,6 +180,9 @@ $(obj)ubsha1.o:     $(src)ubsha1.c
 $(obj)crc32.o: $(obj)crc32.c
                $(CC) -g $(CFLAGS) -c -o $@ $<
 
+$(obj)md5.o:   $(obj)md5.c
+               $(CC) -g $(CFLAGS) -c -o $@ $<
+
 $(obj)sha1.o:  $(obj)sha1.c
                $(CC) -g $(CFLAGS) -c -o $@ $<
 
@@ -221,7 +228,7 @@ else
                        HOSTOS=$(HOSTOS) \
                        HOSTARCH=$(HOSTARCH) \
                        HOST_CFLAGS="$(HOST_CFLAGS)" \
-                       HOST_LDFLAGS="$(HOST_LDFLAGS)" \
+                       HOST_LDFLAGS="$(HOST_LDFLAGS)" \
                        -C $$dir || exit 1 ; \
                done
 endif
@@ -233,10 +240,18 @@ $(obj)environment.c:
 $(obj)environment.o:   $(obj)environment.c
                $(CC) -g $(HOST_ENVIRO_CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
-$(obj)crc32.c:
+$(obj)zlib.h:
+               @rm -f $@
+               ln -s $(src)../include/zlib.h $@
+
+$(obj)crc32.c: $(obj)zlib.h
                @rm -f $(obj)crc32.c
                ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c
 
+$(obj)md5.c:
+               @rm -f $(obj)md5.c
+               ln -s $(src)../lib_generic/md5.c $(obj)md5.c
+
 $(obj)sha1.c:
                @rm -f $(obj)sha1.c
                ln -s $(src)../lib_generic/sha1.c $(obj)sha1.c
@@ -244,24 +259,30 @@ $(obj)sha1.c:
 $(obj)image.c:
                @rm -f $(obj)image.c
                ln -s $(src)../common/image.c $(obj)image.c
-
-$(obj)fdt.c:   libfdt_internal.h
+               if [ ! -f $(obj)mkimage.h ] ; then \
+                       ln -s $(src)../tools/mkimage.h $(obj)mkimage.h; \
+               fi
+               if [ ! -f $(obj)fdt_host.h ] ; then \
+                       ln -s $(src)../tools/fdt_host.h $(obj)fdt_host.h; \
+               fi
+
+$(obj)fdt.c:   $(obj)libfdt_internal.h
                @rm -f $(obj)fdt.c
                ln -s $(src)../libfdt/fdt.c $(obj)fdt.c
 
-$(obj)fdt_ro.c:        libfdt_internal.h
+$(obj)fdt_ro.c:        $(obj)libfdt_internal.h
                @rm -f $(obj)fdt_ro.c
                ln -s $(src)../libfdt/fdt_ro.c $(obj)fdt_ro.c
 
-$(obj)fdt_rw.c:        libfdt_internal.h
+$(obj)fdt_rw.c:        $(obj)libfdt_internal.h
                @rm -f $(obj)fdt_rw.c
                ln -s $(src)../libfdt/fdt_rw.c $(obj)fdt_rw.c
 
-$(obj)fdt_strerror.c:  libfdt_internal.h
+$(obj)fdt_strerror.c:  $(obj)libfdt_internal.h
                @rm -f $(obj)fdt_strerror.c
                ln -s $(src)../libfdt/fdt_strerror.c $(obj)fdt_strerror.c
 
-$(obj)fdt_wip.c:       libfdt_internal.h
+$(obj)fdt_wip.c:       $(obj)libfdt_internal.h
                @rm -f $(obj)fdt_wip.c
                ln -s $(src)../libfdt/fdt_wip.c $(obj)fdt_wip.c