ramips: fix FONERA20N image generation

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

diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index 36a6186..4364223 100644 (file)
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2011 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.


@@ -9,13 +9,14 @@ 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
 
 define cc

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

 endef
 
 endef
 

-define Build/Compile
-       mkdir -p $(PKG_BUILD_DIR)/bin
+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)


@@ -31,12 +32,35 @@ define Build/Compile
        $(call cc,mkcasfw)
        $(call cc,mkfwimage,-lz)
        $(call cc,mkfwimage2,-lz)
        $(call cc,mkcasfw)
        $(call cc,mkfwimage,-lz)
        $(call cc,mkfwimage2,-lz)

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

        $(call cc,add_header)
        $(call cc,add_header)

+       $(call cc,makeamitbin)
+       $(call cc,encode_crc)
+       $(call cc,nand_ecc)
+       $(call cc,mkplanexfw sha1)
+       $(call cc,mktplinkfw md5)
+       $(call cc,pc1crypt)
+       $(call cc,osbridge-crc)
+       $(call cc,wrt400n cyg_crc32)
+       $(call cc,wndr3700)
+       $(call cc,mkdniimg)
+       $(call cc,mktitanimg)
+       $(call cc,mkchkimg)
+       $(call cc,mkzcfw cyg_crc32)
+       $(call cc,spw303v)
+       $(call cc,trx2edips)
+       $(call cc,xorimage)
+       $(call cc,buffalo-enc buffalo-lib, -Wall)
+       $(call cc,buffalo-tag buffalo-lib, -Wall)
+       $(call cc,buffalo-tftp buffalo-lib, -Wall)
+       $(call cc,mkwrgimg md5, -Wall)
+       $(call cc,mkedimaximg)
+       $(call cc,mkbrncmdline)
+       $(call cc,mkbrnimg)

 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))