ramips: only limit lzma dictionary size on mt7621

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

diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 7196a4664f19046b7e32d53be35fec110b1069e4..9cf64361a4b15c319198d88f67fd537b9d6013c6 100644 (file)
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -39,7 +39,7 @@ define Device/Default
   DEVICE_DTS_DIR := ../dts
   IMAGES := sysupgrade.bin
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  SUPPORTED_DEVICES = $(1)
+  SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
   sysupgrade_bin := append-kernel | append-rootfs | pad-rootfs
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
 endef
@@ -57,6 +57,22 @@ define Build/trx
                -a 4 -f $(IMAGE_ROOTFS)
 endef
 
+define Build/loader-common
+       rm -rf $@.src
+       $(MAKE) -C lzma-loader \
+               PKG_BUILD_DIR="$@.src" \
+               TARGET_DIR="$(dir $@)" LOADER_NAME="$(notdir $@)" \
+               BOARD="$(BOARDNAME)" PLATFORM="$(PLATFORM)" \
+               LZMA_TEXT_START=0x82000000 LOADADDR=$(KERNEL_LOADADDR) \
+               $(1) compile loader.$(LOADER_TYPE)
+       mv "$@.$(LOADER_TYPE)" "$@"
+       rm -rf $@.src
+endef
+
+define Build/loader-kernel
+       $(call Build/loader-common,LOADER_DATA="$@")
+endef
+
 define Build/relocate-kernel
        ( \
                dd if=$(KDIR)/loader.bin bs=32 conv=sync && \
@@ -92,11 +108,6 @@ define Build/poray-header
        mv $@.new $@
 endef
 
-define Build/senao-header
-       $(STAGING_DIR_HOST)/bin/mksenaofw $(1) -e $@ -o $@.new
-       mv $@.new $@
-endef
-
 define Build/seama
        $(STAGING_DIR_HOST)/bin/seama -i $@ $(1)
        mv $@.seama $@
@@ -111,6 +122,30 @@ 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
+
+define Build/zyimage
+       $(STAGING_DIR_HOST)/bin/zyimage $(1) $@
+endef
+
 #
 # The real magic happens inside these templates
 #
@@ -118,7 +153,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)
@@ -212,12 +247,8 @@ ifeq ($(SUBTARGET),mt7621)
 include mt7621.mk
 endif
 
-ifeq ($(SUBTARGET),mt7628)
-include mt7628.mk
-endif
-
-ifeq ($(SUBTARGET),mt7688)
-include mt7688.mk
+ifeq ($(SUBTARGET),mt76x8)
+include mt76x8.mk
 endif
 
 ifdef LEGACY_DEVICES