ramips: append metadata to images

[openwrt/staging/yousong.git] / target / linux / ramips / image / mt7620.mk

diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index e669b8c9ca9f46b10f108f4f6cd68672dfdb4109..f03c803b1855b6b77a860848ebf469d8a6a8cf84 100644 (file)
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -45,7 +45,7 @@ define Device/ArcherC20i
   DTS := ArcherC20i
   KERNEL := $(KERNEL_DTB)
   KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-header ArcherC20i -c
   DTS := ArcherC20i
   KERNEL := $(KERNEL_DTB)
   KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-header ArcherC20i -c

-  IMAGE/sysupgrade.bin := append-kernel | tplink-header ArcherC20i -j -r $(KDIR)/root.squashfs
+  IMAGE/sysupgrade.bin := append-kernel | tplink-header ArcherC20i -j -r $(KDIR)/root.squashfs | append-metadata

   DEVICE_TITLE := TP-Link ArcherC20i
 endef
 TARGET_DEVICES += ArcherC20i
   DEVICE_TITLE := TP-Link ArcherC20i
 endef
 TARGET_DEVICES += ArcherC20i


@@ -54,7 +54,7 @@ define Device/ArcherC50
   DTS := ArcherC50
   KERNEL := $(KERNEL_DTB)
   KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-header ArcherC50 -c
   DTS := ArcherC50
   KERNEL := $(KERNEL_DTB)
   KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-header ArcherC50 -c

-  IMAGE/sysupgrade.bin := append-kernel | tplink-header ArcherC50 -j -r $(KDIR)/root.squashfs
+  IMAGE/sysupgrade.bin := append-kernel | tplink-header ArcherC50 -j -r $(KDIR)/root.squashfs | append-metadata

   DEVICE_TITLE := TP-Link ArcherC50
 endef
 TARGET_DEVICES += ArcherC50
   DEVICE_TITLE := TP-Link ArcherC50
 endef
 TARGET_DEVICES += ArcherC50


@@ -65,7 +65,7 @@ define Device/ex2700
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   KERNEL := $(KERNEL_DTB) | uImage lzma | pad-kernel-ex2700
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   KERNEL := $(KERNEL_DTB) | uImage lzma | pad-kernel-ex2700

-  IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | netgear-header -B EX2700 -H 29764623+4+0+32+2x2+0
+  IMAGE/factory.bin := $$(sysupgrade_bin) | netgear-header -B EX2700 -H 29764623+4+0+32+2x2+0

   DEVICE_TITLE := Netgear EX2700
 endef
 TARGET_DEVICES += ex2700
   DEVICE_TITLE := Netgear EX2700
 endef
 TARGET_DEVICES += ex2700


@@ -75,7 +75,8 @@ define Device/wt3020-4M
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin

-  IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | poray-header -B WT3020 -F 4M
+  SUPPORTED_DEVICES := wt3020
+  IMAGE/factory.bin := $$(sysupgrade_bin) | poray-header -B WT3020 -F 4M

   DEVICE_TITLE := Nexx WT3020 (4MB)
 endef
 TARGET_DEVICES += wt3020-4M
   DEVICE_TITLE := Nexx WT3020 (4MB)
 endef
 TARGET_DEVICES += wt3020-4M


@@ -83,7 +84,8 @@ TARGET_DEVICES += wt3020-4M
 define Device/wt3020-8M
   DTS := WT3020-8M
   IMAGES += factory.bin
 define Device/wt3020-8M
   DTS := WT3020-8M
   IMAGES += factory.bin

-  IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | poray-header -B WT3020 -F 8M
+  SUPPORTED_DEVICES := wt3020
+  IMAGE/factory.bin := $$(sysupgrade_bin) | poray-header -B WT3020 -F 8M

   DEVICE_TITLE := Nexx WT3020 (8MB)
 endef
 TARGET_DEVICES += wt3020-8M
   DEVICE_TITLE := Nexx WT3020 (8MB)
 endef
 TARGET_DEVICES += wt3020-8M


@@ -92,7 +94,7 @@ define Device/wrh-300cr
   DTS := WRH-300CR
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   IMAGES += factory.bin
   DTS := WRH-300CR
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   IMAGES += factory.bin

-  IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | elecom-header
+  IMAGE/factory.bin := $$(sysupgrade_bin) | elecom-header

   DEVICE_TITLE := Elecom WRH-300CR 
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
   DEVICE_TITLE := Elecom WRH-300CR 
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef


@@ -101,7 +103,7 @@ TARGET_DEVICES += wrh-300cr
 define Device/e1700
   DTS := E1700
   IMAGES += factory.bin
 define Device/e1700
   DTS := E1700
   IMAGES += factory.bin

-  IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | umedia-header 0x013326
+  IMAGE/factory.bin := $$(sysupgrade_bin) | umedia-header 0x013326

   DEVICE_TITLE := Linksys E1700
 endef
 TARGET_DEVICES += e1700
   DEVICE_TITLE := Linksys E1700
 endef
 TARGET_DEVICES += e1700


@@ -411,7 +413,7 @@ define Device/dch-m225
   IMAGE/sysupgrade.bin := \
        append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs | \
        seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \
   IMAGE/sysupgrade.bin := \
        append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs | \
        seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \

-       pad-rootfs | check-size $$$$(IMAGE_SIZE)
+       pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)

   IMAGE/factory.bin := \
        append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | \
        append-rootfs | pad-rootfs -x 64 | \
   IMAGE/factory.bin := \
        append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | \
        append-rootfs | pad-rootfs -x 64 | \