projects / openwrt / staging / stintel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ee035de)
ipq40xx: point to externally compiled dtbs in recipes
authorTomasz Maciej Nowak <tmn505@gmail.com>
Thu, 25 Aug 2022 18:26:11 +0000 (20:26 +0200)
committerDavid Bauer <mail@david-bauer.net>
Tue, 6 Sep 2022 00:50:04 +0000 (02:50 +0200)
Adjusting dts will cause a rebuild of whole kernel as the buildroot
considers this a part of kernel source. It's a royal PITA when trying to
prepare support for new device, since this takes a lot of time on slower
systems. As it stands, buildroot itself, with own rule, also compiles
dtbs and the results are $(KDIR)/image-$(DEVICE_DTS).dtb. With setting
DEVICE_DTS_DIR to directory holding the device dts (similarly to some
other targets), buildroot doesn't consider changed dts as part of kernel
source and rebuilds only dtb. This really speeds up development. And
since the kernel built dts are no longer used, drop the paches adding
dtses to its build.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
Reviewed-by: Robert Marko <robimarko@gmail.com>
target/linux/ipq40xx/image/chromium.mk patch | blob | history
target/linux/ipq40xx/image/generic.mk patch | blob | history
target/linux/ipq40xx/patches-5.10/901-arm-boot-add-dts-files.patch [deleted file] patch | blob | history
target/linux/ipq40xx/patches-5.15/901-arm-boot-add-dts-files.patch [deleted file] patch | blob | history

diff --git a/target/linux/ipq40xx/image/chromium.mk b/target/linux/ipq40xx/image/chromium.mk
index 567a5e7ca5c7af3cac4dcc5cc06ded3968f084e0..2abd2df02ae4dd018ced778e2dc2c654a907fe0c 100644 (file)
--- a/target/linux/ipq40xx/image/chromium.mk
+++ b/target/linux/ipq40xx/image/chromium.mk
@@ -26,7 +26,7 @@ define Device/google_wifi
        DEVICE_MODEL := WiFi (Gale)
        SOC := qcom-ipq4019
        KERNEL_SUFFIX := -fit-zImage.itb.vboot
-       KERNEL = kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb | cros-vboot
+       KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb | cros-vboot
        KERNEL_NAME := zImage
        IMAGES += factory.bin
        IMAGE/factory.bin := cros-gpt | append-kernel-part | append-rootfs
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index 792122f7a1ae1878312d52598a380301863a7919..6daebd5ed0f5ec0a1a3b71168f44cc3a4e2cd8fb 100644 (file)
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -5,19 +5,19 @@ DEVICE_VARS += WRGG_DEVNAME WRGG_SIGNATURE
 
 define Device/FitImage
        KERNEL_SUFFIX := -fit-uImage.itb
-       KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb
+       KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
        KERNEL_NAME := Image
 endef
 
 define Device/FitImageLzma
        KERNEL_SUFFIX := -fit-uImage.itb
-       KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb
+       KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb
        KERNEL_NAME := Image
 endef
 
 define Device/FitzImage
        KERNEL_SUFFIX := -fit-zImage.itb
-       KERNEL = kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb
+       KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb
        KERNEL_NAME := zImage
 endef
 
@@ -308,8 +308,8 @@ TARGET_DEVICES += buffalo_wtr-m2133hp
 
 define Device/cellc_rtl30vw
        KERNEL_SUFFIX := -fit-zImage.itb
-       KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb
-       KERNEL = kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb | uImage lzma | pad-to 2048
+       KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
+       KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb | uImage lzma | pad-to 2048
        KERNEL_NAME := zImage
        KERNEL_IN_UBI :=
        IMAGES := nand-factory.bin nand-sysupgrade.bin
@@ -376,7 +376,7 @@ define Device/devolo_magic-2-wifi-next
 
        # If the bootloader sees 0xDEADC0DE and this trailer at the 64k boundary of a TFTP image
        # it will bootm it, just like we want for the initramfs.
-       KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to 64k |\
+       KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb | pad-to 64k |\
                append-string -e '\xDE\xAD\xC0\xDE{"fl_initramfs":""}\x00'
 
        IMAGE_SIZE := 26624k
@@ -832,7 +832,7 @@ define Device/openmesh_a42
        SOC := qcom-ipq4018
        DEVICE_DTS_CONFIG := config@om.a42
        BLOCKSIZE := 64k
-       KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE)
+       KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE)
        IMAGE_SIZE := 15616k
        IMAGES += factory.bin
        IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A42
@@ -847,7 +847,7 @@ define Device/openmesh_a62
        SOC := qcom-ipq4019
        DEVICE_DTS_CONFIG := config@om.a62
        BLOCKSIZE := 64k
-       KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE)
+       KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE)
        IMAGE_SIZE := 15552k
        IMAGES += factory.bin
        IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A62
@@ -889,7 +889,7 @@ define Device/plasmacloud_pa1200
        SOC := qcom-ipq4018
        DEVICE_DTS_CONFIG := config@pc.pa1200
        BLOCKSIZE := 64k
-       KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE)
+       KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE)
        IMAGE_SIZE := 15616k
        IMAGES += factory.bin
        IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=PA1200
@@ -904,7 +904,7 @@ define Device/plasmacloud_pa2200
        SOC := qcom-ipq4019
        DEVICE_DTS_CONFIG := config@pc.pa2200
        BLOCKSIZE := 64k
-       KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE)
+       KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE)
        IMAGE_SIZE := 15552k
        IMAGES += factory.bin
        IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=PA2200
diff --git a/target/linux/ipq40xx/patches-5.10/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.10/901-arm-boot-add-dts-files.patch
deleted file mode 100644 (file)
index 952092d..0000000
--- a/target/linux/ipq40xx/patches-5.10/901-arm-boot-add-dts-files.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From a10fab12a927e60b7141a602e740d70cb4d09e4a Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Thu, 9 Mar 2017 11:03:18 +0100
-Subject: [PATCH] arm: boot: add dts files
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/arm/boot/dts/Makefile | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -904,11 +904,79 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-       qcom-apq8074-dragonboard.dtb \
-       qcom-apq8084-ifc6540.dtb \
-       qcom-apq8084-mtp.dtb \
-+      qcom-ipq4018-a42.dtb \
-+      qcom-ipq4018-ap120c-ac.dtb \
-+      qcom-ipq4018-dap-2610.dtb \
-+      qcom-ipq4018-cs-w3-wd1200g-eup.dtb \
-+      qcom-ipq4018-magic-2-wifi-next.dtb \
-+      qcom-ipq4018-ea6350v3.dtb \
-+      qcom-ipq4018-eap1300.dtb \
-+      qcom-ipq4018-ecw5211.dtb \
-+      qcom-ipq4018-emd1.dtb \
-+      qcom-ipq4018-emr3500.dtb \
-+      qcom-ipq4018-ens620ext.dtb \
-+      qcom-ipq4018-ex6100v2.dtb \
-+      qcom-ipq4018-ex6150v2.dtb \
-+      qcom-ipq4018-fritzbox-4040.dtb \
-+      qcom-ipq4018-gl-ap1300.dtb \
-+      qcom-ipq4018-jalapeno.dtb \
-+      qcom-ipq4018-meshpoint-one.dtb \
-+      qcom-ipq4018-cap-ac.dtb \
-+      qcom-ipq4018-hap-ac2.dtb \
-+      qcom-ipq4018-sxtsq-5-ac.dtb \
-+      qcom-ipq4018-nbg6617.dtb \
-+      qcom-ipq4019-oap100.dtb \
-+      qcom-ipq4018-pa1200.dtb \
-+      qcom-ipq4018-rt-ac58u.dtb \
-+      qcom-ipq4018-rutx10.dtb \
-+      qcom-ipq4018-wac510.dtb \
-+      qcom-ipq4018-wap-ac.dtb \
-+      qcom-ipq4018-whw01-v1.dtb \
-+      qcom-ipq4018-wre6606.dtb \
-+      qcom-ipq4018-wrtq-329acn.dtb \
-       qcom-ipq4019-ap.dk01.1-c1.dtb \
-       qcom-ipq4019-ap.dk04.1-c1.dtb \
-       qcom-ipq4019-ap.dk04.1-c3.dtb \
-       qcom-ipq4019-ap.dk07.1-c1.dtb \
-       qcom-ipq4019-ap.dk07.1-c2.dtb \
-+      qcom-ipq4019-a62.dtb \
-+      qcom-ipq4019-cm520-79f.dtb \
-+      qcom-ipq4019-e2600ac-c1.dtb \
-+      qcom-ipq4019-e2600ac-c2.dtb \
-+      qcom-ipq4019-ea8300.dtb \
-+      qcom-ipq4019-eap2200.dtb \
-+      qcom-ipq4019-fritzbox-7530.dtb \
-+      qcom-ipq4019-fritzrepeater-1200.dtb \
-+      qcom-ipq4019-fritzrepeater-3000.dtb \
-+      qcom-ipq4019-habanero-dvk.dtb \
-+      qcom-ipq4019-hap-ac3.dtb \
-+      qcom-ipq4019-map-ac2200.dtb \
-+      qcom-ipq4019-lhgg-60ad.dtb \
-+      qcom-ipq4019-mf286d.dtb \
-+      qcom-ipq4019-mr8300.dtb \
-+      qcom-ipq4019-pa2200.dtb \
-+      qcom-ipq4019-r619ac-64m.dtb \
-+      qcom-ipq4019-r619ac-128m.dtb \
-+      qcom-ipq4019-rbr50.dtb \
-+      qcom-ipq4019-rbs50.dtb \
-+      qcom-ipq4019-rt-ac42u.dtb \
-+      qcom-ipq4019-rtl30vw.dtb \
-+      qcom-ipq4019-srr60.dtb \
-+      qcom-ipq4019-srs60.dtb \
-+      qcom-ipq4019-u4019-32m.dtb \
-+      qcom-ipq4019-wifi.dtb \
-+      qcom-ipq4019-wpj419.dtb \
-+      qcom-ipq4019-wtr-m2133hp.dtb \
-+      qcom-ipq4019-x1pro.dtb \
-+      qcom-ipq4028-wpj428.dtb \
-+      qcom-ipq4029-ap-303.dtb \
-+      qcom-ipq4029-ap-303h.dtb \
-+      qcom-ipq4029-ap-365.dtb \
-+      qcom-ipq4029-gl-b1300.dtb \
-+      qcom-ipq4019-gl-b2200.dtb \
-+      qcom-ipq4029-gl-s1300.dtb \
-+      qcom-ipq4029-mr33.dtb \
-+      qcom-ipq4029-mr74.dtb \
-       qcom-ipq8064-ap148.dtb \
-       qcom-ipq8064-rb3011.dtb \
-       qcom-msm8660-surf.dtb \
diff --git a/target/linux/ipq40xx/patches-5.15/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.15/901-arm-boot-add-dts-files.patch
deleted file mode 100644 (file)
index 78b9739..0000000
--- a/target/linux/ipq40xx/patches-5.15/901-arm-boot-add-dts-files.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From a10fab12a927e60b7141a602e740d70cb4d09e4a Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Thu, 9 Mar 2017 11:03:18 +0100
-Subject: [PATCH] arm: boot: add dts files
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/arm/boot/dts/Makefile | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -952,11 +952,78 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-       qcom-ipq4018-ap120c-ac.dtb \
-       qcom-ipq4018-ap120c-ac-bit.dtb \
-       qcom-ipq4018-jalapeno.dtb \
-+      qcom-ipq4018-a42.dtb \
-+      qcom-ipq4018-ap120c-ac.dtb \
-+      qcom-ipq4018-dap-2610.dtb \
-+      qcom-ipq4018-cs-w3-wd1200g-eup.dtb \
-+      qcom-ipq4018-magic-2-wifi-next.dtb \
-+      qcom-ipq4018-ea6350v3.dtb \
-+      qcom-ipq4018-eap1300.dtb \
-+      qcom-ipq4018-ecw5211.dtb \
-+      qcom-ipq4018-emd1.dtb \
-+      qcom-ipq4018-emr3500.dtb \
-+      qcom-ipq4018-ens620ext.dtb \
-+      qcom-ipq4018-ex6100v2.dtb \
-+      qcom-ipq4018-ex6150v2.dtb \
-+      qcom-ipq4018-fritzbox-4040.dtb \
-+      qcom-ipq4018-gl-ap1300.dtb \
-+      qcom-ipq4018-meshpoint-one.dtb \
-+      qcom-ipq4018-cap-ac.dtb \
-+      qcom-ipq4018-hap-ac2.dtb \
-+      qcom-ipq4018-sxtsq-5-ac.dtb \
-+      qcom-ipq4018-nbg6617.dtb \
-+      qcom-ipq4019-oap100.dtb \
-+      qcom-ipq4018-pa1200.dtb \
-+      qcom-ipq4018-rt-ac58u.dtb \
-+      qcom-ipq4018-rutx10.dtb \
-+      qcom-ipq4018-wac510.dtb \
-+      qcom-ipq4018-wap-ac.dtb \
-+      qcom-ipq4018-whw01-v1.dtb \
-+      qcom-ipq4018-wre6606.dtb \
-+      qcom-ipq4018-wrtq-329acn.dtb \
-       qcom-ipq4019-ap.dk01.1-c1.dtb \
-       qcom-ipq4019-ap.dk04.1-c1.dtb \
-       qcom-ipq4019-ap.dk04.1-c3.dtb \
-       qcom-ipq4019-ap.dk07.1-c1.dtb \
-       qcom-ipq4019-ap.dk07.1-c2.dtb \
-+      qcom-ipq4019-a62.dtb \
-+      qcom-ipq4019-cm520-79f.dtb \
-+      qcom-ipq4019-e2600ac-c1.dtb \
-+      qcom-ipq4019-e2600ac-c2.dtb \
-+      qcom-ipq4019-ea8300.dtb \
-+      qcom-ipq4019-eap2200.dtb \
-+      qcom-ipq4019-fritzbox-7530.dtb \
-+      qcom-ipq4019-fritzrepeater-1200.dtb \
-+      qcom-ipq4019-fritzrepeater-3000.dtb \
-+      qcom-ipq4019-habanero-dvk.dtb \
-+      qcom-ipq4019-hap-ac3.dtb \
-+      qcom-ipq4019-map-ac2200.dtb \
-+      qcom-ipq4019-lhgg-60ad.dtb \
-+      qcom-ipq4019-mf286d.dtb \
-+      qcom-ipq4019-mr8300.dtb \
-+      qcom-ipq4019-pa2200.dtb \
-+      qcom-ipq4019-r619ac-64m.dtb \
-+      qcom-ipq4019-r619ac-128m.dtb \
-+      qcom-ipq4019-rbr50.dtb \
-+      qcom-ipq4019-rbs50.dtb \
-+      qcom-ipq4019-rt-ac42u.dtb \
-+      qcom-ipq4019-rtl30vw.dtb \
-+      qcom-ipq4019-srr60.dtb \
-+      qcom-ipq4019-srs60.dtb \
-+      qcom-ipq4019-u4019-32m.dtb \
-+      qcom-ipq4019-wifi.dtb \
-+      qcom-ipq4019-wpj419.dtb \
-+      qcom-ipq4019-wtr-m2133hp.dtb \
-+      qcom-ipq4019-x1pro.dtb \
-+      qcom-ipq4028-wpj428.dtb \
-+      qcom-ipq4029-ap-303.dtb \
-+      qcom-ipq4029-ap-303h.dtb \
-+      qcom-ipq4029-ap-365.dtb \
-+      qcom-ipq4029-gl-b1300.dtb \
-+      qcom-ipq4019-gl-b2200.dtb \
-+      qcom-ipq4029-gl-s1300.dtb \
-+      qcom-ipq4029-mr33.dtb \
-+      qcom-ipq4029-mr74.dtb \
-       qcom-ipq8064-ap148.dtb \
-       qcom-ipq8064-rb3011.dtb \
-       qcom-msm8226-samsung-s3ve3g.dtb \
Staging tree of Stijn Tintel