update

.github/workflows/Openwrt-AutoBuild.yml

@@ -66,12 +66,14 @@ jobs:
         if [ ${{matrix.target}} == "x86_64" ]; then
             echo "ARCH=linux/amd64" >> $GITHUB_ENV
             echo "MTARGET=x86_64" >> $GITHUB_ENV
-        elif [[ ${{matrix.target}} =~ (armvirt_64|ipq807x|mediatek_mt7622|bcm27xx_bcm2710) ]]; then
+        elif [[ ${{matrix.target}} =~ (armvirt_64|ipq807x|mediatek_mt7622|bcm27xx_bcm2710|ipq60xx_generic|ipq60xx_generic|bcm4908_generic) ]]; then
             echo "MTARGET=aarch64_cortex-a53" >> $GITHUB_ENV
         elif [[ ${{matrix.target}} =~ (ramips_mt7621|ramips_mt7620|ramips_mt76x8) ]]; then
             echo "MTARGET=mipsel_24kc" >> $GITHUB_ENV
         elif [[ ${{matrix.target}} =~ (ipq40xx_generic|bcm27xx_bcm2709) ]]; then
             echo "MTARGET=arm_cortex-a7_neon-vfpv4" >> $GITHUB_ENV
+        elif [[ ${{matrix.target}} == "at91_sama5" ]]; then
+            echo "MTARGET=arm_cortex-a5_vfpv4" >> $GITHUB_ENV
         elif [[ ${{matrix.target}} == "bcm53xx" ]]; then
             echo "MTARGET=arm_cortex-a9" >> $GITHUB_ENV
         elif [[ ${{matrix.target}} == "mvebu_cortexa9" ]]; then
@@ -125,7 +127,11 @@ jobs:
         REPO_BRANCH="$((curl -gs -H 'Content-Type: application/json' \
            -H "Authorization: Bearer ${{ secrets.REPO_TOKEN }}" \
            -X POST -d '{ "query": "query {repository(owner: \"openwrt\", name: \"openwrt\") {refs(refPrefix: \"refs/tags/\", last: 4, orderBy: {field: TAG_COMMIT_DATE, direction: ASC}) {edges {node {name}}}}}"}' https://api.github.com/graphql) | jq -r '.data.repository.refs.edges[].node.name' | grep v22 | tail -n 1)"
-        git clone $REPO_URL -b $REPO_BRANCH openwrt
+        if [ ${{matrix.target}} == "ipq60xx_generic" ]; then
+            git clone https://github.com/kiddin9/openwrt-ax1800 openwrt --depth 1
+        else
+            git clone $REPO_URL -b $REPO_BRANCH openwrt
+        fi
         if [ "${{ env.REPO_BRANCH }}" ]; then
           cd openwrt
           git checkout ${{ env.REPO_BRANCH }}
@@ -189,6 +195,7 @@ jobs:
 
     - name: Cache
       uses: klever1988/cachewrtbuild@main
+      if: github.event.client_payload.target != 'ipq60xx_generic'
       with:
         ccache: 'true'
         clean: ${{ contains(github.event.action, 'nocache') }}

.github/workflows/repo-dispatcher.yml

@@ -111,6 +111,20 @@ jobs:
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
           -d '{"event_type": "ipq40xx_generic", "client_payload": {"target": "ipq40xx_generic"}}'
+          -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
+          -d '{"event_type": "bcm4908_generic", "client_payload": {"target": "bcm4908_generic"}}'
+          curl \
+          -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
+          -d '{"event_type": "at91_sama5", "client_payload": {"target": "at91_sama5"}}'
+          curl \
+          -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
+          -d '{"event_type": "ipq60xx_generic", "client_payload": {"target": "ipq60xx_generic"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \

devices/at91_sama5/.config

@@ -0,0 +1,10 @@
+
+CONFIG_TARGET_at91=y
+CONFIG_TARGET_at91_sama5=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_at91_sama5_DEVICE_microchip_sama5d3-xplained=y
+
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
+
+
+

devices/at91_sama5/diy.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+shopt -s extglob
+
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/mediatek/Makefile
+

devices/bcm4908_generic/.config

@@ -0,0 +1,11 @@
+
+CONFIG_TARGET_bcm4908=y
+CONFIG_TARGET_bcm4908_generic=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_bcm4908_generic_DEVICE_asus_gt-ac5300=y
+CONFIG_TARGET_DEVICE_bcm4908_generic_DEVICE_netgear_r8000p=y
+
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
+
+
+

devices/bcm4908_generic/diy.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+shopt -s extglob
+
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+#bash $SHELL_FOLDER/../common/kernel_5.15.sh
+
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/bcm4908/Makefile
+
+echo '
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_AES_ARM64=y
+CONFIG_CRYPTO_AES_ARM64_BS=y
+CONFIG_CRYPTO_AES_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA256_ARM64=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA512_ARM64=y
+CONFIG_CRYPTO_SIMD=y
+CONFIG_REALTEK_PHY=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+' >> ./target/linux/bcm4908/config-5.10
+

devices/bcm53xx/diy.sh

@@ -5,5 +5,30 @@ shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 #bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq luci-app-turboacc/' target/linux/mediatek/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/bcm53xx/Makefile
+
+echo '
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_AES_ARM64=y
+CONFIG_CRYPTO_AES_ARM64_BS=y
+CONFIG_CRYPTO_AES_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA256_ARM64=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA512_ARM64=y
+CONFIG_CRYPTO_SIMD=y
+CONFIG_REALTEK_PHY=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+' >> ./target/linux/bcm53xx/config-5.10
+
+
 

devices/common/.config

@@ -12,7 +12,7 @@ CONFIG_SIGNATURE_CHECK=n
 # 设置固件大小:
 CONFIG_TARGET_ROOTFS_PARTSIZE=1004
 
-CONFIG_ALL_KMODS=y
+CONFIG_ALL_NONSHARED=y
 
 CONFIG_IB=y
 CONFIG_IB_STANDALONE=y
@@ -72,6 +72,7 @@ CONFIG_OPENSSL_ENGINE_BUILTIN_AFALG=y
 CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO=y
 
 CONFIG_PACKAGE_kmod-tcp-bbr=y
+CONFIG_PACKAGE_miniupnpd=y
 
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y

devices/common/diy.sh

@@ -17,6 +17,8 @@ sed -i '/	refresh_config();/d' scripts/feeds
 sed -i '$a src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master' feeds.conf.default
 }
 
+sed -i "s/^.*vermagic$/\techo '1' > \$(LINUX_DIR)\/.vermagic/" include/kernel-defaults.mk
+
 ./scripts/feeds update -a
 ./scripts/feeds install -a -p kiddin9 -f
 ./scripts/feeds install -a
@@ -36,7 +38,7 @@ rm -rf target/linux/generic/hack-5.10/{220-gc_sections*,781-dsa-register*,780-dr
 sed -i 's?zstd$?zstd ucl upx\n$(curdir)/upx/compile := $(curdir)/ucl/compile?g' tools/Makefile
 sed -i 's/\/cgi-bin\/\(luci\|cgi-\)/\/\1/g' `find package/feeds/kiddin9/luci-*/ -name "*.lua" -or -name "*.htm*" -or -name "*.js"` &
 sed -i 's/Os/O2/g' include/target.mk
-sed -i 's/$(TARGET_DIR)) install/$(TARGET_DIR)) install --force-overwrite --force-maintainer --force-depends/' package/Makefile
+sed -i 's/$(TARGET_DIR)) install/$(TARGET_DIR)) install --force-overwrite --force-depends/' package/Makefile
 sed -i "/mediaurlbase/d" package/feeds/*/luci-theme*/root/etc/uci-defaults/*
 sed -i 's/=bbr/=cubic/' package/kernel/linux/files/sysctl-tcp-bbr.conf
 

devices/common/kernel_5.15.sh

@@ -5,7 +5,7 @@ latest="$(curl -sfL https://github.com/openwrt/openwrt/commits/master/include |
 mkdir new; cp -rf .git new/.git
 cd new
 [ "$latest" ] && git reset --hard $latest || git reset --hard origin/master
-#git checkout HEAD^
+git checkout HEAD^
 [ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $latest
 cp -rf --parents target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} ../
 cd -

devices/common/patches/targets.patch

@@ -1,11 +1,15 @@
 --- a/include/target.mk
 +++ b/include/target.mk
-@@ -55,8 +55,6 @@ DEFAULT_PACKAGES.nas:=\
+@@ -53,10 +53,8 @@ DEFAULT_PACKAGES.nas:=\
+ 	mdadm
+ # For router targets
  DEFAULT_PACKAGES.router:=\
- 	dnsmasq \
- 	firewall4 \
+-	dnsmasq \
+-	firewall4 \
 -	nftables \
 -	kmod-nft-offload \
++	dnsmasq-full \
++	firewall \
  	odhcp6c \
  	odhcpd-ipv6only \
  	ppp \

devices/common/patches/zh-cn.patch

@@ -0,0 +1,13 @@
+--- a/feeds/luci/luci.mk
++++ b/feeds/luci/luci.mk
+@@ -206,6 +206,10 @@ define Package/$(PKG_NAME)/install
+ 	  $(call Build/Install/Default) \
+ 	  $(CP) $(PKG_INSTALL_DIR)/* $(1)/; \
+ 	else true; fi
++	$(INSTALL_DIR) $(1)$(LUCI_LIBRARYDIR)/i18n
++	$(foreach po,$(wildcard ${CURDIR}/po/zh_Hans/*.po), \
++		po2lmo $(po) \
++		$(1)$(LUCI_LIBRARYDIR)/i18n/$(basename $(notdir $(po))).zh-cn.lmo;)
+ endef
+ 
+ ifndef Package/$(PKG_NAME)/postinst

devices/ipq60xx_generic/.config

@@ -0,0 +1,67 @@
+
+CONFIG_TARGET_ipq60xx=y
+CONFIG_TARGET_ipq60xx_generic=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_cmiot_ax18=y
+CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-ax1800=y
+CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-axt1800=y
+CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_linksys_mr7350=y
+CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_qihoo_v6=y
+CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_zn_m2=y
+
+CONFIG_GCC_USE_VERSION_7=y
+CONFIG_PACKAGE_kmod-dm-raid=n
+CONFIG_PACKAGE_kmod-dm=n
+CONFIG_PACKAGE_kmod-fs-xfs=n
+CONFIG_PACKAGE_kmod-fs-btrfs=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-bridge-mgr=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-vlan-mgr=n
+CONFIG_PACKAGE_kmod-drm-ttm=n
+CONFIG_PACKAGE_kmod-drm-kms-helper=n
+CONFIG_PACKAGE_kmod-gigaset=n
+CONFIG_PACKAGE_kmod-isdn4linux=n
+CONFIG_PACKAGE_kmod-video-pwc=n
+CONFIG_PACKAGE_kmod-mmc-spi=n
+CONFIG_PACKAGE_kmod-scsi-cdrom=n
+CONFIG_PACKAGE_kmod-scsi-generic=n
+CONFIG_PACKAGE_kmod-scsi-tape=n
+CONFIG_PACKAGE_kmod-sound-core=n
+CONFIG_PACKAGE_kmod-iio-hmc5843=n
+CONFIG_PACKAGE_kmod-ledtrig-netdev=n
+CONFIG_PACKAGE_kmod-tg3=n
+CONFIG_PACKAGE_kmod-be2net=n
+CONFIG_PACKAGE_kmod-bmp085-spi=n
+CONFIG_PACKAGE_kmod-mac80211-hwsim=n
+CONFIG_PACKAGE_kmod-ath3k=n
+CONFIG_PACKAGE_kmod-ath5k=n
+CONFIG_PACKAGE_kmod-ath6kl-sdio=n
+CONFIG_PACKAGE_kmod-ath6kl-usb=n
+CONFIG_PACKAGE_kmod-ath9k=n
+CONFIG_PACKAGE_kmod-ath10k=n
+CONFIG_PACKAGE_kmod-ath10k-ct=n
+CONFIG_PACKAGE_kmod-ath10k-ct-smallbuffers=n
+CONFIG_PACKAGE_kmod-crypto-qcrypto=n
+CONFIG_PACKAGE_kmod-gl-mifi-mcu=n
+CONFIG_PACKAGE_kmod-mdio-netlink=n
+CONFIG_PACKAGE_kmod-nf-nathelper-extra=n
+CONFIG_PACKAGE_kmod-nf-ipvs-sip=n
+CONFIG_PACKAGE_kmod-nf-nathelper-extra=n
+CONFIG_PACKAGE_kmod-nft-fullcone=n
+CONFIG_PACKAGE_kmod-shortcut-fe=n
+CONFIG_PACKAGE_kmod-shortcut-fe-cm=n
+CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n
+CONFIG_PACKAGE_kmod-ovpn-dco=n
+CONFIG_PACKAGE_spidev-test=n
+CONFIG_PACKAGE_kmod-lib80211=n
+CONFIG_PACKAGE_kmod-carl9170=n
+CONFIG_PACKAGE_kmod-batman-adv=n
+CONFIG_PACKAGE_kmod-rtl8812au-ct=n
+CONFIG_PACKAGE_kmod-rtl8821cu=n
+CONFIG_PACKAGE_kmod-rtl88x2bu=n
+
+
+CONFIG_SECCOMP=n
+
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
+
+

devices/ipq60xx_generic/diy.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+shopt -s extglob
+
+rm -rf package/boot/uboot-envtools package/kernel package/firmware/ath11k* package/qca target/linux/generic target/linux/ipq60xx package/network/config/netifd feeds/kiddin9/fullconenat toolchain
+svn export --force https://github.com/kiddin9/openwrt-ax1800/trunk/package/boot/uboot-envtools package/boot/uboot-envtools
+svn export --force https://github.com/kiddin9/openwrt-ax1800/trunk/package/firmware/ath11k-firmware package/firmware/ath11k-firmware
+svn export --force https://github.com/kiddin9/openwrt-ax1800/trunk/package/qca package/qca
+
+svn co https://github.com/kiddin9/openwrt-ax1800/trunk/target/linux/generic target/linux/generic
+svn co https://github.com/kiddin9/openwrt-ax1800/trunk/target/linux/ipq60xx target/linux/ipq60xx
+svn co https://github.com/kiddin9/openwrt-ax1800/trunk/dl dl
+svn co https://github.com/kiddin9/openwrt-ax1800/trunk/package/kernel package/kernel
+svn co https://github.com/kiddin9/openwrt-ax1800/trunk/package/network/utils/fullconenat feeds/kiddin9/fullconenat
+svn co https://github.com/kiddin9/openwrt-ax1800/trunk/package/network/config/netifd package/network/config/netifd
+svn co https://github.com/kiddin9/openwrt-ax1800/trunk/toolchain toolchain
+rm -rf target/linux/generic/files
+rm -rf package/network/config/netifd/patches
+
+curl -sfL https://raw.githubusercontent.com/kiddin9/openwrt-ax1800/master/include/netfilter.mk -o include/netfilter.mk
+curl -sfL https://raw.githubusercontent.com/kiddin9/openwrt-ax1800/master/include/quilt.mk -o include/quilt.mk
+
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-cpufreq automount/' target/linux/ipq60xx/Makefile
+
+rm -f devices/common/patches/usb.patch
+rm -rf feeds/packages/net/openvswitch feeds/kiddin9/shortcut-fe feeds/packages/net/xtables-addons package/kernel/mt76
+
+echo '
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_AES_ARM64=y
+CONFIG_CRYPTO_AES_ARM64_BS=y
+CONFIG_CRYPTO_AES_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA256_ARM64=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA512_ARM64=y
+CONFIG_CRYPTO_SIMD=y
+CONFIG_REALTEK_PHY=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_MOTORCOMM_PHY=y
+CONFIG_SENSORS_PWM_FAN=y
+CONFIG_ACPI=n
+CONFIG_PNP_DEBUG_MESSAGES=y
+CONFIG_PINCTRL_BAYTRAIL=n
+CONFIG_PINCTRL_CHERRYVIEW=n
+CONFIG_PINCTRL_BROXTON=n
+CONFIG_PINCTRL_SUNRISEPOINT=n
+CONFIG_PINCTRL_QDF2XXX=n
+CONFIG_GPIO_AMDPT=n
+CONFIG_PCC=n
+CONFIG_PMIC_OPREGION=n
+CCONFIG_RYPTO_CRC32_ARM64=n
+' >> ./target/linux/ipq60xx/config-4.4

devices/ipq60xx_generic/diy/include/kernel-4.4

@@ -0,0 +1,2 @@
+LINUX_VERSION-4.4 = .60
+LINUX_KERNEL_HASH-4.4.60 = 10f619f7f9ab9f2776d0e34d37138b1ca14e9a026b91790dbdb1eb6c8d15edc6

devices/ipq60xx_generic/diy/target/linux/ipq60xx/patches-4.4/998-fix_yylloc_error.patch

@@ -0,0 +1,9 @@
+--- a/scripts/dtc/dtc-parser.tab.c_shipped
++++ b/scripts/dtc/dtc-parser.tab.c_shipped
+@@ -1197,5 +1197,5 @@
+ YYSTYPE yylval;
+ /* Location data for the lookahead symbol.  */
+-YYLTYPE yylloc
++extern YYLTYPE yylloc
+ # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+   = { 1, 1, 1, 1 }

devices/ipq60xx_generic/patches/fix.patch

@@ -0,0 +1,119 @@
+--- a/rules.mk
++++ b/rules.mk
+@@ -136,8 +136,12 @@ else
+   TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME)
+ endif
+ 
+-ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),)
+-  iremap = -f$(if $(CONFIG_REPRODUCIBLE_DEBUG_INFO),file,macro)-prefix-map=$(1)=$(2)
++ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
++  ifeq ($(CONFIG_GCC_USE_EMBEDDED_PATH_REMAP),y)
++    iremap = -fmacro-prefix-map=$(1)=$(2)
++  else
++    iremap = -iremap$(1):$(2)
++  endif
+ endif
+ 
+ PACKAGE_DIR:=$(BIN_DIR)/packages
+
+--- a/include/image.mk
++++ b/include/image.mk
+@@ -152,21 +152,6 @@ ifdef CONFIG_TARGET_IMAGES_GZIP
+   endef
+ endif
+ 
+-
+-# Disable noisy checks by default as in upstream
+-DTC_FLAGS += \
+-  -Wno-unit_address_vs_reg \
+-  -Wno-simple_bus_reg \
+-  -Wno-unit_address_format \
+-  -Wno-pci_bridge \
+-  -Wno-pci_device_bus_num \
+-  -Wno-pci_device_reg \
+-  -Wno-avoid_unnecessary_addr_size \
+-  -Wno-alias_paths \
+-  -Wno-graph_child_address \
+-  -Wno-graph_port \
+-  -Wno-unique_unit_address
+-
+ define Image/pad-to
+ 	dd if=$(1) of=$(1).new bs=$(2) conv=sync
+ 	mv $(1).new $(1)
+
+--- a/package/network/utils/iptables/Makefile
++++ b/package/network/utils/iptables/Makefile
+@@ -784,7 +784,6 @@ $(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
+ $(eval $(call BuildPlugin,iptables-mod-hashlimit,$(IPT_HASHLIMIT-m)))
+ $(eval $(call BuildPlugin,iptables-mod-rpfilter,$(IPT_RPFILTER-m)))
+ $(eval $(call BuildPlugin,iptables-mod-led,$(IPT_LED-m)))
+-$(eval $(call BuildPlugin,iptables-mod-socket,$(IPT_SOCKET-m)))
+ $(eval $(call BuildPlugin,iptables-mod-tproxy,$(IPT_TPROXY-m)))
+ $(eval $(call BuildPlugin,iptables-mod-tee,$(IPT_TEE-m)))
+ $(eval $(call BuildPlugin,iptables-mod-u32,$(IPT_U32-m)))
+
+--- a/feeds/kiddin9/firewall/Makefile
++++ b/feeds/kiddin9/firewall/Makefile
+@@ -28,7 +28,7 @@ define Package/firewall
+   SECTION:=net
+   CATEGORY:=Base system
+   TITLE:=OpenWrt C Firewall
+-  DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 +libxtables +kmod-ipt-core +kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +iptables-mod-fullconenat +ip6tables-mod-fullconenat +iptables +ip6tables +kmod-ipt-offload
++  DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 +libxtables +kmod-ipt-core +kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +iptables-mod-fullconenat +iptables +ip6tables +kmod-ipt-offload
+   PROVIDES:=uci-firewall
+ endef
+
+--- a/feeds/kiddin9/automount/Makefile
++++ b/feeds/kiddin9/automount/Makefile
+@@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
+ define Package/automount
+   TITLE:=Mount autoconfig hotplug script.
+   MAINTAINER:=Lean
+-  DEPENDS:=+block-mount +kmod-fs-exfat +kmod-fs-ext4 +kmod-fs-vfat +libblkid \
++  DEPENDS:=+block-mount +kmod-fs-ext4 +kmod-fs-vfat +libblkid \
+ 	+kmod-usb-storage +kmod-usb-storage-extras +!TARGET_ramips:kmod-usb-storage-uas +ntfs3-mount
+ endef
+
+--- a/include/target.mk
++++ b/include/target.mk
+@@ -147,10 +147,17 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
+ endif
+ 
+ GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
++ifeq ($(CONFIG_TARGET_ipq60xx),y)
++GENERIC_BACKPORT_DIR :=
++GENERIC_PATCH_DIR :=
++GENERIC_HACK_DIR :=
++GENERIC_FILES_DIR :=
++else
+ GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+ GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+ GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+ GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
++endif
+ 
+ __config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default
+ __config_list = $(firstword $(wildcard $(call __config_name_list,$(1))))
+
+--- a/package/kernel/mac80211/ath.mk
++++ b/package/kernel/mac80211/ath.mk
+@@ -282,7 +282,7 @@ define KernelPackage/ath11k
+   TITLE:=Atheros 802.11ax wireless cards support
+   URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath11k
+   DEPENDS+= @TARGET_ipq60xx +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT \
+-	+@DRIVER_11AX_SUPPORT +@DRIVER_11W_SUPPORT +kmod-qca-nss-drv
++	+@DRIVER_11AX_SUPPORT +@DRIVER_11W_SUPPORT +kmod-qca-nss-drv +kmod-hwmon-core
+   FILES:= \
+ 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath11k/ath11k.ko
+ endef
+
+--- a/target/linux/ipq60xx/Makefile
++++ b/target/linux/ipq60xx/Makefile
+@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/target.mk
+ DEFAULT_PACKAGES += \
+ 	kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
+ 	kmod-qca-nss-dp kmod-qca-nss-drv kmod-qca-ssdk \
+-	kmod-ath11k-ahb qca-ssdk-shell wpad-openssl \
++	kmod-ath11k-ahb qca-ssdk-shell wpad-basic-wolfssl \
+ 	ath11k-firmware-ipq6018 nss-firmware-ipq6018 \
+ 	kmod-qca-nss-drv-pppoe kmod-qca-nss-ecm uboot-envtools

devices/ipq807x/diy.sh

@@ -13,7 +13,6 @@ svn export --force https://github.com/Boos4721/openwrt/trunk/package/qca package
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/qat package/qat
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/kernel/mac80211 package/kernel/mac80211
 
-svn co https://github.com/Boos4721/openwrt/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15
 svn co https://github.com/Boos4721/openwrt/trunk/target/linux/generic/pending-5.15 target/linux/generic/pending-5.15
 rm -rf target/linux/ipq807x/!(patches-5.15)
 svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x target/linux/ipq807x