linux-sunxi: disable glamor build if Mali is used

Unless somebody writes libgbm replacement for binary Mali driver (sort of converter for gbm-UMB) there is no glamor for us. Closes #227
Fix soname in Mali.so to make auto-RDEPENDS work
2025-07-16 13:59:46 +02:00 · 2019-09-07 21:53:16 +02:00 · 2019-09-07 21:53:16 +02:00 · 2019-06-25 10:24:09 +02:00
56 changed files with 216 additions and 387 deletions
--- a/README.md
+++ b/README.md
@ -19,36 +19,24 @@ Maintainers:
 Kernel / U-Boot Version
 ===========
 Most Allwinner devices and hardware are supported in mainline kernel and U-Boot, so this layer builds mainline by default.
-
-Legacy sunxi Kernel / U-Boot
-----------
-
 There is a custom U-Boot and Kernel version for sunxi devices which includes some special drivers not mainlined.
-These versions are rather old (3.4 for kernel and 2014.04 for U-Boot), but may support more functions and devices than current mainline.
+These versions are rather old (3.4 for kernel and 2014.04 for U-Boot), but may support more functions and devices than current mainline

 If you want to switch back to sunxi versions for some reasons (no device tree available, unsupported hardware), either:
 - change the file conf/machine/include/sunxi.inc to include the following block
 - edit your conf/local.conf to add the following block

-		PREFERRED_PROVIDER_u-boot="u-boot-sunxi"
-		PREFERRED_PROVIDER_virtual/bootloader="u-boot-sunxi"
-		PREFERRED_PROVIDER_virtual/kernel="linux-sunxi"
-		KERNEL_DEVICETREE = ""
+	PREFERRED_PROVIDER_u-boot="u-boot-sunxi"
+	PREFERRED_PROVIDER_virtual/bootloader="u-boot-sunxi"
+	PREFERRED_PROVIDER_virtual/kernel="linux-sunxi"

 If you already have built the mainline versions it might be necessary to reset the build directories with:

 	bitbake -c clean virtual/kernel virtual/bootloader

-Mainline Kernel / U-Boot
-----------
-
-For mainline kernel we have now support for latest LTS and stable.
+For mainline kernel we have now support for latest LTS, stable and bleeding edge (latest possible rc).
 By default we use latest LTS. If you would like to change version please update ```PREFERRED_VERSION_linux-mainline``` in:
-* [conf/machine/include/sunxi.inc](https://github.com/linux-sunxi/meta-sunxi/blob/fa0846c0eb23e3424b89acb4d5a327e921f73497/conf/machine/include/sunxi.inc#L16)
-
-When using mainline kernel ≥ 5.2 it is now possible to use the mainline graphics drivers *lima* and *panfrost*, instead of the *mali* driver provided by ARM. To enable open source mainline graphics support add the following line in your `local.conf`:
-
-    MACHINEOVERRIDES .= ":use-mailine-graphics"
+* [conf/machine/include/sunxi.inc](https://github.com/linux-sunxi/meta-sunxi/blob/4921234ed77f9df77c65c88637ce50468f65bde7/conf/machine/include/sunxi.inc#L16)

 Performance
 ===========
--- a/classes/sdcard_image-sunxi.bbclass
+++ b/classes/sdcard_image-sunxi.bbclass
@ -17,7 +17,7 @@ inherit image_types
 IMAGE_TYPEDEP_sunxi-sdimg = "${SDIMG_ROOTFS_TYPE}"

 # Boot partition volume id
-BOOTDD_VOLUME_ID ?= "boot"
+BOOTDD_VOLUME_ID ?= "${MACHINE}"

 # Boot partition size [in KiB]
 BOOT_SPACE ?= "40960"
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -14,4 +14,4 @@ LAYERVERSION_meta-sunxi = "1"

 LAYERDEPENDS_meta-sunxi = "core openembedded-layer"

-LAYERSERIES_COMPAT_meta-sunxi = "zeus dunfell"
+LAYERSERIES_COMPAT_meta-sunxi = "morty pyro rocko sumo thud warrior"
--- a/conf/machine/bananapi-m2m.conf
+++ b/conf/machine/bananapi-m2m.conf
@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: bananapi-m2m
-#@DESCRIPTION: Machine configuration for the Banana Pi M2M, base on Allwinner H8 CPU
-
-require conf/machine/include/sun8i.inc
-
-KERNEL_DEVICETREE = "sun8i-r16-bananapi-m2m.dtb"
-UBOOT_MACHINE = "Bananapi_m2m_defconfig"
-
--- a/conf/machine/bananapi-m2plus.conf
+++ b/conf/machine/bananapi-m2plus.conf
@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: bananapi-m2plus
-#@DESCRIPTION: Machine configuration for the Banana Pi M2+, base on Allwinner H3 CPU
-
-require conf/machine/include/sun8i.inc
-
-KERNEL_DEVICETREE = "sun8i-h3-bananapi-m2-plus.dtb"
-UBOOT_MACHINE = "bananapi_m2_plus_h3_defconfig"
-
--- a/conf/machine/bananapi-m64.conf
+++ b/conf/machine/bananapi-m64.conf
@ -1,8 +0,0 @@
-#@TYPE: Machine
-#@NAME: pine64-plus
-#@DESCRIPTION: Machine configuration for the pine64-plus, based on Allwinner A64 CPU
-
-require conf/machine/include/sun50i.inc
-
-KERNEL_DEVICETREE = "allwinner/sun50i-a64-bananapi-m64.dtb"
-UBOOT_MACHINE = "bananapi_m64_defconfig"
--- a/conf/machine/include/hardware/ap6212a.inc
+++ b/conf/machine/include/hardware/ap6212a.inc
@ -1,5 +0,0 @@
-# Include for boards with AMPAK 6212A Wifi / Bluetooth module
-# https://linux-sunxi.org/Wifi#Ampak
-
-MACHINE_EXTRA_RRECOMMENDS_append = " kernel-module-brcmfmac"
-MACHINE_EXTRA_RDEPENDS_append = " linux-firmware-bcm43430"
--- a/conf/machine/include/sun50i.inc
+++ b/conf/machine/include/sun50i.inc
@ -1,6 +1,4 @@
 require conf/machine/include/sunxi64.inc
-
-DEFAULTTUNE ?= "cortexa53-crypto"
-require conf/machine/include/tune-cortexa53.inc
+require conf/machine/include/arm/arch-armv8.inc

 SOC_FAMILY = "sun50i"
--- a/conf/machine/include/sunxi-mali-driver.inc
+++ b/conf/machine/include/sunxi-mali-driver.inc
@ -1,15 +0,0 @@
-PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "sunxi-mali"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "sunxi-mali"
-PREFERRED_PROVIDER_virtual/egl ?= "sunxi-mali"
-
-PACKAGECONFIG_remove_pn-xserver-xorg = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glamor', '', d)}"
-
-XSERVER += "sunxi-mali \
-            sunxi-mali-dev"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "\
- kernel-module-mali \
- kernel-module-mali-drm \
-  "
--- a/conf/machine/include/sunxi-mali.inc
+++ b/conf/machine/include/sunxi-mali.inc
@ -1,5 +1,15 @@
-# The "sunxi-mailine-graphics-drivers.inc" doesn't exist, but it can be created
-# in the future if needed.  Using include directive ensures build doesn't fail
-# if .inc file doesn't exist:
-# https://www.yoctoproject.org/pipermail/yocto/2019-August/046484.html
-include ${@'sunxi-mali-driver.inc' if 'use-mailine-graphics' not in d.getVar("MACHINEOVERRIDES").split(":") else 'sunxi-mailine-graphics-drivers.inc' }
+PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "sunxi-mali"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "sunxi-mali"
+PREFERRED_PROVIDER_virtual/egl ?= "sunxi-mali"
+
+PACKAGECONFIG_remove_pn-xserver-xorg = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glamor', '', d)}"
+
+XSERVER += "sunxi-mali \
+            sunxi-mali-dev"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "\
+ kernel-module-mali \
+ kernel-module-mali-drm \
+  "
--- a/conf/machine/include/sunxi.inc
+++ b/conf/machine/include/sunxi.inc
@ -13,7 +13,7 @@ XSERVER = "xserver-xorg \
           xf86-input-keyboard"

 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
-PREFERRED_VERSION_linux-mainline ?= "5.4.%"
+PREFERRED_VERSION_linux-mainline ?= "4.19%"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"

--- a/conf/machine/nanopi-m1-plus.conf
+++ b/conf/machine/nanopi-m1-plus.conf
@ -4,6 +4,8 @@

 require conf/machine/include/sun8i.inc

+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-nanopi-m1-plus.dtb"
 UBOOT_MACHINE = "nanopi_m1_plus_defconfig"

--- a/conf/machine/nanopi-neo-air.conf
+++ b/conf/machine/nanopi-neo-air.conf
@ -5,5 +5,7 @@

 require conf/machine/include/sun8i.inc

+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo-air.dtb"
 UBOOT_MACHINE = "nanopi_neo_air_defconfig"
--- a/conf/machine/nanopi-neo-plus2.conf
+++ b/conf/machine/nanopi-neo-plus2.conf
@ -4,7 +4,8 @@
 # on the Allwinner H5 SoC.

 require conf/machine/include/sun50i.inc
-require conf/machine/include/hardware/ap6212a.inc
+
+PREFERRED_VERSION_u-boot = "v2018.09%"

 KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo-plus2.dtb"
 UBOOT_MACHINE = "nanopi_neo_plus2_defconfig"
--- a/conf/machine/nanopi-neo.conf
+++ b/conf/machine/nanopi-neo.conf
@ -4,6 +4,8 @@

 require conf/machine/include/sun8i.inc

+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
 UBOOT_MACHINE = "nanopi_neo_defconfig"

--- a/conf/machine/nanopi-neo2.conf
+++ b/conf/machine/nanopi-neo2.conf
@ -5,5 +5,7 @@

 require conf/machine/include/sun50i.inc

+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo2.dtb"
 UBOOT_MACHINE = "nanopi_neo2_defconfig"
--- a/conf/machine/olinuxino-a64.conf
+++ b/conf/machine/olinuxino-a64.conf
@ -7,7 +7,5 @@ require conf/machine/include/sun50i.inc

 PREFFERED_VERSION_u-boot = "v2018.09%"

-MACHINE_EXTRA_RRECOMMENDS += " linux-firmware-rtl8723"
-
 KERNEL_DEVICETREE = "allwinner/sun50i-a64-olinuxino.dtb"
 UBOOT_MACHINE = "a64-olinuxino_defconfig"
--- a/conf/machine/orange-pi-one.conf
+++ b/conf/machine/orange-pi-one.conf
@ -4,6 +4,8 @@

 require conf/machine/include/sun8i.inc

+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
 UBOOT_MACHINE = "orangepi_one_defconfig"

--- a/conf/machine/orange-pi-pc-plus.conf
+++ b/conf/machine/orange-pi-pc-plus.conf
@ -4,6 +4,8 @@

 require conf/machine/include/sun8i.inc

+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc-plus.dtb"
 UBOOT_MACHINE = "orangepi_pc_plus_defconfig"

--- a/conf/machine/orange-pi-pc.conf
+++ b/conf/machine/orange-pi-pc.conf
@ -4,6 +4,8 @@

 require conf/machine/include/sun8i.inc

+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb"
 UBOOT_MACHINE = "orangepi_pc_defconfig"

--- a/conf/machine/orange-pi-plus2e.conf
+++ b/conf/machine/orange-pi-plus2e.conf
@ -1,8 +0,0 @@
-#@TYPE: Machine
-#@NAME: orange-pi-plus2e
-#@DESCRIPTION: Machine configuration for the orange-pi-plus2e, base on allwinner H3 CPU
-
-require conf/machine/include/sun8i.inc
-
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-plus2e.dtb"
-UBOOT_MACHINE = "orangepi_plus2e_defconfig"
--- a/conf/machine/orange-pi-zero-plus2-h3.conf
+++ b/conf/machine/orange-pi-zero-plus2-h3.conf
@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: orange-pi-zero-plus2-h3
-#@DESCRIPTION: Machine configuration for the orange-pi-zero-plus2, based on Allwinner H3 CPU
-
-require conf/machine/include/sun8i.inc
-require conf/machine/include/hardware/ap6212a.inc
-
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-zero-plus2.dtb"
-UBOOT_MACHINE = "orangepi_zero_plus2_h3_defconfig"
--- a/conf/machine/orange-pi-zero-plus2.conf
+++ b/conf/machine/orange-pi-zero-plus2.conf
@ -2,8 +2,10 @@
 #@NAME: orange-pi-zero-plus2
 #@DESCRIPTION: Machine configuration for the orange-pi-zero-plus2, base on Allwinner H5 CPU

+
 require conf/machine/include/sun50i.inc
-require conf/machine/include/hardware/ap6212a.inc
+
+PREFERRED_VERSION_u-boot = "v2018.09%"

 KERNEL_DEVICETREE = "allwinner/sun50i-h5-orangepi-zero-plus2.dtb"
 UBOOT_MACHINE = "orangepi_zero_plus2_defconfig"
--- a/conf/machine/orange-pi-zero.conf
+++ b/conf/machine/orange-pi-zero.conf
@ -4,6 +4,8 @@

 require conf/machine/include/sun8i.inc

+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb"
 UBOOT_MACHINE = "orangepi_zero_defconfig"

--- a/conf/machine/pcduino.conf
+++ b/conf/machine/pcduino.conf
@ -4,6 +4,8 @@

 require conf/machine/include/sun4i.inc

+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino_defconfig"
 SUNXI_FEX_FILE = "sys_config/a10/pcduino.fex"
--- a/conf/machine/pine64-plus.conf
+++ b/conf/machine/pine64-plus.conf
@ -5,5 +5,7 @@

 require conf/machine/include/sun50i.inc

+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "allwinner/sun50i-a64-pine64-plus.dtb"
 UBOOT_MACHINE = "pine64_plus_defconfig"
--- a/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
+++ b/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
@ -1,21 +1,20 @@
-From 6adb2ebdc4022c24497e9ee4dccab41d18e3105d Mon Sep 17 00:00:00 2001
+From f4a77da23b3890b53efab6a927cbe99b76ef3b26 Mon Sep 17 00:00:00 2001
 From: Florin Sarbu <florin@resin.io>
 Date: Wed, 12 Sep 2018 14:22:49 +0200
 Subject: [PATCH] nanopi_neo_air_defconfig: Enable eMMC support

 Upstream-status: Pending
 Signed-off-by: Florin Sarbu <florin@resin.io>
-
 ---
 configs/nanopi_neo_air_defconfig | 1 +
 1 file changed, 1 insertion(+)

 diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
-index 5ad90ddd16..8b7a4eb45d 100644
+index 8c362fa885..c7929ff015 100644
 --- a/configs/nanopi_neo_air_defconfig
 +++ b/configs/nanopi_neo_air_defconfig
-@@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
+@@ -15,3 +15,4 @@ CONFIG_CONSOLE_MUX=y
+ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
 CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_OHCI_HCD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2
--- a/recipes-bsp/u-boot/files/0002-Revert-sunxi-psci-avoid-error-address-of-packed-memb.patch
+++ b/recipes-bsp/u-boot/files/0002-Revert-sunxi-psci-avoid-error-address-of-packed-memb.patch
@ -1,67 +0,0 @@
-From bb6f500c10cc8f5f31245626899e0732b7b287c5 Mon Sep 17 00:00:00 2001
-From: Marek Belisko <marek.belisko@open-nandra.com>
-Date: Wed, 19 Aug 2020 13:39:49 +0200
-Subject: [PATCH] Revert "sunxi: psci: avoid error address-of-packed-member"
-
-This reverts commit 9bd34a69a453d409792e08c00953ce8862145e65.
---
- arch/arm/cpu/armv7/sunxi/psci.c | 16 +++++-----------
- 1 file changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
-index 5b68900..2c5d99e 100644
--- a/arch/arm/cpu/armv7/sunxi/psci.c
-+++ b/arch/arm/cpu/armv7/sunxi/psci.c
-@@ -75,7 +75,7 @@ static void __secure __mdelay(u32 ms)
- 	isb();
- }
- 
-static void __secure clamp_release(void __maybe_unused *clamp)
-+static void __secure clamp_release(u32 __maybe_unused *clamp)
- {
- #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
- 	defined(CONFIG_MACH_SUN8I_H3) || \
-@@ -90,7 +90,7 @@ static void __secure clamp_release(void __maybe_unused *clamp)
- #endif
- }
- 
-static void __secure clamp_set(void __maybe_unused *clamp)
-+static void __secure clamp_set(u32 __maybe_unused *clamp)
- {
- #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
- 	defined(CONFIG_MACH_SUN8I_H3) || \
-@@ -99,28 +99,22 @@ static void __secure clamp_set(void __maybe_unused *clamp)
- #endif
- }
- 
-static void __secure sunxi_power_switch(void *clamp, void *pwroff_ptr, bool on,
-+static void __secure sunxi_power_switch(u32 *clamp, u32 *pwroff, bool on,
- 					int cpu)
- {
-	u32 pwroff;
-
-	memcpy(&pwroff, pwroff_ptr, sizeof(u32));
-
- 	if (on) {
- 		/* Release power clamp */
- 		clamp_release(clamp);
- 
- 		/* Clear power gating */
-		clrbits_le32(&pwroff, BIT(cpu));
-+		clrbits_le32(pwroff, BIT(cpu));
- 	} else {
- 		/* Set power gating */
-		setbits_le32(&pwroff, BIT(cpu));
-+		setbits_le32(pwroff, BIT(cpu));
- 
- 		/* Activate power clamp */
- 		clamp_set(clamp);
- 	}
-
-	memcpy(pwroff_ptr, &pwroff, sizeof(u32));
- }
- 
- #ifdef CONFIG_MACH_SUN8I_R40
-- 
-2.7.4
-
--- a/recipes-bsp/u-boot/u-boot-sunxi.bb
+++ b/recipes-bsp/u-boot/u-boot-sunxi.bb
@ -20,9 +20,8 @@ UBOOT_MACHINE_meleg = "Mele_A1000G_config"

 SRC_URI = " \
 	git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi \
-	file://0001-gcc5-fixes.patch \
-	file://0002-gcc6-fixes.patch \
-	file://0003-No-gcc-version-specific-includes.patch \
+	file://0002-gcc5-fixes.patch \
+	file://0003-gcc6-fixes.patch \
 	"

 PE = "1"
@ -36,7 +35,3 @@ S = "${WORKDIR}/git"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 SPL_BINARY="u-boot-sunxi-with-spl.bin"
-
-do_configure () {
-    oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE}
-}
--- a/recipes-bsp/u-boot/u-boot-sunxi/0002-gcc5-fixes.patch
+++ b/recipes-bsp/u-boot/u-boot-sunxi/0002-gcc5-fixes.patch
--- a/recipes-bsp/u-boot/u-boot-sunxi/0003-No-gcc-version-specific-includes.patch
+++ b/recipes-bsp/u-boot/u-boot-sunxi/0003-No-gcc-version-specific-includes.patch
@ -1,24 +0,0 @@
-From bc4aa5814cbedbfaa1c79dfe7ea2571fee7f2d51 Mon Sep 17 00:00:00 2001
-From: Andrey Lebedev <andrey@lebedev.lt>
-Date: Wed, 22 Jan 2020 20:00:11 +0200
-Subject: [PATCH] No gcc version-specific includes
-
-In order to support gcc-5 and above. Fixes compilation errors like
-
-linux/compiler-gcc9.h: No such file or directory
---
- include/linux/compiler-gcc.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
-index 9896e547b9..5f0bd65f3a 100644
--- a/include/linux/compiler-gcc.h
-+++ b/include/linux/compiler-gcc.h
-@@ -90,4 +90,3 @@
- #define __gcc_header(x) #x
- #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
- #define gcc_header(x) _gcc_header(x)
-#include gcc_header(__GNUC__)
-- 
-2.20.1
-
--- a/recipes-bsp/u-boot/u-boot-sunxi/0003-gcc6-fixes.patch
+++ b/recipes-bsp/u-boot/u-boot-sunxi/0003-gcc6-fixes.patch
--- a/recipes-bsp/u-boot/u-boot_2018.09.bb
+++ b/recipes-bsp/u-boot/u-boot_2018.09.bb
@ -1,8 +1,13 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+DESCRIPTION="Upstream's U-boot configured for sunxi devices"
+
+require recipes-bsp/u-boot/u-boot.inc

 DEPENDS += " bc-native dtc-native swig-native python3-native flex-native bison-native "
 DEPENDS_append_sun50i = " atf-sunxi "

+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
+
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"

 DEFAULT_PREFERENCE_sun4i="1"
@ -11,14 +16,17 @@ DEFAULT_PREFERENCE_sun7i="1"
 DEFAULT_PREFERENCE_sun8i="1"
 DEFAULT_PREFERENCE_sun50i="1"

-SRC_URI += " \
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
           file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
           file://boot.cmd \
           "
-# fix booting issue on orange pi zero
-SRC_URI_append_orange-pi-zero = " file://0002-Revert-sunxi-psci-avoid-error-address-of-packed-memb.patch"

-SRC_URI_append_nanopi-neo = " file://0002-Revert-sunxi-psci-avoid-error-address-of-packed-memb.patch"
+SRCREV = "f88b6facb87dc4a52f1630eb9d858c0f54c6628e"
+
+PV = "v2018.09+git${SRCPV}"
+PE = "2"
+
+S = "${WORKDIR}/git"

 UBOOT_ENV_SUFFIX = "scr"
 UBOOT_ENV = "boot"
--- a/recipes-devtools/python/files/setup.py.patch
+++ b/recipes-devtools/python/files/setup.py.patch
@ -0,0 +1,51 @@
+--- pyA20-0.2.1/setup.py	2014-09-04 12:17:18.000000000 +0200
+++ pyA20-0.2.1/setup.py	2014-11-24 17:44:37.000000000 +0100
+@@ -43,31 +43,31 @@
+     Detect processor type
+     :return:
+     """
+-    cpuinfo = open("/proc/cpuinfo", 'r')
+-    for line in cpuinfo:
+-        if "Hardware" in line:
+-            processor = line.split(":")[1].rstrip()
+    #cpuinfo = open("/proc/cpuinfo", 'r')
+    #for line in cpuinfo:
+    #    if "Hardware" in line:
+    #        processor = line.split(":")[1].rstrip()
+ 
+-            if "sun4i" in processor:
+-                print ("Detected processor: " + print_color(processor) + " (Probably Allwinner A10)")
+    #        if "sun4i" in processor:
+    #            print ("Detected processor: " + print_color(processor) + " (Probably Allwinner A10)")
+ 
+-            elif "sun5i" in processor:
+-                print ("Detected processor: " + print_color(processor) + " (Probably Allwinner A13)")
+    #        elif "sun5i" in processor:
+    #            print ("Detected processor: " + print_color(processor) + " (Probably Allwinner A13)")
+ 
+-            elif "sun7i" in processor:
+-                print ("Detected processor: " + print_color(processor) + " (Probably Allwinner A20)")
+    #        elif "sun7i" in processor:
+    #            print ("Detected processor: " + print_color(processor) + " (Probably Allwinner A20)")
+ 
+-            else:
+-                print ("Detected processor: " + print_color("unknown"))
+    #        else:
+    #            print ("Detected processor: " + print_color("unknown"))
+ 
+ 
+-            if processor_type not in processor:
+-                print_warning()
+    #        if processor_type not in processor:
+    #            print_warning()
+ 
+-            return
+    return
+ 
+-    print ("No processor detected")
+-    print_warning()
+    #print ("No processor detected")
+    #print_warning()
+ 
+ 
+ class build_ext(_build_ext):
--- a/recipes-devtools/python/pya20_0.2.12.bb
+++ b/recipes-devtools/python/pya20_0.2.12.bb
@ -1,23 +1,24 @@
 DESCRIPTION = "A module to control Allwinner GPIO,SPI and I2C channels"
 HOMEPAGE = "https://pypi.python.org/pypi/pyA20"
 SECTION = "devel/python"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=4e584373bb0f46ef1e423cb7df37847d"
-DEPENDS = "python3"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=bfe0261ded6cff75086193ec2f79129e"
+DEPENDS = "python"

 # No GPIO mappings for other machines yet
 COMPATIBLE_MACHINE = "(olinuxino-a13|olinuxino-a10|olinuxino-a20|olinuxino-a10lime|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a13som|olinuxino-a20som)"

 SRC_URI = "https://pypi.python.org/packages/source/p/pyA20/pyA20-${PV}.tar.gz \
+           file://setup.py.patch \
           file://mapping.h \
          "
 S = "${WORKDIR}/pyA20-${PV}"

-inherit distutils3
+inherit distutils

 do_compile_prepend() { 
 cp ${WORKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
 }

-SRC_URI[md5sum] = "cab03b4931199804603d1074f6d8f48f"
-SRC_URI[sha256sum] = "4bef559a9c5a4d648d9834bad996cf2805b20d6063b8051029ffdf9deda2b536"
+SRC_URI[md5sum] = "2290066bbe274000c53693959a8005b4"
+SRC_URI[sha256sum] = "b15e4ee1016b7eb52001cbccde3751868624a88d2adbb9adc5404628f7e59e7e"
--- a/recipes-devtools/python/pya20som_0.2.1.bb
+++ b/recipes-devtools/python/pya20som_0.2.1.bb
@ -0,0 +1,24 @@
+DESCRIPTION = "A module to control Allwinner GPIO,SPI and I2C channels"
+HOMEPAGE = "https://pypi.python.org/pypi/pyA20SOM"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=cf6345f2cb2acee98b01c493d68b8322"
+DEPENDS = "python"
+
+# No GPIO mappings for other machines yet
+COMPATIBLE_MACHINE = "olinuxino-a20som"
+
+SRC_URI = "https://pypi.python.org/packages/source/p/pyA20SOM/pyA20SOM-${PV}.tar.gz \
+           file://setup.py.patch \
+           file://mapping.h \
+          "
+S = "${WORKDIR}/pyA20SOM-${PV}"
+
+inherit distutils
+
+do_compile_prepend() { 
+cp ${WORKDIR}/mapping.h ${S}/pyA20SOM/gpio/mapping.h
+}
+
+SRC_URI[md5sum] = "a720115ef1d3dffe82f42f2157ca1c56"
+SRC_URI[sha256sum] = "1ac1025596cc112964f7caac9a6a523d5da61623c248ccc178c6cbb4bc1b4549"
--- a/recipes-graphics/libgles/sunxi-mali_git.bb
+++ b/recipes-graphics/libgles/sunxi-mali_git.bb
@ -70,7 +70,6 @@ do_install() {

    make libdir=${D}${libdir}/ includedir=${D}${includedir}/ install
    make libdir=${D}${libdir}/ includedir=${D}${includedir}/ install -C include
-    rm -f ${D}${includedir}/KHR/khrplatform.h

    # Fix .so name and create symlinks, binary package provides .so wich can't be included directly in package without triggering the 'dev-so' QA check
    # Packages like xf86-video-fbturbo dlopen() libUMP.so, so we do need to ship the .so files in ${PN}
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@ -1,5 +0,0 @@
-# Enable lima and panfrost Mesa drivers
-PACKAGECONFIG_append_use-mailine-graphics = " lima panfrost"
-# Enable KMS renderonly Mesa support
-# See https://cgit.freedesktop.org/mesa/mesa/commit/?id=2b780fe89300199f2334539aa1678e9b68f0434f
-GALLIUMDRIVERS_append_use-mailine-graphics = ",kmsro"
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@ -1,13 +0,0 @@
-# The brcmfmac driver looks for NVRAM files using the first entry in board
-# compatible since kernel >= 5.0:
-# https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0ad4b55b2f29784f93875e6231bf57cd233624a2
-# We create a link to the AP6212 module NVRAM file so that firmware is
-# autodetected by the driver.
-# WARNING: The following commit is required for NVRAM files to be included in
-# linux-firmware-bcm43430 package:
-# http://git.openembedded.org/openembedded-core/commit/?id=dde0f79f32fa6bab045ef60199903f74c4cc3393
-do_install_append() {
-	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.xunlong,orangepi-zero-plus2.txt
-	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.xunlong,orangepi-zero-plus2-h3.txt
-	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt
-}
--- a/recipes-kernel/linux/linux-mainline/aarch64/defconfig
+++ b/recipes-kernel/linux/linux-mainline/aarch64/defconfig
@ -141,11 +141,6 @@ CONFIG_BT_LEDS=y
 # CONFIG_BT_DEBUGFS is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_LL=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
 CONFIG_MAC80211=m
 CONFIG_MAC80211_LEDS=y
@ -499,8 +494,6 @@ CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_MMIO=y
 CONFIG_XEN_GNTDEV=y
 CONFIG_XEN_GRANT_DEV_ALLOC=y
-CONFIG_STAGING=y
-CONFIG_RTL8723BS=m
 CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_SCPI=y
 CONFIG_COMMON_CLK_CS2000_CP=y
--- a/recipes-kernel/linux/linux-mainline/arm/defconfig
+++ b/recipes-kernel/linux/linux-mainline/arm/defconfig
@ -485,8 +485,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_RSI_91X=m
 # CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_SUN4I=y
 CONFIG_INPUT_MISC=y
--- a/recipes-kernel/linux/linux-mainline/axp20x.cfg
+++ b/recipes-kernel/linux/linux-mainline/axp20x.cfg
@ -1,4 +0,0 @@
-CONFIG_MFD_AXP20X_I2C=y
-CONFIG_MFD_AXP20X=y
-CONFIG_IIO=y
-CONFIG_AXP20X_POWER=y
--- a/recipes-kernel/linux/linux-mainline/drm.cfg
+++ b/recipes-kernel/linux/linux-mainline/drm.cfg
@ -1,8 +0,0 @@
-CONFIG_DRM=y
-CONFIG_DRM_SUN4I=y
-CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_DRM_SUN8I_MIXER=y
-CONFIG_DRM_LIMA=y
-CONFIG_DRM_PANFROST=y
-CONFIG_CMA=y
-CONFIG_DMA_CMA=y
--- a/recipes-kernel/linux/linux-mainline/0001-dts-orange-pi-zero-Add-wifi-support.patch
+++ b/recipes-kernel/linux/linux-mainline/0001-dts-orange-pi-zero-Add-wifi-support.patch
@ -1,8 +1,8 @@
 diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-index 84cd9c061..917986cce 100644
+index 6713d0f2b3f4..ad0829e8f716 100644
 --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
 +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-@@ -80,13 +80,15 @@
+@@ -80,19 +80,22 @@
 		};
 	};
 
@ -19,16 +19,10 @@ index 84cd9c061..917986cce 100644
 		gpio = <&pio 0 20 GPIO_ACTIVE_HIGH>;
 +		startup-delay-us = <70000>;
 +		enable-active-high;
-+
- 	};
- 
- 	reg_vdd_cpux: vdd-cpux-regulator {
-@@ -106,10 +108,12 @@
- 			  1300000 1>;
 	};
 
 -	wifi_pwrseq: wifi_pwrseq {
-+	pwrseq_wifi: pwrseq_wifi {
+	pwrseq_wifi: pwrseq_wifi@0 {
 		compatible = "mmc-pwrseq-simple";
 +		pinctrl-names = "default";
 +		pinctrl-0 = <&wifi_rst>;
@ -38,10 +32,10 @@ index 84cd9c061..917986cce 100644
 	};
 };
 
-@@ -140,9 +144,11 @@
- };
- 
+@@ -124,9 +127,11 @@
 &mmc1 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&mmc1_pins_a>;
 -	vmmc-supply = <&reg_vcc_wifi>;
 -	mmc-pwrseq = <&wifi_pwrseq>;
 +	vmmc-supply = <&reg_vcc3v3>;
@ -52,7 +46,7 @@ index 84cd9c061..917986cce 100644
 	non-removable;
 	status = "okay";
 
-@@ -152,6 +158,13 @@
+@@ -136,9 +141,30 @@
 	 */
 	xr819: sdio_wifi@1 {
 		reg = <1>;
@ -66,11 +60,6 @@ index 84cd9c061..917986cce 100644
 	};
 };
 
-@@ -208,3 +221,18 @@
- 	status = "okay";
- 	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
- };
-+
 +&pio {
 +	wifi_wake: wifi_wake {
 +		pins = "PG10";
@ -85,3 +74,6 @@ index 84cd9c061..917986cce 100644
 +    };
 +};
 +
+ &mmc1_pins_a {
+ 	bias-pull-up;
+ };
--- a/recipes-kernel/linux/linux-mainline_4.19.186.bb
+++ b/recipes-kernel/linux/linux-mainline_4.19.186.bb
@ -1,5 +1,5 @@
 SECTION = "kernel"
-DESCRIPTION = "Mainline Longterm Linux kernel"
+DESCRIPTION = "Mainline Linux kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
@ -19,8 +19,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

 S = "${WORKDIR}/linux-${PV}"

-SRC_URI[md5sum] = "dfb4db3d95bdcd8114281e32eb0be5cd"
-SRC_URI[sha256sum] = "d8c5d7844214510e85ceb9f5236f27f63fc03535a143f3aaa0c1677a8f92e631"
+SRC_URI[md5sum] = "5e171996b176df3db2150bcb47d042a7"
+SRC_URI[sha256sum] = "097b52fe8a872259f4a3dba571b2eaf7b9863d9cde5399c6b316dec0ef57e67a"

 SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
        file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
@ -28,5 +28,5 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
        "

 SRC_URI_append_orange-pi-zero += "\
-	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
+	file://0001-add-wifi-support.patch \
 	"
--- a/recipes-kernel/linux/linux-mainline_5.0.19.bb
+++ b/recipes-kernel/linux/linux-mainline_5.0.19.bb
@ -1,4 +1,5 @@
 SECTION = "kernel"
+DESCRIPTION = "Mainline Linux kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
@ -11,8 +12,6 @@ require linux.inc
 # in something or kernel-yocto.bbclass will fail.
 KBRANCH ?= "master"

-DEPENDS += "rsync-native"
-
 # Pull in the devicetree files into the rootfs
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"

@ -20,13 +19,14 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

 S = "${WORKDIR}/linux-${PV}"

+SRC_URI[md5sum] = "52fb710109527b042278359526588da8"
+SRC_URI[sha256sum] = "0bf0d5c64dafc1184e9aafd2f3ebb77aa88ddee881a7766436258feaa214d9ec"
+
 SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \
-	file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
-	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
-	file://defconfig \
-"
+        file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
+        file://defconfig \
+        "

-SRC_URI_append_use-mailine-graphics = " file://drm.cfg"
-SRC_URI_append_bananapi = " file://axp20x.cfg"
-
-FILES_${KERNEL_PACKAGE_NAME}-base_append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
+SRC_URI_append_orange-pi-zero += "\
+	file://0001-add-wifi-support.patch \
+	"
--- a/recipes-kernel/linux/linux-mainline_5.2-rc2.bb
+++ b/recipes-kernel/linux/linux-mainline_5.2-rc2.bb
@ -0,0 +1,35 @@
+SECTION = "kernel"
+DESCRIPTION = "Mainline Linux kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
+
+inherit kernel
+
+require linux.inc
+
+# Since we're not using git, this doesn't make a difference, but we need to fill
+# in something or kernel-yocto.bbclass will fail.
+KBRANCH ?= "master"
+
+# Pull in the devicetree files into the rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
+
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
+S = "${WORKDIR}/linux-${PV}"
+
+SRC_URI[md5sum] = "bf80c4ab5f475a2c0846340fb9eb6449"
+SRC_URI[sha256sum] = "8ec8258e75ebdcd8197328b8571435c246f55d7da7f6ed65e96aa8d4bff9a639"
+
+SRC_URI = "https://git.kernel.org/torvalds/t/linux-${PV}.tar.gz \
+        file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
+        file://defconfig \
+        "
+
+SRC_URI_append_orange-pi-zero += "\
+	file://0001-add-wifi-support.patch \
+	"
+
+FILES_${KERNEL_PACKAGE_NAME}-base_append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
+
--- a/recipes-kernel/linux/linux-mainline_5.4.111.bb
+++ b/recipes-kernel/linux/linux-mainline_5.4.111.bb
@ -1,6 +0,0 @@
-require linux-mainline.inc
-
-DESCRIPTION = "Mainline Longterm Linux kernel"
-
-SRC_URI[md5sum] = "a3820e9aa56af51c0331b7f427e6f71b"
-SRC_URI[sha256sum] = "21626132658dc34cb41b7aa7b80ecf83751890a71ac1a63d77aea9d488271a03"
--- a/recipes-kernel/linux/linux-mainline_5.5.3.bb
+++ b/recipes-kernel/linux/linux-mainline_5.5.3.bb
@ -1,6 +0,0 @@
-require linux-mainline.inc
-
-DESCRIPTION = "Mainline Stable Linux kernel"
-
-SRC_URI[md5sum] = "3ea50025d8c679a327cf2fc225d81a46"
-SRC_URI[sha256sum] = "2bef3edcf44c746383045f4a809b2013e18c52319c827875ed8e89138951cab2"
--- a/recipes-kernel/linux/linux-sunxi/0001-gcc5-fixes.patch
+++ b/recipes-kernel/linux/linux-sunxi/0001-gcc5-fixes.patch
--- a/recipes-kernel/linux/linux-sunxi/0004-arm-put-user-asm-fix.patch
+++ b/recipes-kernel/linux/linux-sunxi/0004-arm-put-user-asm-fix.patch
@ -1,29 +0,0 @@
-From 25a7e85eb0d58479f7d8895b1b29a648bd07d60e Mon Sep 17 00:00:00 2001
-From: Andrey Lebedev <andrey@lebedev.lt>
-Date: Mon, 20 Jan 2020 23:19:51 +0200
-Subject: [PATCH 2/2] Fix asm error in put_user under gcc version 8 and above
-
-Fixes these errors during compilation of linux-sunxi-3.4 kernel:
-/tmp/ccCGMQmS.s:648: Error: .err encountered
-
-Taken from https://patchwork.kernel.org/patch/10546809/
---
- arch/arm/include/asm/uaccess.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index b04850fd..abfafbbf 100644
--- a/arch/arm/include/asm/uaccess.h
-+++ b/arch/arm/include/asm/uaccess.h
-@@ -159,7 +159,7 @@ extern int __put_user_8(void *, unsigned long long);
- 	({								\
- 		unsigned long __limit = current_thread_info()->addr_limit - 1; \
- 		const typeof(*(p)) __user *__tmp_p = (p);		\
-		register const typeof(*(p)) __r2 asm("r2") = (x);	\
-+		register typeof(*(p)) __r2 asm("r2") = (x);		\
- 		register const typeof(*(p)) __user *__p asm("r0") = __tmp_p; \
- 		register unsigned long __l asm("r1") = __limit;		\
- 		register int __e asm("r0");				\
-- 
-2.20.1
-
--- a/recipes-kernel/linux/linux-sunxi/0005-silence-warning.patch
+++ b/recipes-kernel/linux/linux-sunxi/0005-silence-warning.patch
@ -1,25 +0,0 @@
-From 302604ee4a2011871cb26deaf69d567cf57d0fe3 Mon Sep 17 00:00:00 2001
-From: Andrey Lebedev <andrey@lebedev.lt>
-Date: Mon, 20 Jan 2020 23:20:07 +0200
-Subject: [PATCH 1/2] Silence annoying warning
-
---
- include/linux/log2.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/linux/log2.h b/include/linux/log2.h
-index fd7ff3d9..14458fdd 100644
--- a/include/linux/log2.h
-+++ b/include/linux/log2.h
-@@ -18,7 +18,7 @@
- /*
-  * deal with unrepresentable constant logarithms
-  */
-extern __attribute__((const, noreturn))
-+extern __attribute__((const))
- int ____ilog2_NaN(void);
- 
- /*
-- 
-2.20.1
-
--- a/recipes-kernel/linux/linux-sunxi_3.4.bb
+++ b/recipes-kernel/linux/linux-sunxi_3.4.bb
@ -14,12 +14,9 @@ MACHINE_KERNEL_PR_append = "a"
 SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protocol=git \
        file://0001-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch \
        file://0002-use-static-inline-in-ARM-ftrace.patch \
-        file://0003-gcc5-fixes.patch \
-        file://0004-arm-put-user-asm-fix.patch \
-        file://0005-silence-warning.patch \
+        file://0001-gcc5-fixes.patch \
        file://defconfig \
        "
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"

 S = "${WORKDIR}/git"

--- a/recipes-kernel/xradio-firmware/xradio-firmware.bb
+++ b/recipes-kernel/xradio-firmware/xradio-firmware.bb
@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a
 PV = "1.0"
 PR = "r0"

-SRCREV = "761658e1701c77a0a84706754e6db1a25ee60b82"
+SRCREV = "bddd21b7f895be9f0c37e435f0a7ac84405c6091"

 COMPATIBLE_MACHINE = "orange-pi-zero"

--- a/recipes-kernel/xradio/xradio.bb
+++ b/recipes-kernel/xradio/xradio.bb
@ -11,11 +11,9 @@ RDEPENDS_${PN} += "xradio-firmware"

 COMPATIBLE_MACHINE = "orange-pi-zero"

-SRCREV = "279868ac96f6db34b65f68c6722830fa0aacb86b"
+SRCREV = "d649e5a78efdc56ecd0951e35ca60db175650232"

-SRC_URI = "\
-	   git://github.com/dbeinder/xradio.git;protocol=https;branch=karabek_rebase \
-	file://0001-Enable-out-of-tree-compilation.patch \
+SRC_URI = "git://github.com/fifteenhex/xradio.git;protocol=https \
          "

 S = "${WORKDIR}/git"
--- a/recipes-kernel/xradio/xradio/0001-Enable-out-of-tree-compilation.patch
+++ b/recipes-kernel/xradio/xradio/0001-Enable-out-of-tree-compilation.patch
@ -1,30 +0,0 @@
-From 15651d333da5429a1544f0a17d5f02c74f693ad7 Mon Sep 17 00:00:00 2001
-From: Marek Belisko <marek.belisko@open-nandra.com>
-Date: Thu, 15 Oct 2020 14:45:07 +0200
-Subject: [PATCH] Enable out of tree compilation
-
-Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 7a0de9a..ee75f0b 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,9 @@
- # SPDX-License-Identifier: GPL-2.0-only
- 
- # # Standalone Makefile - uncomment for out-of-tree compilation
-# CONFIG_WLAN_VENDOR_XRADIO := m
-# ccflags-y += -DCONFIG_XRADIO_USE_EXTENSIONS
-# ccflags-y += -DCONFIG_XRADIO_WAPI_SUPPORT
-+CONFIG_WLAN_VENDOR_XRADIO := m
-+ccflags-y += -DCONFIG_XRADIO_USE_EXTENSIONS
-+ccflags-y += -DCONFIG_XRADIO_WAPI_SUPPORT
- 
- # Kernel part
- 
-- 
-2.7.4
-