Author: blogic Date: 2014-10-20 08:29:38 +0200 (Mon, 20 Oct 2014) New Revision: 42989
Modified: trunk/target/linux/ramips/image/Makefile trunk/tools/Makefile trunk/tools/firmware-utils/Makefile Log: firmware-utils: restore compilation of mkhilinkfw. Signed-off-by: Yousong Zhou <[email protected]> Modified: trunk/target/linux/ramips/image/Makefile =================================================================== --- trunk/target/linux/ramips/image/Makefile 2014-10-20 06:29:27 UTC (rev 42988) +++ trunk/target/linux/ramips/image/Makefile 2014-10-20 06:29:38 UTC (rev 42989) @@ -430,7 +430,7 @@ BuildFirmware/HLKRM04/squashfs=$(call BuildFirmware/Default4M/squashfs,$(1),$(2),$(3),$(4)) define BuildFirmware/HLKRM04/initramfs $(call BuildFirmware/OF/initramfs,$(1),$(2),$(3),$(4)) - #mkhilinkfw -e -i$(call imgname,$(1),$(2))-uImage.bin -o $(call imgname,$(1),$(2))-factory.bin; + mkhilinkfw -e -i$(call imgname,$(1),$(2))-uImage.bin -o $(call imgname,$(1),$(2))-factory.bin; endef Image/Build/Profile/HLKRM04=$(call BuildFirmware/HLKRM04/$(1),$(1),hlk-rm04,HLKRM04,HLK-RM02) Modified: trunk/tools/Makefile =================================================================== --- trunk/tools/Makefile 2014-10-20 06:29:27 UTC (rev 42988) +++ trunk/tools/Makefile 2014-10-20 06:29:38 UTC (rev 42989) @@ -72,6 +72,7 @@ $(curdir)/padjffs2/compile := $(curdir)/findutils/install $(curdir)/cloog/compile := $(curdir)/ppl/install $(curdir)/bc/compile := $(curdir)/bison/install +$(curdir)/firmware-utils/compile := package/openssl/host/install ifneq ($(CONFIG_CCACHE),) $(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install)) Modified: trunk/tools/firmware-utils/Makefile =================================================================== --- trunk/tools/firmware-utils/Makefile 2014-10-20 06:29:27 UTC (rev 42988) +++ trunk/tools/firmware-utils/Makefile 2014-10-20 06:29:38 UTC (rev 42989) @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/kernel.mk define cc - $(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2) + $(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) $(HOST_LDFLAGS) -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2) endef define Host/Compile @@ -65,7 +65,7 @@ $(call cc,fix-u-media-header cyg_crc32,-Wall) $(call cc,hcsmakeimage bcmalgo) $(call cc,mkporayfw, -Wall) - #$(call cc,mkhilinkfw, -lcrypto) + $(call cc,mkhilinkfw, -lcrypto) $(call cc,mkdcs932, -Wall) $(call cc,mkheader_gemtek,-lz) $(call cc,mkrtn56uimg, -lz) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
