X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Fimage%2FMakefile;h=ea7ff7e92b4920133912f535fb2c6e2adfb6572f;hp=4e33e0a1f83ebf6e2967003e1da3f68b81bdf375;hb=e7ec5df33bdb3929c1b99adb68813643cc6ecd25;hpb=3ad1820e8365313d89902e5556c8722aabe9e0aa diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 4e33e0a1f8..ea7ff7e92b 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -49,8 +49,8 @@ define Build/trx $(STAGING_DIR_HOST)/bin/trx \ -o $@ \ -m $(IMAGE_SIZE) \ - -f $(word 1,$^) \ - -a 4 -f $(word 2,$^) + -f $(IMAGE_KERNEL) \ + -a 4 -f $(IMAGE_ROOTFS) endef define Build/relocate-kernel @@ -74,6 +74,29 @@ define MkCombineduImage $(call MkImage,lzma,$(KDIR)/vmlinux-$(2).bin.lzma.combined,$(call sysupname,$(1),$(2)),$(6)) endef +define Build/umedia-header + fix-u-media-header -T 0x46 -B $(1) -i $@ -o $@.new && mv $@.new $@ +endef + +define Build/edimax-header + $(STAGING_DIR_HOST)/bin/mkedimaximg -i $@ -o $@.new $(1) + @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 $@ +endef + +define Build/seama-seal + $(call Build/seama,-s $@.seama $(1)) +endef + # # The real magic happens inside these templates # @@ -107,7 +130,7 @@ endef # $(3), optional filename suffix, e.g. "-initramfs" define PatchKernelLzmaDtb cp $(KDIR)/vmlinux$(3) $(KDIR)/vmlinux-$(1)$(3) - $(LINUX_DIR)/scripts/dtc/dtc -O dtb -o $(KDIR)/$(2).dtb ../dts/$(2).dts + $(call Image/BuildDTB,../dts/$(2).dts,$(KDIR)/$(2).dtb) $(STAGING_DIR_HOST)/bin/patch-dtb $(KDIR)/vmlinux-$(1)$(3) $(KDIR)/$(2).dtb $(call CompressLzma,$(KDIR)/vmlinux-$(1)$(3),$(KDIR)/vmlinux-$(1)$(3).bin.lzma) endef @@ -192,38 +215,6 @@ define BuildFirmware/DefaultDualSize/initramfs $(call BuildFirmware/OF/initramfs,$(1),$(2)-8M,$(3)-8M) endef -# build Seama header images -define BuildFirmware/Seama/squashfs - $(call MkImageLzmaDtb,$(2),$(3),$(5)) - $(eval output_name=$(IMG_PREFIX)-$(2)-$(1)-sysupgrade.bin) - cat $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/root.$(1) > $(KDIR)/img_$(2).$(1).tmp - if [ `stat -c%s "$(KDIR)/img_$(2).$(1).tmp"` -gt $$$$(($(5) - 64)) ]; then \ - echo "Warning: $(KDIR)/img_$(2).$(1).tmp is too big" >&2; \ - else \ - dd if=$(KDIR)/vmlinux-$(2).bin.lzma of=$(KDIR)/vmlinux-$(2).bin.lzma.padded bs=64k conv=sync; \ - ( \ - dd if=$(KDIR)/vmlinux-$(2).bin.lzma.padded bs=1 count=`expr \`stat -c%s $(KDIR)/vmlinux-$(2).bin.lzma.padded\` - 64`; \ - dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \ - ) > $(KDIR)/vmlinux-$(2).tmp; \ - $(STAGING_DIR_HOST)/bin/seama \ - -i $(KDIR)/vmlinux-$(2).tmp \ - -m "dev=/dev/mtdblock/2" -m "type=firmware"; \ - $(STAGING_DIR_HOST)/bin/seama \ - -s $(call imgname,$(1),$(2))-factory.bin \ - -m "signature=$(4)" \ - -i $(KDIR)/vmlinux-$(2).tmp.seama; \ - dd if=$(KDIR)/vmlinux-$(2).bin.lzma.padded bs=1 count=`expr \`stat -c%s $(KDIR)/vmlinux-$(2).bin.lzma.padded\` - 64` of=$(KDIR)/vmlinux-$(2)-sysupgrade.tmp; \ - $(STAGING_DIR_HOST)/bin/seama \ - -i $(KDIR)/vmlinux-$(2)-sysupgrade.tmp \ - -m "dev=/dev/mtdblock/2" -m "type=firmware"; \ - ( \ - dd if=$(KDIR)/vmlinux-$(2)-sysupgrade.tmp.seama; \ - dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \ - ) > $(BIN_DIR)/$(output_name); \ - fi -endef -BuildFirmware/Seama/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3)) - define BuildFirmware/PorayDualSize/squashfs $(call BuildFirmware/DefaultDualSize/$(1),$(1),$(2),$(3)) if [ -e "$(call sysupname,$(1),$(2)-4M)" ]; then \ @@ -246,6 +237,7 @@ endif ifeq ($(SUBTARGET),rt305x) include rt305x.mk +include rt305x-legacy.mk endif ifeq ($(SUBTARGET),rt3883) @@ -260,101 +252,6 @@ ifeq ($(SUBTARGET),mt7621) include mt7621.mk endif -<<<<<<< HEAD -======= -define Device/mt7621 - DTS := MT7621 - IMAGE_SIZE := $(ralink_default_fw_size_4M) -endef - -define Device/wsr-600 - DTS := WSR-600 - IMAGE_SIZE := $(ralink_default_fw_size_16M) -endef - -define Device/re6500 - DTS := RE6500 -endef - -define Device/wsr-1166 - DTS := WSR-1166 - IMAGE/sysupgrade.bin := trx | pad-rootfs - IMAGE_SIZE := $(ralink_default_fw_size_16M) -endef - -define Device/dir-860l-b1 - DTS := DIR-860L-B1 - IMAGES += factory.bin - KERNEL := kernel-bin | patch-dtb | relocate-kernel | lzma | uImage lzma - IMAGE_SIZE := $(ralink_default_fw_size_16M) - IMAGE/sysupgrade.bin := \ - append-kernel | pad-offset 65536 64 | append-rootfs | \ - seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \ - pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := \ - append-kernel | pad-offset 65536 64 | append-rootfs | pad-rootfs -x 64 | \ - seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \ - seama-seal -m "signature=wrgac13_dlink.2013gui_dir860lb" | \ - check-size $$$$(IMAGE_SIZE) -endef - -define Device/firewrt - DTS := FIREWRT - IMAGE_SIZE := $(ralink_default_fw_size_16M) -endef - -define Device/pbr-m1 - DTS := PBR-M1 - IMAGE_SIZE := $(ralink_default_fw_size_16M) -endef - -define Device/sap-g3200u3 - DTS := SAP-G3200U3 -endef - -define Device/witi - DTS := WITI - IMAGE_SIZE := $(ralink_default_fw_size_16M) -endef - -define Device/zbt-wg2626 - DTS := ZBT-WG2626 - IMAGE_SIZE := $(ralink_default_fw_size_16M) -endef - -define Device/wf-2881 - DTS := WF-2881 - BLOCKSIZE := 128KiB - PAGESIZE := 2048 - FILESYSTEMS := squashfs - IMAGE_SIZE := 132382720 - KERNEL := $(KERNEL_DTB) | pad-offset 131072 64 | uImage lzma - IMAGE/sysupgrade.bin := append-kernel | append-ubi | check-size $$$$(IMAGE_SIZE) -endef - -define Device/ubnt-erx - DTS := UBNT-ERX - FILESYSTEMS := squashfs - KERNEL_SIZE := 3145728 - KERNEL := $(KERNEL_DTB) | uImage lzma - IMAGES := sysupgrade.tar $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),factory-initramfs.tar) - IMAGE/factory-initramfs.tar := ubnt-erx-factory-compat | \ - ubnt-erx-factory-kernel | \ - ubnt-erx-factory-rootfs | \ - ubnt-erx-factory-version | \ - ubnt-erx-factory-check-size $$(KERNEL_SIZE) - IMAGE/sysupgrade.tar := sysupgrade-nand -endef - -# -# MT7628 Profiles -# - -Image/Build/Profile/MIWIFI-NANO=$(call BuildFirmware/Default16M/$(1),$(1),miwifi-nano,MIWIFI-NANO) -Image/Build/Profile/MT7628=$(call BuildFirmware/Default4M/$(1),$(1),mt7628,MT7628) -Image/Build/Profile/WRTNODE2P=$(call BuildFirmware/Default16M/$(1),$(1),wrtnode2p,WRTNODE2P) - ->>>>>>> Adjust image size limit for the D-Link DIR-860L B1 ifeq ($(SUBTARGET),mt7628) include mt7628.mk endif @@ -363,8 +260,7 @@ ifeq ($(SUBTARGET),mt7688) include mt7688.mk endif - -ifndef TARGET_DEVICES +ifdef LEGACY_DEVICES # # Generic Targets - only needed for legacy image building code # @@ -388,8 +284,13 @@ endef define Image/Build $(call Image/Build/$(1)) dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync - $(call Image/Build/Profile/$(PROFILE),$(1)) endef + +define Image/Build/Profile + $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/Build/Profile/$(1),initramfs)) + $(call Image/Build/Profile/$(1),$(2)) +endef + endif $(eval $(call BuildImage))