resync patches for 2.6.30-rc3

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

diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index 3d8e9ea..b162236 100644 (file)
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -11,11 +11,15 @@ PKG_NAME := firmware-utils
 include $(INCLUDE_DIR)/host-build.mk
 
 define cc
 include $(INCLUDE_DIR)/host-build.mk
 
 define cc

-       $(CC) $(HOST_CFLAGS) -include endian.h -o $(PKG_BUILD_DIR)/bin/$(1) src/$(1).c $(2)
+       $(CC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/bin/$(1) src/$(1).c $(2)

 endef
 
 endef
 

-define Build/Compile
-       mkdir -p $(PKG_BUILD_DIR)/bin
+define cc2
+       $(CC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2)
+endef
+
+define Host/Compile
+       mkdir -p $(HOST_BUILD_DIR)/bin

        $(call cc,addpattern)
        $(call cc,trx)
        $(call cc,motorola-bin)
        $(call cc,addpattern)
        $(call cc,trx)
        $(call cc,motorola-bin)


@@ -30,10 +34,17 @@ define Build/Compile
        $(call cc,lzma2eva,-lz)
        $(call cc,mkcasfw)
        $(call cc,mkfwimage,-lz)
        $(call cc,lzma2eva,-lz)
        $(call cc,mkcasfw)
        $(call cc,mkfwimage,-lz)

+       $(call cc,mkfwimage2,-lz)
+       $(call cc,imagetag)
+       $(call cc,add_header)
+       $(call cc,makeamitbin)
+       $(call cc,encode_crc)
+       $(call cc2,mkplanexfw sha1)
+       $(call cc2,mktplinkfw md5)

 endef
 
 endef
 

-define Build/Install
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/* $(STAGING_DIR_HOST)/bin/
+define Host/Install
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/* $(STAGING_DIR_HOST)/bin/

 endef
 
 $(eval $(call HostBuild))
 endef
 
 $(eval $(call HostBuild))