Add support for uz801 (v3.2) device + fallback to Linux 5.15.0 as wifi does not work correctly on 6.12.1

meta-u4go-msm8916/conf/machine/msm8916.inc

@@ -2,16 +2,16 @@ SOC_FAMILY ??= ""
 include conf/machine/include/soc-family.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-msm8916"
-PREFERRED_VERSION_linux-msm8916 = "6.12.1"
+PREFERRED_VERSION_linux-msm8916 = "5.15.0"
+# "6.12.1"
 
 KERNEL_IMAGETYPE ?= "Image.gz"
 
-# IMAGE_CLASSES += "sdcard_image-sunxi"
 IMAGE_FSTYPES += "ext4 tar.gz wic.bz2 wic.bmap"
 
 
 SERIAL_CONSOLE ?= "115200 ttyMSM0"
-MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat wifi"
+MACHINE_FEATURES ?= "apm keyboard rtc serial screen usbgadget usbhost vfat wifi"
 
 DEFAULTTUNE ?= "cortexa53-crypto"
 require conf/machine/include/arm/armv8a/tune-cortexa53.inc

meta-u4go-msm8916/conf/machine/uz801.conf

@@ -0,0 +1,3 @@
+require conf/machine/msm8916.inc
+
+MACHINE_EXTRA_RRECOMMENDS += " uz801-firmware "

meta-u4go-msm8916/recipes-core/images/core-image-base.bbappend

@@ -1,4 +1,8 @@
 # IMAGE_BOOT_FILES:append:ufi003 = " ${KERNEL_DEVICETREE} "
 IMAGE_INSTALL:append:ufi003 = " \
     ufi003-firmware \
+    "
+
+IMAGE_INSTALL:append:uz801 = " \
+    uz801-firmware \
     "

meta-u4go-msm8916/recipes-kernel/linux/files/defconfig

@@ -981,15 +981,15 @@ CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
 # CONFIG_NF_CONNTRACK_AMANDA is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_SNMP is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PPTP=m
 # CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_NF_CONNTRACK_TFTP is not set
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CT_NETLINK is not set
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_REDIRECT=y

meta-u4go-msm8916/recipes-kernel/linux/linux-msm8916_5.15.0.bb

@@ -7,7 +7,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 # SRCREV = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "(ufi003)"
+COMPATIBLE_MACHINE = "(ufi003|uz801)"
 
 LINUX_msm8916_tag ?= "v5.15-msm8916"
 
@@ -15,7 +15,9 @@ SRC_URI = " \
     git://github.com/OpenStick/linux.git;branch=master;tag=${LINUX_msm8916_tag};protocol=https \
     file://defconfig \
     file://001-patch-add-ufi003x-dts.patch \
+    file://002-patch-add-uz801-dts.patch \
     "
 KERNEL_DEVICETREE:ufi003 += " allwinner/ufi003x.dtb "
+KERNEL_DEVICETREE:uz801 += " allwinner/uz801.dtb "
 
 require linux.inc

meta-u4go-msm8916/recipes-kernel/linux/linux-msm8916_6.12.1.bb

@@ -7,7 +7,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 # SRCREV = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "(ufi003)"
+COMPATIBLE_MACHINE = "(ufi003|uz801)"
 
 LINUX_msm8916_tag ?= "v6.12.1-msm8916"
 
@@ -15,7 +15,9 @@ SRC_URI = " \
     git://github.com/msm8916-mainline/linux.git;branch=msm8916/6.12.1;tag=${LINUX_msm8916_tag};protocol=https \
     file://defconfig \
     file://001-patch-add-ufi003x-dts.patch \
+    file://002-patch-add-uz801-dts.patch \
     "
 KERNEL_DEVICETREE:ufi003 += " allwinner/ufi003x.dtb "
+KERNEL_DEVICETREE:uz801 += " allwinner/uz801.dtb "
 
 require linux.inc