Fix typos, refactor SRC_URIs introduce new SOC_FAMILY

conf/machine/include/sun50i-h616.inc

@@ -0,0 +1,9 @@
+require conf/machine/include/sunxi64.inc
+
+DEFAULTTUNE ?= "cortexa53-crypto"
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
+
+MACHINEOVERRIDES =. "sun50i:"
+
+SOC_FAMILY = "sun50i-h616"
+

conf/machine/orange-pi-zero2.conf

@@ -2,18 +2,15 @@
 #@NAME: orange-pi-zero-2
 #@DESCRIPTION: Machine configuration for the orange-pi-zero-2, based on Allwinner H616 CPU
 
-require conf/machine/include/sun50i.inc
+require conf/machine/include/sun50i-h616.inc
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
 
 KERNEL_DEVICETREE = "allwinner/sun50i-h616-orangepi-zero2.dtb"
 UBOOT_MACHINE = "orangepi_zero2_defconfig"
 
-UBOOT_BINARY = "u-boot-nodtb.bin"
 SPL_BINARY = "u-boot-sunxi-with-spl.bin"
 
-MACHINEOVERRIDES:append = "sun50i:sun50i-h616:"
-
 # as for now neither graphics nor audio is supported
 MACHINE_FEATURES:remove = "alsa x11"
 MACHINE_FEATURES:append = "bluetooth wifi"
+
+MACHINE_EXTRA_RRECOMMENDS = "uwe5622-firmware"

recipes-kernel/linux/linux-h616.bb

@@ -1,20 +0,0 @@
-SECTION = "kernel"
-LICENSE = "GPLv2"
-
-inherit kernel
-
-DESCRIPTION = "Linux kernel for Allwinner H616 processor"
-
-COMPATIBLE_MACHINE = "(sun50i-h616)"
-
-SRCREV = "c465e81f8859832ee06c97d1b8f70dbfdced1c23"
-
-SRC_URI += "git://github.com/apritzel/linux.git;branch=h616-v13;protocol=https \
-        "
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-S = "${WORKDIR}/git"
-
-KMACHINE ?= "${MACHINE}"
-KCONFIG_MODE ?= "alldefconfig"
-

recipes-kernel/linux/linux-mainline_5.15.35.bb

@@ -6,15 +6,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 SRC_URI[sha256sum] = "0a1a5ae2f30eb2b38215e59077f045aabd7f4e2857a881482f02ea48186105d8"
 
-SRC_URI:append:orange-pi-zero2sun50i = " file://defconfig"
-SRC_URI:append:orange-pi-zero2sun50i = " file://0001-dts-add-h616-and-orangepizero2.patch"
-SRC_URI:append:orange-pi-zero2sun50i = " file://0002-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch"
-SRC_URI:append:orange-pi-zero2sun50i = " file://0003-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch"
-SRC_URI:append:orange-pi-zero2sun50i = " file://0004-dts-add-sunxi-info-device-tree-node.patch"
-SRC_URI:append:orange-pi-zero2sun50i = " file://0005-dts-add-addr_mgt-device-tree-node.patch"
 
-SRC_URI:append:orange-pi-zero2sun50i = " file://0006-drv-modem-power-Power-manager-for-modems.patch"
+# # orangepi-zero-2 support added only for 5.15 kernel so add it to this recipe not to inc file
-SRC_URI:append:orange-pi-zero2sun50i = " file://0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch"
+SRC_URI:append:orange-pi-zero2  = " \
-SRC_URI:append:orange-pi-zero2sun50i = " file://0008-drv-wireless-add-uwe5622-driver.patch"
+        file://defconfig \
-SRC_URI:append:orange-pi-zero2sun50i = " file://0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch"
+        file://0001-dts-add-h616-and-orangepizero2.patch \
-SRC_URI:append:orange-pi-zero2sun50i = " file://0010-drv-fix-incldue-path-for-unisocwcn.patch"
+        file://0002-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch \
+        file://0003-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch \
+        file://0004-dts-add-sunxi-info-device-tree-node.patch \
+        file://0005-dts-add-addr_mgt-device-tree-node.patch \
+        file://0006-drv-modem-power-Power-manager-for-modems.patch \
+        file://0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch \
+        file://0008-drv-wireless-add-uwe5622-driver.patch \
+        file://0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch \
+        file://0010-drv-fix-incldue-path-for-unisocwcn.patch \
+"

recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb

@@ -6,8 +6,10 @@ S = "${WORKDIR}"
 
 COMPATIBLE_MACHINE = "orange-pi-zero2"
 
-SRC_URI += "file://wcnmodem.bin"
+SRC_URI:append = " \
-SRC_URI += "file://wifi_2355b001_1ant.ini"
+        file://wcnmodem.bin \
+        file://wifi_2355b001_1ant.ini \
+"
 
 do_install() {
     install -d ${D}${base_libdir}/firmware