From a1e217f10f4c05545abbf023dc5f19054e692f97 Mon Sep 17 00:00:00 2001 From: pbiel Date: Sat, 11 Feb 2023 11:38:44 +0100 Subject: [PATCH] Fix typos, refactor SRC_URIs introduce new SOC_FAMILY --- conf/machine/include/sun50i-h616.inc | 9 +++++++ conf/machine/orange-pi-zero2.conf | 9 +++---- recipes-kernel/linux/linux-h616.bb | 20 -------------- .../0001-dts-add-h616-and-orangepizero2.patch | 0 ...d-dump_reg-and-sunxi-sysinfo-drivers.patch | 0 ..._get_soc_chipid-and-sunxi_get_serial.patch | 0 ...-dts-add-sunxi-info-device-tree-node.patch | 0 ...05-dts-add-addr_mgt-device-tree-node.patch | 0 ...modem-power-Power-manager-for-modems.patch | 0 ...river-used-to-fix-uwe5622-bluetooth-.patch | 0 ...0008-drv-wireless-add-uwe5622-driver.patch | 0 ...622-bluetooth-fix-firmware-init-fail.patch | 0 ...0-drv-fix-incldue-path-for-unisocwcn.patch | 0 .../defconfig | 0 .../linux/linux-mainline_5.15.35.bb | 25 ++++++++++-------- .../files/wcnmodem.bin | Bin .../files/wifi_2355b001_1ant.ini | 0 .../uwe5622-firmware.bb | 6 +++-- 18 files changed, 30 insertions(+), 39 deletions(-) create mode 100644 conf/machine/include/sun50i-h616.inc delete mode 100644 recipes-kernel/linux/linux-h616.bb rename recipes-kernel/linux/linux-mainline-5.15.35/{orange-pi-zero2sun50i => orange-pi-zero2}/0001-dts-add-h616-and-orangepizero2.patch (100%) rename recipes-kernel/linux/linux-mainline-5.15.35/{orange-pi-zero2sun50i => orange-pi-zero2}/0002-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch (100%) rename recipes-kernel/linux/linux-mainline-5.15.35/{orange-pi-zero2sun50i => orange-pi-zero2}/0003-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch (100%) rename recipes-kernel/linux/linux-mainline-5.15.35/{orange-pi-zero2sun50i => orange-pi-zero2}/0004-dts-add-sunxi-info-device-tree-node.patch (100%) rename recipes-kernel/linux/linux-mainline-5.15.35/{orange-pi-zero2sun50i => orange-pi-zero2}/0005-dts-add-addr_mgt-device-tree-node.patch (100%) rename recipes-kernel/linux/linux-mainline-5.15.35/{orange-pi-zero2sun50i => orange-pi-zero2}/0006-drv-modem-power-Power-manager-for-modems.patch (100%) rename recipes-kernel/linux/linux-mainline-5.15.35/{orange-pi-zero2sun50i => orange-pi-zero2}/0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch (100%) rename recipes-kernel/linux/linux-mainline-5.15.35/{orange-pi-zero2sun50i => orange-pi-zero2}/0008-drv-wireless-add-uwe5622-driver.patch (100%) rename recipes-kernel/linux/linux-mainline-5.15.35/{orange-pi-zero2sun50i => orange-pi-zero2}/0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch (100%) rename recipes-kernel/linux/linux-mainline-5.15.35/{orange-pi-zero2sun50i => orange-pi-zero2}/0010-drv-fix-incldue-path-for-unisocwcn.patch (100%) rename recipes-kernel/linux/linux-mainline-5.15.35/{orange-pi-zero2sun50i => orange-pi-zero2}/defconfig (100%) rename recipes-kernel/{uwe5622-firwmare => uwe5622-firmware}/files/wcnmodem.bin (100%) rename recipes-kernel/{uwe5622-firwmare => uwe5622-firmware}/files/wifi_2355b001_1ant.ini (100%) rename recipes-kernel/{uwe5622-firwmare => uwe5622-firmware}/uwe5622-firmware.bb (84%) diff --git a/conf/machine/include/sun50i-h616.inc b/conf/machine/include/sun50i-h616.inc new file mode 100644 index 0000000..0e0214b --- /dev/null +++ b/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" + diff --git a/conf/machine/orange-pi-zero2.conf b/conf/machine/orange-pi-zero2.conf index 02411a1..2d258e9 100644 --- a/conf/machine/orange-pi-zero2.conf +++ b/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 - -PREFERRED_PROVIDER_virtual/kernel = "linux-mainline" +require conf/machine/include/sun50i-h616.inc 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" \ No newline at end of file diff --git a/recipes-kernel/linux/linux-h616.bb b/recipes-kernel/linux/linux-h616.bb deleted file mode 100644 index 09fc563..0000000 --- a/recipes-kernel/linux/linux-h616.bb +++ /dev/null @@ -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" - diff --git a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0001-dts-add-h616-and-orangepizero2.patch b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0001-dts-add-h616-and-orangepizero2.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0001-dts-add-h616-and-orangepizero2.patch rename to recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0001-dts-add-h616-and-orangepizero2.patch diff --git a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0002-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0002-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0002-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch rename to recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0002-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch diff --git a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0003-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0003-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0003-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch rename to recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0003-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch diff --git a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0004-dts-add-sunxi-info-device-tree-node.patch b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0004-dts-add-sunxi-info-device-tree-node.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0004-dts-add-sunxi-info-device-tree-node.patch rename to recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0004-dts-add-sunxi-info-device-tree-node.patch diff --git a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0005-dts-add-addr_mgt-device-tree-node.patch b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0005-dts-add-addr_mgt-device-tree-node.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0005-dts-add-addr_mgt-device-tree-node.patch rename to recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0005-dts-add-addr_mgt-device-tree-node.patch diff --git a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0006-drv-modem-power-Power-manager-for-modems.patch b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0006-drv-modem-power-Power-manager-for-modems.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0006-drv-modem-power-Power-manager-for-modems.patch rename to recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0006-drv-modem-power-Power-manager-for-modems.patch diff --git a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch rename to recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch diff --git a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0008-drv-wireless-add-uwe5622-driver.patch b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0008-drv-wireless-add-uwe5622-driver.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0008-drv-wireless-add-uwe5622-driver.patch rename to recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0008-drv-wireless-add-uwe5622-driver.patch diff --git a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch rename to recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch diff --git a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0010-drv-fix-incldue-path-for-unisocwcn.patch b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0010-drv-fix-incldue-path-for-unisocwcn.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/0010-drv-fix-incldue-path-for-unisocwcn.patch rename to recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0010-drv-fix-incldue-path-for-unisocwcn.patch diff --git a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/defconfig b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/defconfig similarity index 100% rename from recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2sun50i/defconfig rename to recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/defconfig diff --git a/recipes-kernel/linux/linux-mainline_5.15.35.bb b/recipes-kernel/linux/linux-mainline_5.15.35.bb index c5a7004..9e586c0 100644 --- a/recipes-kernel/linux/linux-mainline_5.15.35.bb +++ b/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" -SRC_URI:append:orange-pi-zero2sun50i = " file://0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch" -SRC_URI:append:orange-pi-zero2sun50i = " file://0008-drv-wireless-add-uwe5622-driver.patch" -SRC_URI:append:orange-pi-zero2sun50i = " file://0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch" -SRC_URI:append:orange-pi-zero2sun50i = " file://0010-drv-fix-incldue-path-for-unisocwcn.patch" \ No newline at end of file +# # 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-zero2 = " \ + file://defconfig \ + file://0001-dts-add-h616-and-orangepizero2.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 \ +" diff --git a/recipes-kernel/uwe5622-firwmare/files/wcnmodem.bin b/recipes-kernel/uwe5622-firmware/files/wcnmodem.bin similarity index 100% rename from recipes-kernel/uwe5622-firwmare/files/wcnmodem.bin rename to recipes-kernel/uwe5622-firmware/files/wcnmodem.bin diff --git a/recipes-kernel/uwe5622-firwmare/files/wifi_2355b001_1ant.ini b/recipes-kernel/uwe5622-firmware/files/wifi_2355b001_1ant.ini similarity index 100% rename from recipes-kernel/uwe5622-firwmare/files/wifi_2355b001_1ant.ini rename to recipes-kernel/uwe5622-firmware/files/wifi_2355b001_1ant.ini diff --git a/recipes-kernel/uwe5622-firwmare/uwe5622-firmware.bb b/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb similarity index 84% rename from recipes-kernel/uwe5622-firwmare/uwe5622-firmware.bb rename to recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb index feed6a6..a818ac3 100644 --- a/recipes-kernel/uwe5622-firwmare/uwe5622-firmware.bb +++ b/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 += "file://wifi_2355b001_1ant.ini" +SRC_URI:append = " \ + file://wcnmodem.bin \ + file://wifi_2355b001_1ant.ini \ +" do_install() { install -d ${D}${base_libdir}/firmware