tools/Makefile: Remove symlinks for fdt targets

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

diff --git a/Makefile b/Makefile
index db7fd88bdbc2089dcfcbcac6852e4093a9583046..38426dc25c2c3a959333357ed1cc3a58741a19f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3532,8 +3532,7 @@ clobber:  clean
                $(obj)cscope.* $(obj)*.*~
        @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
        @rm -f $(obj)tools/{crc32.c,env_embedded.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes}
-       @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c}
-       @rm -f $(obj)tools/{fdt_wip.c}
+       @rm -f $(obj)tools/{image.c}
        @rm -f $(obj)cpu/mpc824x/bedbug_603e.c
        @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
        @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f

diff --git a/tools/.gitignore b/tools/.gitignore
index ea39027ba27ef7a553c4ca7b179010f7a707b0e5..7614766f63409c721792e1145c12534e4528080f 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -12,8 +12,3 @@
 /ubsha1
 /inca-swap-bytes
 /image.c
-/fdt.c
-/fdt_ro.c
-/fdt_rw.c
-/fdt_strerror.c
-/fdt_wip.c

diff --git a/tools/Makefile b/tools/Makefile
index 294d3883c2d59dd5a8c0d593a361bf0b7a317ef8..ef51abcc265924d9fa83e7735aa274928309952e 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -22,6 +22,7 @@
 #
 
 TOOLSUBDIRS =
+LIBFDT_DIR = $(SRCTREE)/libfdt/
 
 #
 # Mac OS X / Darwin's C preprocessor is Apple specific.  It
@@ -223,19 +224,20 @@ $(obj)inca-swap-bytes.o:  $(src)inca-swap-bytes.c
 $(obj)mpc86x_clk.o:    $(src)mpc86x_clk.c
        $(CC) -g $(CFLAGS) -c -o $@ $<
 
-$(obj)fdt.o:   $(obj)fdt.c
+$(obj)fdt.o:   $(LIBFDT_DIR)fdt.c $(SRCTREE)/libfdt/libfdt_internal.h
        $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)fdt_ro.o:        $(obj)fdt_ro.c
+$(obj)fdt_ro.o:        $(LIBFDT_DIR)fdt_ro.c $(SRCTREE)/libfdt/libfdt_internal.h
        $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)fdt_rw.o:        $(obj)fdt_rw.c
+$(obj)fdt_rw.o:        $(LIBFDT_DIR)fdt_rw.c $(SRCTREE)/libfdt/libfdt_internal.h
        $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)fdt_strerror.o:  $(obj)fdt_strerror.c
+$(obj)fdt_strerror.o: $(LIBFDT_DIR)fdt_strerror.c \
+                       $(SRCTREE)/libfdt/libfdt_internal.h
        $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)fdt_wip.o:       $(obj)fdt_wip.c
+$(obj)fdt_wip.o: $(LIBFDT_DIR)fdt_wip.c $(SRCTREE)/libfdt/libfdt_internal.h
        $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
 subdirs:
@@ -275,26 +277,6 @@ $(obj)image.c:
        @rm -f $(obj)image.c
        ln -s $(src)../common/image.c $(obj)image.c
 
-$(obj)fdt.c: $(SRCTREE)/libfdt/libfdt_internal.h
-       @rm -f $(obj)fdt.c
-       ln -s $(src)../libfdt/fdt.c $(obj)fdt.c
-
-$(obj)fdt_ro.c: $(SRCTREE)/libfdt/libfdt_internal.h
-       @rm -f $(obj)fdt_ro.c
-       ln -s $(src)../libfdt/fdt_ro.c $(obj)fdt_ro.c
-
-$(obj)fdt_rw.c: $(SRCTREE)/libfdt/libfdt_internal.h
-       @rm -f $(obj)fdt_rw.c
-       ln -s $(src)../libfdt/fdt_rw.c $(obj)fdt_rw.c
-
-$(obj)fdt_strerror.c: $(SRCTREE)/libfdt/libfdt_internal.h
-       @rm -f $(obj)fdt_strerror.c
-       ln -s $(src)../libfdt/fdt_strerror.c $(obj)fdt_strerror.c
-
-$(obj)fdt_wip.c: $(SRCTREE)/libfdt/libfdt_internal.h
-       @rm -f $(obj)fdt_wip.c
-       ln -s $(src)../libfdt/fdt_wip.c $(obj)fdt_wip.c
-
 $(LOGO_H):     $(obj)bmp_logo $(LOGO_BMP)
        $(obj)./bmp_logo $(LOGO_BMP) >$@