build: centralize fakeroot code

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

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index daf910e74e05d3767354b4e478f07cb9929c1a6e..b00e19758644850e80ccfda635980020f05f2023 100644 (file)
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -9,12 +9,6 @@ KERNEL_LOADADDR := 0x42208000
 
 define Image/Prepare
        $(CP) $(LINUX_DIR)/vmlinux $(KDIR)/$(IMG_PREFIX)-vmlinux.elf
-       mkimage -A arm -O linux -T filesystem -C none \
-               -a $(KERNEL_LOADADDR) -e $(KERNEL_LOADADDR) \
-               -n 'ARM OpenWrt fakeroot' \
-               -s $(KDIR_TMP)/root.dummy-uImage.tmp
-       echo -ne '\xff' > $(KDIR_TMP)/root.dummy
-       cat $(KDIR_TMP)/root.dummy $(KDIR_TMP)/root.dummy-uImage.tmp > $(KDIR)/root.dummy
 endef
 
 define Image/BuildKernel
@@ -31,17 +25,14 @@ define Image/Build
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1)-root.img bs=2k conv=sync
 endef
 
-define Build/append-file
-       cat $(1) >> $@
-endef
-
 define Device/Default
        PROFILES := Default
        KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
        KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs
        KERNEL_PREFIX := $$(IMAGE_PREFIX)
+       SUPPORTED_DEVICES = $$(BOARD_NAME)
+       IMAGE/sysupgrade.tar = sysupgrade-tar | append-metadata
 endef
-DEVICE_VARS += KERNEL_SIZE
 
 define Device/LegacyImage
        KERNEL_SUFFIX := -uImage
@@ -59,7 +50,7 @@ define Device/UbiFit
        KERNEL_IN_UBI := 1
        IMAGES := nand-factory.ubi nand-sysupgrade.tar
        IMAGE/nand-factory.ubi := append-ubi
-       IMAGE/nand-sysupgrade.tar := sysupgrade-tar
+       IMAGE/nand-sysupgrade.tar := sysupgrade-tar | append-metadata
 endef
 
 define Device/DniImage
@@ -67,13 +58,14 @@ define Device/DniImage
        FILESYSTEMS := squashfs
        KERNEL_SUFFIX := -uImage
        KERNEL_INITRAMFS := kernel-bin | append-dtb | uImage none
-       KERNEL = kernel-bin | append-dtb | pad-to $$$$(($$(KERNEL_SIZE)-2*64-1)) | uImage none | append-file $(KDIR)/root.dummy
+       KERNEL = kernel-bin | append-dtb | uImage none | pad-offset $$(KERNEL_SIZE) 64 | \
+               append-uImage-fakeroot-hdr
        KERNEL_NAME := zImage
        NETGEAR_BOARD_ID :=
        NETGEAR_HW_ID :=
+       UBINIZE_OPTS := -E 5
        IMAGES := factory.img sysupgrade.tar
        IMAGE/factory.img := append-kernel | append-ubi | netgear-dni
-       IMAGE/sysupgrade.tar = sysupgrade-tar
 endef
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
 
@@ -86,10 +78,22 @@ define Device/TpSafeImage
        TPLINK_BOARD_NAME :=
        IMAGES := factory.bin sysupgrade.bin
        IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-       IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
+       IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata
 endef
 DEVICE_VARS += TPLINK_BOARD_NAME
 
+define Device/ZyXELImage
+       PROFILES += $$(DEVICE_NAME)
+       FILESYSTEMS := squashfs
+       KERNEL_SUFFIX := -uImage
+       KERNEL = kernel-bin | append-dtb | uImage none | pad-to $${KERNEL_SIZE}
+       KERNEL_NAME := zImage
+       IMAGES := sysupgrade.tar mmcblk0p5-rootfs.bin mmcblk0p4-kernel.bin
+       IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$${BLOCKSIZE} | sysupgrade-tar rootfs=$$$$@ | append-metadata
+       IMAGE/mmcblk0p5-rootfs.bin := append-rootfs | pad-rootfs | pad-to $$$${BLOCKSIZE}
+       IMAGE/mmcblk0p4-kernel.bin := append-kernel
+endef
+
 define Device/AP148
        $(call Device/FitImage)
        $(call Device/UbiFit)
@@ -152,12 +156,12 @@ define Device/EA8500
        BLOCKSIZE := 128k
        KERNEL_SIZE := 3072k
        FILESYSTEMS := squashfs
-       KERNEL = kernel-bin | append-dtb | uImage none | append-file $(KDIR)/root.dummy
+       KERNEL = kernel-bin | append-dtb | uImage none | append-uImage-fakeroot-hdr
        PROFILES += $$(DEVICE_NAME)
        BOARD_NAME := ea8500
+       UBINIZE_OPTS := -E 5
        IMAGES := factory.bin sysupgrade.tar
        IMAGE/factory.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-ubi
-       IMAGE/sysupgrade.tar := sysupgrade-tar
        DEVICE_TITLE := Linksys EA8500
        DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
@@ -201,6 +205,33 @@ define Device/R7800
        DEVICE_PACKAGES := ath10k-firmware-qca9984
 endef
 
-TARGET_DEVICES += AP148 AP148-legacy C2600 D7800 DB149 EA8500 R7500 R7500v2 R7800
+define Device/NBG6817
+       DEVICE_DTS := qcom-ipq8065-nbg6817
+       KERNEL_SIZE := 4096k
+       BLOCKSIZE := 64k
+       BOARD_NAME := nbg6817
+       DEVICE_TITLE := ZyXEL NBG6817
+       DEVICE_PACKAGES := ath10k-firmware-qca9984 e2fsprogs losetup
+       $(call Device/ZyXELImage)
+endef
+
+define Device/VR2600v
+       PROFILES += $$(DEVICE_NAME)
+       FILESYSTEMS := squashfs
+       KERNEL_SUFFIX := -uImage
+       KERNEL = kernel-bin | append-dtb | uImage none
+       KERNEL_NAME := zImage
+       KERNEL_SIZE := 2097152
+       DEVICE_DTS := qcom-ipq8064-vr2600v
+       BLOCKSIZE := 128k
+       PAGESIZE := 2048
+       BOARD_NAME := vr2600v
+       DEVICE_TITLE := TP-Link Archer VR2600v
+       DEVICE_PACKAGES := ath10k-firmware-qca99x0
+       IMAGES := sysupgrade.bin
+       IMAGE/sysupgrade.bin := pad-extra 512 | append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata
+endef
+
+TARGET_DEVICES += AP148 AP148-legacy C2600 D7800 DB149 EA8500 R7500 R7500v2 R7800 NBG6817 VR2600v
 
 $(eval $(call BuildImage))