X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tools%2FMakefile;h=43c284c382d6acdc5602eb5cd836e51b1ba295fc;hb=60f61e6d7655400bb785a2ef637581679941f6d1;hp=9f0dedfa3bdd0c81c916d841625ef12482ded0e4;hpb=b951f8d31711f3f10ad119ddcf5a3d0afe14d561;p=u-boot

diff --git a/tools/Makefile b/tools/Makefile
index 9f0dedfa3b..43c284c382 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -21,44 +21,6 @@
 # MA 02111-1307 USA
 #
 
-BIN_FILES	= img2srec$(SFX) mkimage$(SFX) envcrc$(SFX) ubsha1$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX)
-
-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)
-BIN_FILES	+= inca-swap-bytes$(SFX)
-OBJ_FILES	+= inca-swap-bytes.o
-endif
-
-# Don't build by default
-#ifeq ($(ARCH),ppc)
-#BIN_FILES		+= mpc86x_clk$(SFX)
-#OBJ_FILES	+= mpc86x_clk.o
-#endif
-
-LIBFDT_OBJ_FILES	= fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_wip.o
-
-LOGO_H	= $(OBJTREE)/include/bmp_logo.h
-
-ifeq ($(LOGO_BMP),)
-LOGO_BMP= logos/denx.bmp
-endif
-
-#-------------------------------------------------------------------------
-
-HOSTARCH := $(shell uname -m | \
-	sed -e s/i.86/i386/ \
-	    -e s/sun4u/sparc64/ \
-	    -e s/arm.*/arm/ \
-	    -e s/sa110/arm/ \
-	    -e s/powerpc/ppc/ \
-	    -e s/Power\ Macintosh/ppc/ \
-	    -e s/macppc/ppc/)
-
-HOSTOS := $(shell uname -s | tr A-Z a-z | \
-	sed -e 's/\(cygwin\).*/cygwin/')
-
 TOOLSUBDIRS =
 
 #
@@ -73,33 +35,26 @@ TOOLSUBDIRS =
 # multiple symbol definitions are treated as errors, hence the
 # -multiply_defined suppress option to turn off this error.
 #
-ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
-HOST_CFLAGS = -traditional-cpp -Wall
-HOST_LDFLAGS =-multiply_defined suppress
-HOST_ENVIRO_CFLAGS =
 
-else
-ifeq ($(HOSTOS)-$(HOSTARCH),netbsd-ppc)
-HOST_CFLAGS = -Wall -pedantic
+HOST_CFLAGS = -Wall
 HOST_LDFLAGS =
-HOST_ENVIRO_CFLAGS =
 
-#
-# Everyone else
-#
+ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
+HOST_CFLAGS += -traditional-cpp
+HOST_LDFLAGS += -multiply_defined suppress
 else
-HOST_CFLAGS = -Wall -pedantic
-HOST_LDFLAGS =
-HOST_ENVIRO_CFLAGS =
+HOST_CFLAGS += -pedantic
 endif
+
+ifeq ($(HOSTOS),cygwin)
+HOST_CFLAGS += -ansi
 endif
 
 #
-# Cygwin needs .exe files :-(
+# toolchains targeting win32 generate .exe files
 #
-ifeq ($(HOSTOS),cygwin)
+ifneq (,$(findstring WIN32 ,$(shell $(HOSTCC) -E -dM -xc /dev/null)))
 SFX = .exe
-HOST_CFLAGS += -ansi
 else
 SFX =
 endif
@@ -110,17 +65,85 @@ endif
 #
 include $(TOPDIR)/config.mk
 
+# Generated executable files
+BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
+BIN_FILES-y += mkimage$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_EEPROM) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_FLASH) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_NVRAM) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
+BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
+BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)
+BIN_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX)
+BIN_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes$(SFX)
+BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX)
+
+# Source files which exist outside the tools directory
+EXT_OBJ_FILES-y += common/env_embedded.o
+EXT_OBJ_FILES-y += lib_generic/crc32.o
+EXT_OBJ_FILES-y += lib_generic/md5.o
+EXT_OBJ_FILES-y += lib_generic/sha1.o
+EXT_OBJ_FILES-y += common/image.o
+
+# Source files located in the tools directory
+OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
+OBJ_FILES-y += mkimage.o
+OBJ_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc.o
+OBJ_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1.o
+OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
+OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
+OBJ_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo.o
+OBJ_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes.o
+OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o
+OBJ_FILES-y += os_support.o
+
+# Don't build by default
+#ifeq ($(ARCH),ppc)
+#BIN_FILES-y += mpc86x_clk$(SFX)
+#OBJ_FILES-y += mpc86x_clk.o
+#endif
+
+# Flattened device tree objects
+LIBFDT_OBJ_FILES-y += fdt.o
+LIBFDT_OBJ_FILES-y += fdt_ro.o
+LIBFDT_OBJ_FILES-y += fdt_rw.o
+LIBFDT_OBJ_FILES-y += fdt_strerror.o
+LIBFDT_OBJ_FILES-y += fdt_wip.o
+
+# Generated LCD/video logo
+LOGO_H = $(OBJTREE)/include/bmp_logo.h
+LOGO-$(CONFIG_LCD_LOGO) += $(LOGO_H)
+LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_H)
+
+ifeq ($(LOGO_BMP),)
+LOGO_BMP= logos/denx.bmp
+endif
+ifeq ($(VENDOR),atmel)
+LOGO_BMP= logos/atmel.bmp
+endif
+ifeq ($(VENDOR),ronetix)
+LOGO_BMP= logos/ronetix.bmp
+endif
+
 # now $(obj) is defined
-SRCS	:= $(addprefix $(obj),$(OBJ_LINKS:.o=.c)) $(OBJ_FILES:.o=.c)
-BINS	:= $(addprefix $(obj),$(BIN_FILES))
+SRCS	+= $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
+SRCS	+= $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
+SRCS	+= $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
+BINS	:= $(addprefix $(obj),$(sort $(BIN_FILES-y)))
+LIBFDT_OBJS	:= $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
 
 #
 # Use native tools and options
+# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
 #
 CPPFLAGS   = -idirafter $(SRCTREE)/include \
 		-idirafter $(OBJTREE)/include2 \
 		-idirafter $(OBJTREE)/include \
-		-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC
+	        -I $(SRCTREE)/libfdt \
+		-I $(SRCTREE)/tools \
+		-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
+		-D__KERNEL_STRICT_NAMES
 CFLAGS     = $(HOST_CFLAGS) $(CPPFLAGS) -O
 
 # No -pedantic switch to avoid libfdt compilation warnings
@@ -131,153 +154,83 @@ CC	   = $(HOSTCC)
 STRIP	   = $(HOSTSTRIP)
 MAKEDEPEND = makedepend
 
-all:	$(obj).depend $(BINS) $(LOGO_H) subdirs
+all:	$(obj).depend $(BINS) $(LOGO-y) subdirs
 
-$(obj)envcrc$(SFX):	$(obj)envcrc.o $(obj)crc32.o $(obj)environment.o $(obj)sha1.o
-		$(CC) $(CFLAGS) -o $@ $^
+$(obj)envcrc$(SFX):	$(obj)envcrc.o $(obj)crc32.o $(obj)env_embedded.o $(obj)sha1.o
+	$(CC) $(CFLAGS) -o $@ $^
 
-$(obj)ubsha1$(SFX):	$(obj)ubsha1.o $(obj)sha1.o
-		$(CC) $(CFLAGS) -o $@ $^
+$(obj)ubsha1$(SFX):	$(obj)ubsha1.o $(obj)sha1.o $(obj)os_support.o
+	$(CC) $(CFLAGS) -o $@ $^
 
 $(obj)img2srec$(SFX):	$(obj)img2srec.o
-		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
-		$(STRIP) $@
+	$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
+	$(STRIP) $@
 
-$(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) $@
+$(obj)mkimage$(SFX):	$(obj)mkimage.o $(obj)crc32.o $(obj)image.o $(obj)md5.o \
+			$(obj)sha1.o $(LIBFDT_OBJS) $(obj)os_support.o
+	$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
+	$(STRIP) $@
 
 $(obj)ncb$(SFX):	$(obj)ncb.o
-		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
-		$(STRIP) $@
+	$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
+	$(STRIP) $@
 
 $(obj)gen_eth_addr$(SFX):	$(obj)gen_eth_addr.o
-		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
-		$(STRIP) $@
+	$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
+	$(STRIP) $@
 
 $(obj)bmp_logo$(SFX):	$(obj)bmp_logo.o
-		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
-		$(STRIP) $@
+	$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
+	$(STRIP) $@
 
 $(obj)inca-swap-bytes$(SFX):	$(obj)inca-swap-bytes.o
-		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
-		$(STRIP) $@
+	$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
+	$(STRIP) $@
 
 $(obj)mpc86x_clk$(SFX):	$(obj)mpc86x_clk.o
-		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
-		$(STRIP) $@
-
-$(obj)envcrc.o:	$(src)envcrc.c
-		$(CC) -g $(CFLAGS) -c -o $@ $<
-
-$(obj)ubsha1.o:	$(src)ubsha1.c
-		$(CC) -g $(CFLAGS) -c -o $@ $<
-
-$(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 $@ $<
-
-$(obj)image.o:	$(obj)image.c
-		$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
+	$(STRIP) $@
 
-$(obj)mkimage.o:	$(src)mkimage.c
-		$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
+$(obj)bin2header$(SFX): $(obj)bin2header.o
+	$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
+	$(STRIP) $@
 
-$(obj)ncb.o:		$(src)ncb.c
-		$(CC) -g $(CFLAGS) -c -o $@ $<
+# Some files complain if compiled with -pedantic, use FIT_CFLAGS
+$(obj)image.o: $(SRCTREE)/common/image.c
+	$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)gen_eth_addr.o:	$(src)gen_eth_addr.c
-		$(CC) -g $(CFLAGS) -c -o $@ $<
+$(obj)mkimage.o: $(SRCTREE)/tools/mkimage.c
+	$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)inca-swap-bytes.o:	$(src)inca-swap-bytes.c
-		$(CC) -g $(CFLAGS) -c -o $@ $<
+$(obj)os_support.o: $(SRCTREE)/tools/os_support.c
+	$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)mpc86x_clk.o:	$(src)mpc86x_clk.c
-		$(CC) -g $(CFLAGS) -c -o $@ $<
+# Some of the tool objects need to be accessed from outside the tools directory
+$(obj)%.o: $(SRCTREE)/common/%.c
+	$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)fdt.o:	$(obj)fdt.c
-		$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
+$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+	$(CC) -g $(CFLAGS) -c -o $@ $<
 
-$(obj)fdt_ro.o:	$(obj)fdt_ro.c
-		$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
-
-$(obj)fdt_rw.o:	$(obj)fdt_rw.c
-		$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
-
-$(obj)fdt_strerror.o:	$(obj)fdt_strerror.c
-		$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
-
-$(obj)fdt_wip.o:	$(obj)fdt_wip.c
-		$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
+$(LIBFDT_OBJS):
+	$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
 subdirs:
 ifeq ($(TOOLSUBDIRS),)
-		@:
+	@:
 else
-		@for dir in $(TOOLSUBDIRS) ; do \
-		    $(MAKE) \
-			HOSTOS=$(HOSTOS) \
-			HOSTARCH=$(HOSTARCH) \
-			HOST_CFLAGS="$(HOST_CFLAGS)" \
-		   	HOST_LDFLAGS="$(HOST_LDFLAGS)" \
-			-C $$dir || exit 1 ; \
-		done
+	@for dir in $(TOOLSUBDIRS) ; do \
+	    $(MAKE) \
+		HOSTOS=$(HOSTOS) \
+		HOSTARCH=$(HOSTARCH) \
+		HOST_CFLAGS="$(HOST_CFLAGS)" \
+		HOST_LDFLAGS="$(HOST_LDFLAGS)" \
+		-C $$dir || exit 1 ; \
+	done
 endif
 
-$(obj)environment.c:
-		@rm -f $(obj)environment.c
-		ln -s $(src)../common/environment.c $(obj)environment.c
-
-$(obj)environment.o:	$(obj)environment.c
-		$(CC) -g $(HOST_ENVIRO_CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
-$(obj)crc32.c:
-		@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
-
-$(obj)image.c:
-		@rm -f $(obj)image.c
-		ln -s $(src)../common/image.c $(obj)image.c
-
-$(obj)fdt.c:	libfdt_internal.h
-		@rm -f $(obj)fdt.c
-		ln -s $(src)../libfdt/fdt.c $(obj)fdt.c
-
-$(obj)fdt_ro.c:	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
-		@rm -f $(obj)fdt_rw.c
-		ln -s $(src)../libfdt/fdt_rw.c $(obj)fdt_rw.c
-
-$(obj)fdt_strerror.c:	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
-		@rm -f $(obj)fdt_wip.c
-		ln -s $(src)../libfdt/fdt_wip.c $(obj)fdt_wip.c
-
-$(obj)libfdt_internal.h:
-		@rm -f $(obj)libfdt_internal.h
-		ln -s $(src)../libfdt/libfdt_internal.h $(obj)libfdt_internal.h
-
 $(LOGO_H):	$(obj)bmp_logo $(LOGO_BMP)
-		$(obj)./bmp_logo $(LOGO_BMP) >$@
+	$(obj)./bmp_logo $(LOGO_BMP) >$@
 
 #########################################################################