ramips: mt7620: eMMC: fix compiler warnings in non-debug mode

[oweals/openwrt.git] / target / linux / ramips / image / Makefile

diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index ea7ce0bc90278f33904511a1bdb1a7430a17402f..13934c5b060ea5f949c4581cc2fd33bcb6f4b76f 100644 (file)
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -111,6 +111,26 @@ define Build/wrg-header
        mv $@.new $@
 endef
 
+# combine kernel and rootfs into one image
+# mkdlinkfw <type> <optional extra arguments to mkdlinkfw binary>
+
+define Build/mkdlinkfw
+       -$(STAGING_DIR_HOST)/bin/mkdlinkfw \
+               -k $(IMAGE_KERNEL) \
+               -r $(IMAGE_ROOTFS) \
+               -o $@ \
+               -s $(DLINK_FIRMWARE_SIZE)
+endef
+
+define Build/mkdlinkfw-factory
+       -$(STAGING_DIR_HOST)/bin/mkdlinkfw \
+               -m $(DLINK_ROM_ID) -f $(DLINK_FAMILY_MEMBER) \
+               -F $@ \
+               -o $@.new \
+               -s $(DLINK_FIRMWARE_SIZE)
+       mv $@.new $@
+endef
+
 #
 # The real magic happens inside these templates
 #
@@ -118,7 +138,7 @@ endef
 # $(2), filename of image data
 # $(3), output filename
 define MkImage
-       $(eval imagename=$(if $(4),$(4),MIPS OpenWrt Linux-$(LINUX_VERSION)))
+       $(eval imagename=$(if $(4),$(4),MIPS $(VERSION_DIST) Linux-$(LINUX_VERSION)))
        -mkimage -A mips -O linux -T kernel -C $(1) -a $(loadaddr-y) -e $(loadaddr-y) \
                -n "$(imagename)" \
                -d $(2) $(3)