tools: mkimage: split code into core, default and FIT image specific

[u-boot] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 70d87b0b4874e49e5e0ebbac1a69fe17fe7e9281..858b0e8f0a08367d0ecbab4c70875bc628504da5 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -36,18 +36,18 @@ TOOLSUBDIRS =
 # -multiply_defined suppress option to turn off this error.
 #
 
-HOST_CFLAGS = -Wall
+HOSTCFLAGS = -Wall
 HOST_LDFLAGS =
 
 ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
-HOST_CFLAGS += -traditional-cpp
+HOSTCFLAGS += -traditional-cpp
 HOST_LDFLAGS += -multiply_defined suppress
 else
-HOST_CFLAGS += -pedantic
+HOSTCFLAGS += -pedantic
 endif
 
 ifeq ($(HOSTOS),cygwin)
-HOST_CFLAGS += -ansi
+HOSTCFLAGS += -ansi
 endif
 
 #
@@ -66,37 +66,41 @@ endif
 include $(TOPDIR)/config.mk
 
 # Generated executable files
-BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
-BIN_FILES-y += mkimage$(SFX)
+BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)
+BIN_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX)
 BIN_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_DATAFLASH) += 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_ONENAND) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_NAND) += envcrc$(SFX)
 BIN_FILES-$(CONFIG_ENV_IS_IN_NVRAM) += envcrc$(SFX)
-BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_SPI_FLASH) += envcrc$(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_CMD_LOADS) += img2srec$(SFX)
 BIN_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes$(SFX)
+BIN_FILES-y += mkimage$(SFX)
 BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX)
+BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
 
 # Source files which exist outside the tools directory
 EXT_OBJ_FILES-y += common/env_embedded.o
+EXT_OBJ_FILES-y += common/image.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_ENV_IS_EMBEDDED) += envcrc.o
+OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
+OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
 OBJ_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes.o
+OBJ_FILES-y += mkimage.o
 OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o
 OBJ_FILES-y += os_support.o
+OBJ_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1.o
 
 # Don't build by default
 #ifeq ($(ARCH),ppc)
@@ -122,6 +126,9 @@ 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 $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
@@ -141,7 +148,7 @@ CPPFLAGS   = -idirafter $(SRCTREE)/include \
                -I $(SRCTREE)/tools \
                -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
                -D__KERNEL_STRICT_NAMES
-CFLAGS     = $(HOST_CFLAGS) $(CPPFLAGS) -O
+CFLAGS     = $(HOSTCFLAGS) $(CPPFLAGS) -O
 
 # No -pedantic switch to avoid libfdt compilation warnings
 FIT_CFLAGS = -Wall $(CPPFLAGS) -O
@@ -153,30 +160,22 @@ MAKEDEPEND = makedepend
 
 all:   $(obj).depend $(BINS) $(LOGO-y) subdirs
 
-$(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 $(obj)os_support.o
-       $(CC) $(CFLAGS) -o $@ $^
-
-$(obj)img2srec$(SFX):  $(obj)img2srec.o
+$(obj)bin2header$(SFX): $(obj)bin2header.o
        $(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
+$(obj)bmp_logo$(SFX):  $(obj)bmp_logo.o
        $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
        $(STRIP) $@
 
-$(obj)ncb$(SFX):       $(obj)ncb.o
-       $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
-       $(STRIP) $@
+$(obj)envcrc$(SFX):    $(obj)crc32.o $(obj)env_embedded.o $(obj)envcrc.o $(obj)sha1.o
+       $(CC) $(CFLAGS) -o $@ $^
 
 $(obj)gen_eth_addr$(SFX):      $(obj)gen_eth_addr.o
        $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
        $(STRIP) $@
 
-$(obj)bmp_logo$(SFX):  $(obj)bmp_logo.o
+$(obj)img2srec$(SFX):  $(obj)img2srec.o
        $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
        $(STRIP) $@
 
@@ -184,15 +183,36 @@ $(obj)inca-swap-bytes$(SFX):      $(obj)inca-swap-bytes.o
        $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
        $(STRIP) $@
 
+$(obj)mkimage$(SFX):   $(obj)crc32.o \
+                       $(obj)default_image.o \
+                       $(obj)fit_image.o \
+                       $(obj)image.o \
+                       $(obj)md5.o \
+                       $(obj)mkimage.o \
+                       $(obj)os_support.o \
+                       $(obj)sha1.o \
+                       $(LIBFDT_OBJS)
+       $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
+       $(STRIP) $@
+
 $(obj)mpc86x_clk$(SFX):        $(obj)mpc86x_clk.o
        $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
        $(STRIP) $@
 
-$(obj)bin2header$(SFX): $(obj)bin2header.o
+$(obj)ncb$(SFX):       $(obj)ncb.o
        $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
        $(STRIP) $@
 
+$(obj)ubsha1$(SFX):    $(obj)os_support.o $(obj)sha1.o $(obj)ubsha1.o
+       $(CC) $(CFLAGS) -o $@ $^
+
 # Some files complain if compiled with -pedantic, use FIT_CFLAGS
+$(obj)default_image.o: $(SRCTREE)/tools/default_image.c
+       $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
+
+$(obj)fit_image.o: $(SRCTREE)/tools/fit_image.c
+       $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
+
 $(obj)image.o: $(SRCTREE)/common/image.c
        $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
@@ -220,7 +240,7 @@ else
            $(MAKE) \
                HOSTOS=$(HOSTOS) \
                HOSTARCH=$(HOSTARCH) \
-               HOST_CFLAGS="$(HOST_CFLAGS)" \
+               HOSTCFLAGS="$(HOSTCFLAGS)" \
                HOST_LDFLAGS="$(HOST_LDFLAGS)" \
                -C $$dir || exit 1 ; \
        done