From b2068f4aac43754a681b675ff3814d9ca87ac986 Mon Sep 17 00:00:00 2001 From: Matt Merhar Date: Sat, 28 Oct 2023 21:15:46 -0400 Subject: [PATCH 1/3] kernel: fix jffs2 compilation with GCC_PLUGIN_RANDSTRUCT enabled Designated initializers are required when using the randstruct GCC plugin, otherwise an error like the following is seen: ./include/linux/lzma.h:60:31: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] This was originally applied via 55643e469c21, but was unintentionally reverted in 483503603cb2. Fixes: 483503603cb2 ("generic: 5.15: rework pending patch") Signed-off-by: Matt Merhar --- .../generic/pending-5.15/530-jffs2_make_lzma_available.patch | 2 +- .../generic/pending-6.1/530-jffs2_make_lzma_available.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/generic/pending-5.15/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-5.15/530-jffs2_make_lzma_available.patch index ac784d0b0bb..f236657b716 100644 --- a/target/linux/generic/pending-5.15/530-jffs2_make_lzma_available.patch +++ b/target/linux/generic/pending-5.15/530-jffs2_make_lzma_available.patch @@ -351,7 +351,7 @@ Signed-off-by: Alexandros C. Couloumbis + LZMA_FREE(address); +} + -+static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free}; ++static ISzAlloc lzma_alloc = { .Alloc = p_lzma_malloc, .Free = p_lzma_free }; + +#endif --- /dev/null diff --git a/target/linux/generic/pending-6.1/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-6.1/530-jffs2_make_lzma_available.patch index f17216c52b9..27a673399a8 100644 --- a/target/linux/generic/pending-6.1/530-jffs2_make_lzma_available.patch +++ b/target/linux/generic/pending-6.1/530-jffs2_make_lzma_available.patch @@ -351,7 +351,7 @@ Signed-off-by: Alexandros C. Couloumbis + LZMA_FREE(address); +} + -+static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free}; ++static ISzAlloc lzma_alloc = { .Alloc = p_lzma_malloc, .Free = p_lzma_free }; + +#endif --- /dev/null From 4b7b3b97779ebada575bf310da56874f60a6554e Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Sun, 29 Oct 2023 11:00:50 +0100 Subject: [PATCH 2/3] qualcommax: mark upstreamed patches as such The GPLL fixes were merged upstream, so lets mark them as such. Signed-off-by: Robert Marko --- ....7-clk-qcom-ipq8074-drop-the-CLK_SET_RATE_PARENT-flag-f.patch} | 0 ....7-clk-qcom-apss-ipq6018-add-the-GPLL0-clock-also-as-cl.patch} | 0 ....7-arm64-dts-qcom-ipq8074-include-the-GPLL0-as-clock-pr.patch} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename target/linux/qualcommax/patches-6.1/{0131-clk-qcom-ipq8074-drop-the-CLK_SET_RATE_PARENT-flag-f.patch => 026-v6.7-clk-qcom-ipq8074-drop-the-CLK_SET_RATE_PARENT-flag-f.patch} (100%) rename target/linux/qualcommax/patches-6.1/{0132-clk-qcom-apss-ipq6018-add-the-GPLL0-clock-also-as-cl.patch => 027-v6.7-clk-qcom-apss-ipq6018-add-the-GPLL0-clock-also-as-cl.patch} (100%) rename target/linux/qualcommax/patches-6.1/{0133-arm64-dts-qcom-ipq8074-include-the-GPLL0-as-clock-pr.patch => 028-v6.7-arm64-dts-qcom-ipq8074-include-the-GPLL0-as-clock-pr.patch} (100%) diff --git a/target/linux/qualcommax/patches-6.1/0131-clk-qcom-ipq8074-drop-the-CLK_SET_RATE_PARENT-flag-f.patch b/target/linux/qualcommax/patches-6.1/026-v6.7-clk-qcom-ipq8074-drop-the-CLK_SET_RATE_PARENT-flag-f.patch similarity index 100% rename from target/linux/qualcommax/patches-6.1/0131-clk-qcom-ipq8074-drop-the-CLK_SET_RATE_PARENT-flag-f.patch rename to target/linux/qualcommax/patches-6.1/026-v6.7-clk-qcom-ipq8074-drop-the-CLK_SET_RATE_PARENT-flag-f.patch diff --git a/target/linux/qualcommax/patches-6.1/0132-clk-qcom-apss-ipq6018-add-the-GPLL0-clock-also-as-cl.patch b/target/linux/qualcommax/patches-6.1/027-v6.7-clk-qcom-apss-ipq6018-add-the-GPLL0-clock-also-as-cl.patch similarity index 100% rename from target/linux/qualcommax/patches-6.1/0132-clk-qcom-apss-ipq6018-add-the-GPLL0-clock-also-as-cl.patch rename to target/linux/qualcommax/patches-6.1/027-v6.7-clk-qcom-apss-ipq6018-add-the-GPLL0-clock-also-as-cl.patch diff --git a/target/linux/qualcommax/patches-6.1/0133-arm64-dts-qcom-ipq8074-include-the-GPLL0-as-clock-pr.patch b/target/linux/qualcommax/patches-6.1/028-v6.7-arm64-dts-qcom-ipq8074-include-the-GPLL0-as-clock-pr.patch similarity index 100% rename from target/linux/qualcommax/patches-6.1/0133-arm64-dts-qcom-ipq8074-include-the-GPLL0-as-clock-pr.patch rename to target/linux/qualcommax/patches-6.1/028-v6.7-arm64-dts-qcom-ipq8074-include-the-GPLL0-as-clock-pr.patch From b3d2008f92f15ff776ad6c4f6d113b0cda1bd2d0 Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Thu, 26 Oct 2023 08:40:59 +0200 Subject: [PATCH 3/3] qualcommax: only build initramfs if CONFIG_TARGET_ROOTFS_INITRAMFS is set This makes it possible to build the ipq807x netgear-wax218 without initramfs - which is required for downstream projects (gluon) Signed-off-by: Florian Maurer --- target/linux/qualcommax/image/ipq807x.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk index f288dae6d85..0be17333b2a 100644 --- a/target/linux/qualcommax/image/ipq807x.mk +++ b/target/linux/qualcommax/image/ipq807x.mk @@ -128,15 +128,17 @@ TARGET_DEVICES += netgear_rax120v2 define Device/netgear_wax218 $(call Device/FitImage) $(call Device/UbiFit) - ARTIFACTS := web-ui-factory.fit DEVICE_VENDOR := Netgear DEVICE_MODEL := WAX218 DEVICE_DTS_CONFIG := config@hk07 BLOCKSIZE := 128k PAGESIZE := 2048 SOC := ipq8072 +ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) + ARTIFACTS := web-ui-factory.fit ARTIFACT/web-ui-factory.fit := append-image initramfs-uImage.itb | \ ubinize-kernel | qsdk-ipq-factory-nand +endif DEVICE_PACKAGES := kmod-spi-gpio kmod-spi-bitbang kmod-gpio-nxp-74hc164 \ ipq-wifi-netgear_wax218 endef