From 651aeb745b190d1b0b86b04b3fa2354dd3321537 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 28 Jul 2020 15:00:04 +0200 Subject: [PATCH 1/2] ipq807x: improve image building code Add support for qsdk upgrade images. Signed-off-by: John Crispin --- target/linux/ipq807x/image/Makefile | 8 ++++++-- target/linux/ipq807x/image/ipq60xx.mk | 1 - target/linux/ipq807x/image/ipq807x.mk | 12 +++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/target/linux/ipq807x/image/Makefile b/target/linux/ipq807x/image/Makefile index 5752cbcabc..3a219e6d6c 100644 --- a/target/linux/ipq807x/image/Makefile +++ b/target/linux/ipq807x/image/Makefile @@ -9,9 +9,13 @@ define Device/Default KERNEL_NAME := zImage FILESYSTEMS := squashfs DEVICE_DTS_DIR := $(DTS_DIR) - IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata + KERNEL_IN_UBI := 1 + ROOTFSNAME_IN_UBI := ubi_rootfs + BLOCKSIZE := 128k + PAGESIZE := 2048 + IMAGES := sysupgrade.tar nand-factory.bin IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata + IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand KERNEL_NAME := Image KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb diff --git a/target/linux/ipq807x/image/ipq60xx.mk b/target/linux/ipq807x/image/ipq60xx.mk index c165663ad1..aa7629416e 100644 --- a/target/linux/ipq807x/image/ipq60xx.mk +++ b/target/linux/ipq807x/image/ipq60xx.mk @@ -17,6 +17,5 @@ define Device/qcom_cp01_c1 DEVICE_DTS := qcom-ipq6018-cp01-c1 DEVICE_DTS_DIR := $(DTS_DIR)/qcom SUPPORTED_DEVICES := qcom,ipq6018-cp01 - IMAGES := sysupgrade.tar endef TARGET_DEVICES += qcom_cp01_c1 diff --git a/target/linux/ipq807x/image/ipq807x.mk b/target/linux/ipq807x/image/ipq807x.mk index 7a65cfd4ea..9bc9403d9e 100644 --- a/target/linux/ipq807x/image/ipq807x.mk +++ b/target/linux/ipq807x/image/ipq807x.mk @@ -5,7 +5,17 @@ define Device/qcom_hk01 DEVICE_DTS := qcom-ipq807x-hk01 DEVICE_DTS_DIR := $(DTS_DIR)/qcom DEVICE_DTS_CONFIG=config@hk01 - IMAGES := sysupgrade.tar SUPPORTED_DEVICES := qcom,ipq807x-hk01 + DEVICE_PACKAGES := ath11k-wifi-qcom endef TARGET_DEVICES += qcom_hk01 + +define Device/sercomm_wallaby + DEVICE_TITLE := Sercomm Kiwi + DEVICE_DTS := qcom-ipq807x-sercomm-wallaby + DEVICE_DTS_DIR := $(DTS_DIR)/qcom + DEVICE_DTS_CONFIG=config@hk09 + SUPPORTED_DEVICES := sercomm,wallaby + DEVICE_PACKAGES := ath11k-wifi-sercomm-wallaby +endef +TARGET_DEVICES += sercomm_wallaby -- 2.25.1