Merge Official Source

Signed-off-by: Tianling Shen <[email protected]>
lkiuyu · Oct 29, 2023 · f44ef85 · f44ef85
2 parents 20e161d + b3d2008
commit f44ef85
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/Config.in b/Config.in
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006-2013 OpenWrt.org
 
-mainmenu "OpenWrt Configuration"
+mainmenu "ImmortalWrt Configuration"
 
 config MODULES
 	modules

diff --git a/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch b/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch
@@ -589,10 +589,10 @@
 +bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi
 +bootconf=config-1#mt7981b-cmcc-rax3000m-emmc
 +bootdelay=0
-+bootfile=openwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-cmcc_rax3000m-emmc-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-cmcc_rax3000m-emmc-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb
++bootfile=immortalwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb
++bootfile_bl2=immortalwrt-mediatek-filogic-cmcc_rax3000m-emmc-preloader.bin
++bootfile_fip=immortalwrt-mediatek-filogic-cmcc_rax3000m-emmc-bl31-uboot.fip
++bootfile_upg=immortalwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb
 +bootled_pwr=red:status
 +bootled_rec=blue:status
 +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
@@ -646,10 +646,10 @@
 +bootconf=config-1#mt7981b-cmcc-rax3000m-nand
 +bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
 +bootdelay=0
-+bootfile=openwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-cmcc_rax3000m-nand-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-cmcc_rax3000m-nand-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb
++bootfile=immortalwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb
++bootfile_bl2=immortalwrt-mediatek-filogic-cmcc_rax3000m-nand-preloader.bin
++bootfile_fip=immortalwrt-mediatek-filogic-cmcc_rax3000m-nand-bl31-uboot.fip
++bootfile_upg=immortalwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb
 +bootled_pwr=red:status
 +bootled_rec=blue:status
 +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60

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
@@ -351,7 +351,7 @@ Signed-off-by: Alexandros C. Couloumbis <[email protected]>
 +		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
@@ -351,7 +351,7 @@ Signed-off-by: Alexandros C. Couloumbis <[email protected]>
 +		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/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

diff --git a/...drop-the-CLK_SET_RATE_PARENT-flag-f.patch → ...drop-the-CLK_SET_RATE_PARENT-flag-f.patch b/...drop-the-CLK_SET_RATE_PARENT-flag-f.patch → ...drop-the-CLK_SET_RATE_PARENT-flag-f.patch
diff --git a/...6018-add-the-GPLL0-clock-also-as-cl.patch → ...6018-add-the-GPLL0-clock-also-as-cl.patch b/...6018-add-the-GPLL0-clock-also-as-cl.patch → ...6018-add-the-GPLL0-clock-also-as-cl.patch
diff --git a/...q8074-include-the-GPLL0-as-clock-pr.patch → ...q8074-include-the-GPLL0-as-clock-pr.patch b/...q8074-include-the-GPLL0-as-clock-pr.patch → ...q8074-include-the-GPLL0-as-clock-pr.patch