refresh patch

[openwrt.git] / tools / firmware-utils / Makefile

diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index ec41e08..40b0199 100644 (file)
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -9,22 +9,12 @@ include $(TOPDIR)/rules.mk
 PKG_NAME := firmware-utils
 
 include $(INCLUDE_DIR)/host-build.mk
 PKG_NAME := firmware-utils
 
 include $(INCLUDE_DIR)/host-build.mk

-

 include $(INCLUDE_DIR)/kernel.mk
 
 define cc
 include $(INCLUDE_DIR)/kernel.mk
 
 define cc

-       $(CC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/bin/$(1) src/$(1).c $(2)
-endef
-
-define cc2

        $(CC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2)
 endef
 
        $(CC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2)
 endef
 

-define cc3
-       $(CC) $(HOST_CFLAGS) -I$(CURDIR)/../../target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx -include endian.h -o $(HOST_BUILD_DIR)/bin/$(1) src/$(1).c $(2)
-endef
-
-

 define Host/Compile
        mkdir -p $(HOST_BUILD_DIR)/bin
        $(call cc,addpattern)
 define Host/Compile
        mkdir -p $(HOST_BUILD_DIR)/bin
        $(call cc,addpattern)


@@ -42,17 +32,22 @@ define Host/Compile
        $(call cc,mkcasfw)
        $(call cc,mkfwimage,-lz)
        $(call cc,mkfwimage2,-lz)
        $(call cc,mkcasfw)
        $(call cc,mkfwimage,-lz)
        $(call cc,mkfwimage2,-lz)

-       $(call cc3,imagetag)
+       $(call cc,imagetag imagetag_cmdline)

        $(call cc,add_header)
        $(call cc,makeamitbin)
        $(call cc,encode_crc)
        $(call cc,nand_ecc)
        $(call cc,add_header)
        $(call cc,makeamitbin)
        $(call cc,encode_crc)
        $(call cc,nand_ecc)

-       $(call cc2,mkplanexfw sha1)
-       $(call cc2,mktplinkfw md5)
+       $(call cc,mkplanexfw sha1)
+       $(call cc,mktplinkfw md5)

        $(call cc,pc1crypt)
        $(call cc,osbridge-crc)
        $(call cc,pc1crypt)
        $(call cc,osbridge-crc)

-       $(call cc2,wrt400n cyg_crc32)
+       $(call cc,wrt400n cyg_crc32)

        $(call cc,wndr3700)
        $(call cc,wndr3700)

+       $(call cc,mkdniimg)
+       $(call cc,mktitanimg)
+       $(call cc,mkchkimg)
+       $(call cc,mkzcfw cyg_crc32)
+       $(call cc,trx2edips)

 endef
 
 define Host/Install
 endef
 
 define Host/Install