Use mainline atf

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
xradio-firmware: Update to latest master
2025-07-16 13:59:46 +02:00 · 2022-03-01 08:01:07 +01:00 · 2021-06-30 11:10:02 +02:00 · 2021-06-30 11:09:57 +02:00 · 2021-06-23 16:51:41 +02:00 · 2021-06-23 09:28:43 -04:00
57 changed files with 407 additions and 226 deletions
--- a/README.md
+++ b/README.md
@ -19,24 +19,36 @@ 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"
+		PREFERRED_PROVIDER_u-boot="u-boot-sunxi"
+		PREFERRED_PROVIDER_virtual/bootloader="u-boot-sunxi"
+		PREFERRED_PROVIDER_virtual/kernel="linux-sunxi"
+		KERNEL_DEVICETREE = ""

 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

-For mainline kernel we have now support for latest LTS, stable and bleeding edge (latest possible rc).
+Mainline Kernel / U-Boot
+-----------
+
+For mainline kernel we have now support for latest LTS and stable.
 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/4921234ed77f9df77c65c88637ce50468f65bde7/conf/machine/include/sunxi.inc#L16)
+* [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"

 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 ?= "${MACHINE}"
+BOOTDD_VOLUME_ID ?= "boot"

 # 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 = "morty pyro rocko sumo thud warrior"
+LAYERSERIES_COMPAT_meta-sunxi = "zeus dunfell"
--- a/conf/machine/bananapi-m2m.conf
+++ b/conf/machine/bananapi-m2m.conf
@ -0,0 +1,9 @@
+#@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
@ -0,0 +1,9 @@
+#@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
@ -0,0 +1,8 @@
+#@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
@ -0,0 +1,5 @@
+# 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,4 +1,6 @@
 require conf/machine/include/sunxi64.inc
-require conf/machine/include/arm/arch-armv8.inc
+
+DEFAULTTUNE ?= "cortexa53-crypto"
+require conf/machine/include/tune-cortexa53.inc

 SOC_FAMILY = "sun50i"
--- a/conf/machine/include/sunxi-mali-driver.inc
+++ b/conf/machine/include/sunxi-mali-driver.inc
@ -0,0 +1,15 @@
+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,15 +1,5 @@
-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 \
-  "
+# 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' }
--- 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 ?= "4.19%"
+PREFERRED_VERSION_linux-mainline ?= "5.4.%"
 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,8 +4,6 @@

 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,7 +5,5 @@

 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,8 +4,7 @@
 # on the Allwinner H5 SoC.

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

 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,8 +4,6 @@

 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,7 +5,5 @@

 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,5 +7,7 @@ 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,8 +4,6 @@

 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,8 +4,6 @@

 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,8 +4,6 @@

 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
@ -0,0 +1,8 @@
+#@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
@ -0,0 +1,9 @@
+#@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,10 +2,8 @@
 #@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
-
-PREFERRED_VERSION_u-boot = "v2018.09%"
+require conf/machine/include/hardware/ap6212a.inc

 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,8 +4,6 @@

 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,8 +4,6 @@

 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,7 +5,5 @@

 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/atf/atf-sunxi_git.bb
+++ b/recipes-bsp/atf/atf-sunxi_git.bb
@ -1,16 +1,26 @@
-DESCRIPTION = "ARM Trusted Firmware Allwinner"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://license.md;md5=829bdeb34c1d9044f393d5a16c068371"
+inherit deploy

-SRC_URI = "git://github.com/apritzel/arm-trusted-firmware;nobranch=1"
-SRCREV = "aa75c8da415158a94b82a430b2b40000778e851f"
+DESCRIPTION = "ARM Trusted Firmware"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+
+SRC_URI = " \
+        git://github.com/ARM-software/arm-trusted-firmware.git;nobranch=1 \
+        "
+SRCREV_sun50iw2 = "c390ecd6db5fadb054466a8d4168d9bbbff2fa95"
+SRCREV_sun50iw6 = "c390ecd6db5fadb054466a8d4168d9bbbff2fa95"
+SRCREV_sun50i = "c390ecd6db5fadb054466a8d4168d9bbbff2fa95"

 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"

-COMPATIBLE_MACHINE = "(sun50i)"
+COMPATIBLE_MACHINE = "(sun50iw2|sun50iw6|sun50i)"

-PLATFORM_sun50i = "sun50iw1p1"
+PLATFORM_sun50iw2 = "sun50i_a64"
+PLATFORM_sun50i = "sun50i_a64"
+PLATFORM_sun50iw6 = "sun50i_h6"

 LDFLAGS[unexport] = "1"

@ -22,6 +32,8 @@ do_compile() {
      all
 }

-do_install() {
-    install -D -p -m 0644 ${B}/${PLATFORM}/release/bl31.bin ${DEPLOY_DIR_IMAGE}/bl31.bin
+do_deploy() {
+    install -D -p -m 0644 ${B}/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31.bin
 }
+
+addtask deploy after do_compile
--- 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,20 +1,21 @@
-From f4a77da23b3890b53efab6a927cbe99b76ef3b26 Mon Sep 17 00:00:00 2001
+From 6adb2ebdc4022c24497e9ee4dccab41d18e3105d 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 8c362fa885..c7929ff015 100644
+index 5ad90ddd16..8b7a4eb45d 100644
 --- a/configs/nanopi_neo_air_defconfig
 +++ b/configs/nanopi_neo_air_defconfig
-@@ -15,3 +15,4 @@ CONFIG_CONSOLE_MUX=y
- CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
+@@ -15,3 +15,4 @@ 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
@ -0,0 +1,67 @@
+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,8 +20,9 @@ UBOOT_MACHINE_meleg = "Mele_A1000G_config"

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

 PE = "1"
@ -35,3 +36,7 @@ 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/0001-gcc5-fixes.patch
+++ b/recipes-bsp/u-boot/u-boot-sunxi/0001-gcc5-fixes.patch
--- a/recipes-bsp/u-boot/u-boot-sunxi/0002-gcc6-fixes.patch
+++ b/recipes-bsp/u-boot/u-boot-sunxi/0002-gcc6-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
@ -0,0 +1,24 @@
+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_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@ -1,13 +1,8 @@
-DESCRIPTION="Upstream's U-boot configured for sunxi devices"
-
-require recipes-bsp/u-boot/u-boot.inc
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

 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"
@ -16,17 +11,12 @@ DEFAULT_PREFERENCE_sun7i="1"
 DEFAULT_PREFERENCE_sun8i="1"
 DEFAULT_PREFERENCE_sun50i="1"

-SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
+SRC_URI += " \
           file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
           file://boot.cmd \
           "
-
-SRCREV = "f88b6facb87dc4a52f1630eb9d858c0f54c6628e"
-
-PV = "v2018.09+git${SRCPV}"
-PE = "2"
-
-S = "${WORKDIR}/git"
+# 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"

 UBOOT_ENV_SUFFIX = "scr"
 UBOOT_ENV = "boot"
--- a/recipes-devtools/python/files/setup.py.patch
+++ b/recipes-devtools/python/files/setup.py.patch
@ -1,51 +0,0 @@
--- 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,24 +1,23 @@
 DESCRIPTION = "A module to control Allwinner GPIO,SPI and I2C channels"
 HOMEPAGE = "https://pypi.python.org/pypi/pyA20"
 SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=bfe0261ded6cff75086193ec2f79129e"
-DEPENDS = "python"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=4e584373bb0f46ef1e423cb7df37847d"
+DEPENDS = "python3"

 # 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 distutils
+inherit distutils3

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

-SRC_URI[md5sum] = "2290066bbe274000c53693959a8005b4"
-SRC_URI[sha256sum] = "b15e4ee1016b7eb52001cbccde3751868624a88d2adbb9adc5404628f7e59e7e"
+SRC_URI[md5sum] = "cab03b4931199804603d1074f6d8f48f"
+SRC_URI[sha256sum] = "4bef559a9c5a4d648d9834bad996cf2805b20d6063b8051029ffdf9deda2b536"
--- a/recipes-devtools/python/pya20som_0.2.1.bb
+++ b/recipes-devtools/python/pya20som_0.2.1.bb
@ -1,24 +0,0 @@
-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,6 +70,7 @@ 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
@ -0,0 +1,5 @@
+# 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
@ -0,0 +1,13 @@
+# 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_5.0.19.bb
+++ b/recipes-kernel/linux/linux-mainline_5.0.19.bb
@ -1,5 +1,4 @@
 SECTION = "kernel"
-DESCRIPTION = "Mainline Linux kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
@ -12,6 +11,8 @@ 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"

@ -19,14 +20,13 @@ 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://defconfig \
-        "
+	file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
+	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
+	file://defconfig \
+"

-SRC_URI_append_orange-pi-zero += "\
-	file://0001-add-wifi-support.patch \
-	"
+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"
--- 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 6713d0f2b3f4..ad0829e8f716 100644
+index 84cd9c061..917986cce 100644
 --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
 +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-@@ -80,19 +80,22 @@
+@@ -80,13 +80,15 @@
 		};
 	};
 
@ -19,10 +19,16 @@ index 6713d0f2b3f4..ad0829e8f716 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@0 {
+	pwrseq_wifi: pwrseq_wifi {
 		compatible = "mmc-pwrseq-simple";
 +		pinctrl-names = "default";
 +		pinctrl-0 = <&wifi_rst>;
@ -32,10 +38,10 @@ index 6713d0f2b3f4..ad0829e8f716 100644
 	};
 };
 
-@@ -124,9 +127,11 @@
+@@ -140,9 +144,11 @@
+ };
+ 
 &mmc1 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&mmc1_pins_a>;
 -	vmmc-supply = <&reg_vcc_wifi>;
 -	mmc-pwrseq = <&wifi_pwrseq>;
 +	vmmc-supply = <&reg_vcc3v3>;
@ -46,7 +52,7 @@ index 6713d0f2b3f4..ad0829e8f716 100644
 	non-removable;
 	status = "okay";
 
-@@ -136,9 +141,30 @@
+@@ -152,6 +158,13 @@
 	 */
 	xr819: sdio_wifi@1 {
 		reg = <1>;
@ -60,6 +66,11 @@ index 6713d0f2b3f4..ad0829e8f716 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";
@ -74,6 +85,3 @@ index 6713d0f2b3f4..ad0829e8f716 100644
 +    };
 +};
 +
- &mmc1_pins_a {
- 	bias-pull-up;
- };
--- a/recipes-kernel/linux/linux-mainline/aarch64/defconfig
+++ b/recipes-kernel/linux/linux-mainline/aarch64/defconfig
@ -141,6 +141,11 @@ 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
@ -494,6 +499,8 @@ 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 is not set
-# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_INPUT_MOUSE=y
 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
@ -0,0 +1,4 @@
+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
@ -0,0 +1,8 @@
+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_4.19.186.bb
+++ b/recipes-kernel/linux/linux-mainline_4.19.186.bb
@ -1,5 +1,5 @@
 SECTION = "kernel"
-DESCRIPTION = "Mainline Linux kernel"
+DESCRIPTION = "Mainline Longterm 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] = "5e171996b176df3db2150bcb47d042a7"
-SRC_URI[sha256sum] = "097b52fe8a872259f4a3dba571b2eaf7b9863d9cde5399c6b316dec0ef57e67a"
+SRC_URI[md5sum] = "dfb4db3d95bdcd8114281e32eb0be5cd"
+SRC_URI[sha256sum] = "d8c5d7844214510e85ceb9f5236f27f63fc03535a143f3aaa0c1677a8f92e631"

 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-add-wifi-support.patch \
+	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
 	"
--- a/recipes-kernel/linux/linux-mainline_5.2-rc2.bb
+++ b/recipes-kernel/linux/linux-mainline_5.2-rc2.bb
@ -1,35 +0,0 @@
-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
@ -0,0 +1,6 @@
+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
@ -0,0 +1,6 @@
+require linux-mainline.inc
+
+DESCRIPTION = "Mainline Stable Linux kernel"
+
+SRC_URI[md5sum] = "3ea50025d8c679a327cf2fc225d81a46"
+SRC_URI[sha256sum] = "2bef3edcf44c746383045f4a809b2013e18c52319c827875ed8e89138951cab2"
--- a/recipes-kernel/linux/linux-sunxi/0003-gcc5-fixes.patch
+++ b/recipes-kernel/linux/linux-sunxi/0003-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
@ -0,0 +1,29 @@
+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
@ -0,0 +1,25 @@
+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,9 +14,12 @@ 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://0001-gcc5-fixes.patch \
+        file://0003-gcc5-fixes.patch \
+        file://0004-arm-put-user-asm-fix.patch \
+        file://0005-silence-warning.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 = "bddd21b7f895be9f0c37e435f0a7ac84405c6091"
+SRCREV = "761658e1701c77a0a84706754e6db1a25ee60b82"

 COMPATIBLE_MACHINE = "orange-pi-zero"

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

 COMPATIBLE_MACHINE = "orange-pi-zero"

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

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

 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
@ -0,0 +1,30 @@
+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
+
Author	SHA1	Message	Date
Marek Belisko	b99cc59cfc	Use mainline atf Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2022-03-01 08:01:07 +01:00
Marek Belisko	f367a1ff2c	xradio-firmware: Update to latest master Old version seems to have random crashes when using softap functionality Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2021-06-30 11:10:02 +02:00
Marek Belisko	7b7c64f8ef	Added support for bananapi-m64 machine Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2021-06-30 11:09:57 +02:00
Marek Belisko	a3848d2e23	Merge pull request #323 from MitchGaines/opi-plus2e-machine Orange Pi Plus 2E Machine Configuration	2021-06-23 16:51:41 +02:00
MitchGaines	eae1cd6122	machine added	2021-06-23 09:28:43 -04:00
Marius Kriegerowski	91ddc99c98	default to 'boot' as boot partition label Defaulting to the $MACHINE may lead to failure if the name was longer than the limit of allowed volume label of fat (11 chars). Signed-off-by: Marius Kriegerowski <marius.kriegerowski@gmail.com>	2021-05-17 13:30:28 +02:00
Marek Belisko	ea508b4f10	Merge pull request #316 from linux-sunxi/mbe-dunfell Misc fixes	2021-04-17 09:39:17 +02:00
Marek Belisko	e76d39e3d2	linux-mainline: Bump to 4.x and 5.x to lastest stable releases Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2021-04-13 15:58:03 +02:00
Marek Belisko	a1a6504789	Added bananapi-m2m machine Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2021-04-13 13:17:57 +02:00
Marek Belisko	c47c7dcc61	u-boot: Fix orange-pi-zero booting Without this patch booting ends with Starting kernel ... Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2021-03-30 21:53:22 +02:00
Marek Belisko	b1db4fbfc7	Merge pull request #304 from mfrydrysiak/dunfell-m2plus conf: machine: add bananapi-m2plus	2020-11-12 11:49:18 +01:00
Marek Frydrysiak	e4d5c7323e	conf: machine: add bananapi-m2plus Add machine configuration for H3 based Banana Pi M2+. Signed-off-by: Marek Frydrysiak <marek.frydrysiak@gmail.com>	2020-11-11 16:44:08 +01:00
Marek Belisko	37bfb7c8cd	xradio: Use updated driver from armbian Current xradio driver have an issue that with 5.x kernel doesn't work properly. Bump it to more maintained one which support also 5.x kernel. Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2020-10-15 19:51:21 +02:00
Marek Belisko	648484cd2c	Merge pull request #296 from Kynetics/dunfell linux-mainline: update to lt 5.4.69	2020-10-01 20:00:39 +02:00
Diego Rondini	296735769d	linux-mainline: update to lt 5.4.69 Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2020-10-01 16:55:48 +00:00
Marek Belisko	f3243b56d2	xradio: Bump revision to have it compilable with later 5.x kernel Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2020-09-18 10:43:53 +02:00
Marek Belisko	8b7ee077bf	Merge pull request #291 from Kynetics/dunfell Revert "u-boot: rebase patch against v2020.04"	2020-06-25 21:30:02 +02:00
Diego Rondini	6787fdcc4a	Revert "u-boot: rebase patch against v2020.04" This reverts commit `ebde1a411c`. Dunfell uses U-Boot 2020.01, so this patch shouldn't be applied in the dunfell branch. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2020-06-19 12:38:08 +00:00
Marek Belisko	56bfc99b03	linux-mainline: Added fix for bananapi Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2020-06-01 08:44:07 +02:00
Jonathan Liu	ebde1a411c	u-boot: rebase patch against v2020.04 Signed-off-by: Jonathan Liu <net147@gmail.com>	2020-06-01 08:44:02 +02:00
Marek Belisko	ee0b2699ee	Merge pull request #287 from Kynetics/master layer.conf: add "dunfell" compatibility	2020-05-08 20:33:59 +02:00
Diego Rondini	d46ff454d0	layer.conf: add "dunfell" compatibility Update the layer compatibility information to indicate this layer is compatible with "dunfell". Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2020-04-28 21:12:04 +00:00
Marek Belisko	ee3a551b83	Merge pull request #285 from Kynetics/use-mainline-graphics Enable open source GPU drivers	2020-03-19 07:49:36 +01:00
Diego Rondini	74a488e2ef	README.md: document how to select gfx drivers Update documentation to clarify how to select the use of mainline graphics drivers lima and panfrost. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2020-03-18 22:45:30 +01:00
Diego Rondini	1d6ef084db	Enable open source GPU support Enable open source GPU support for Mali Utgard GPUs (lima driver) and Mali Midgard and Bifrost GPUs (panfrost driver). The support is enabled by: - enabling DRM kernel CONFIGs - enabling lima, panfrost and kmsro in Mesa - disabling the specific mali driver overrides in sunxi-mali.inc To enable open source mainline graphics support just add the following line in your local.conf: MACHINEOVERRIDES .= ":use-mailine-graphics" Please note that some machines may need a bigger CMA value to be able to start Weston. To do that, add e.g. "cma=128M" to the kernel parameters. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2020-03-18 21:36:14 +01:00
Marek Belisko	fa0846c0eb	Merge pull request #284 from Kynetics/master Kernel recipe improvements	2020-03-05 22:14:02 +01:00
Diego Rondini	e9d4b90576	linux-mainline: use .inc for common code Use .inc file to share common code and parameters. Also, always apply orange-pi-zero wifi patch unconditionally: it is easier to spot build issues while updating recipes if patch is applied regardless of the machine we're building on. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2020-03-03 20:58:15 +00:00
Diego Rondini	620c66eac5	linux-mainline: enable keyboard and mouse Enable keyboard and mouse support in arm defconfig. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2020-02-28 20:55:44 +00:00
Marek Belisko	4b928c5b72	Merge pull request #283 from Kynetics/master conf: machine: add orange-pi-zero-plus2-h3	2020-02-14 08:02:49 +01:00
Diego Rondini	6eab521310	conf: machine: add orange-pi-zero-plus2-h3 Add machine configuration for H3 variant of Orange Pi Zero Plus2. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2020-02-13 23:14:28 +00:00
Marek Belisko	c82b2f8612	Merge pull request #277 from Kynetics/master linux-mainline: update lt to 5.4.12, rc to 5.5-rc6	2020-02-11 22:31:32 +01:00
Diego Rondini	02e3e7fba8	linux-mainline: add lt 5.4.18, stable 5.5.3 According to: https://www.kernel.org/category/releases.html version 5.4 is a longterm release, so: - add longterm 5.4 series at 5.4.18 - update longterm 4.19 series to 4.19.103 - update stable to 5.5.3 - remove rc, as it quickly gets out of date. rc users will likely build kernel from master outside of OE anyway - set 5.4 as the preferred version for linux-mainline Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2020-02-11 20:54:54 +00:00
Marek Belisko	12cbb60a76	Merge pull request #280 from Kynetics/python2-removal pya20: update to 0.2.12 and python3	2020-01-30 09:49:10 +01:00
Diego Rondini	2398d55ad4	pya20: update to 0.2.12 and python3 Update pya20 to version 0.2.12: - support for Python2 has been removed in oe-core master (see commit 390f3edabfb1f68ed9766245291c5f44ea00cc38) so dependencies and classes have been changed to use Python3. Without this change recipe parsing fails on master, as distutils class doesn't exist anymore - license has been fixed to be GPLv3 as declared in pyA20/__init__.py - setup.py.patch is no longer needed - pya20som has been removed, as machine olinuxino-a20som is supported by pya20 Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2020-01-29 22:50:09 +00:00
Marek Belisko	f9060cda38	Merge pull request #278 from kedder/master Fix compilation of legacy linux-sunxi-3.4 kernel under zeus	2020-01-26 10:35:38 +01:00
Andrey Lebedev	f25203c936	Mention that devicetree needs to be disabled for old kernel	2020-01-26 11:02:00 +02:00
Andrey Lebedev	b2f0d28f49	Correctly generate .config file for the compilation	2020-01-26 11:02:00 +02:00
Andrey Lebedev	89be65d931	u-boot-sunxi: fix compilation under gcc, newer than 4	2020-01-26 11:01:56 +02:00
Andrey Lebedev	802857ee59	linux-sunxi: fix compilation issue on gcc-9 Error comes in form of /tmp/ccCGMQmS.s:648: Error: .err encountered Tested on zeus branch of linux-sunxi.	2020-01-26 10:57:58 +02:00
Marek Belisko	fbf5ac3e31	Merge pull request #276 from cz7asm/master fixing missing 'compatible' property in reg_vcc_wifi node	2020-01-12 09:16:23 +01:00
Petr Buchta	c9527c099d	fixing missing 'compatible' property in reg_vcc_wifi node	2020-01-11 22:59:27 +01:00
Marek Belisko	21462a47a2	Merge pull request #274 from Kynetics/master ap6212a.inc: add support for AMPAK 6212A	2019-12-31 18:38:46 +01:00
Diego Rondini	7fdbe68c1f	ap6212a.inc: add support for AMPAK 6212A Add support for AMPAK 6212A module: 1) install kernel module 2) install firmware 3) create the required symlink with the AP6212 NVRAM file Enable the support in the boards with the module, according to: https://linux-sunxi.org/Table_of_Allwinner_based_boards The link creation with compatible name works on kernels >= 5.0. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2019-12-05 10:05:54 +00:00
Enrico Butera	b7b8764c8f	Merge pull request #271 from Kynetics/master machine: remove U-Boot PREFERRED_VERSION	2019-11-07 11:24:48 +01:00
Diego Rondini	504fa1bb71	machine: remove U-Boot PREFERRED_VERSION Remove pointless U-Boot PREFERRED_VERSION, as meta-sunxi no longer provides its own u-boot recipe. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2019-11-06 12:44:11 +00:00
Marek Belisko	902841dcd4	Merge pull request #272 from Kynetics/kernel-update/master Update kernel recipes to latest revisions	2019-11-06 12:58:23 +01:00
Diego Rondini	9fef250ca8	linux-mainline: update rc to 5.4-rc6 Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2019-11-06 11:19:00 +00:00
Diego Rondini	0419afad79	linux-mainline: update stable to 5.3.8 Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2019-11-06 11:19:00 +00:00
Diego Rondini	444672b854	linux-mainline: update longterm to 4.19.81 Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2019-11-06 11:19:00 +00:00
Marek Belisko	f1378e33af	Merge pull request #270 from twoerner/contrib/twoerner/fixes-05 LAYERSERIES_COMPAT: warrior -> zeus	2019-10-16 14:05:56 +02:00
Trevor Woerner	efe6aef33f	LAYERSERIES_COMPAT: warrior -> zeus Update the layer compatibility information to indicate this layer is compatible with "zeus". Signed-off-by: Trevor Woerner <twoerner@gmail.com>	2019-10-09 08:00:20 -04:00
slapin	b20940edd0	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	2019-09-07 22:16:50 +02:00
slapin	63ee6333dc	Fix soname in Mali.so to make auto-RDEPENDS work The auto-RDEPENDs system reqires that all .so libraries have proper soname set. If library soes not have soname set, it will not be added to RDEPENDs list of other elf files. Closes #240	2019-09-07 16:38:48 +02:00
Marek Belisko	23acf5bc61	Merge pull request #266 from twoerner/contrib/twoerner/fixes-04 Contrib/twoerner/fixes 04	2019-09-02 07:52:42 +02:00
Trevor Woerner	d0bbc7334d	U-Boot: patch refresh Signed-off-by: Trevor Woerner <twoerner@gmail.com>	2019-08-30 14:06:41 -04:00
Trevor Woerner	7964ef28bd	U-Boot: switch to upstream Use the upstream U-Boot and simply bbappend the changes that are needed. U-Boot 2018.09 no longer builds against master. Signed-off-by: Trevor Woerner <twoerner@gmail.com>	2019-08-30 14:06:41 -04:00
Marek Belisko	e10f05d494	Merge pull request #264 from nandra/mbe-fix-wifi-patch linux: refresh orange-pi-zero wifi patch	2019-08-07 08:17:00 +02:00
Marek Belisko	1f46cadd4c	linux: refresh orange-pi-zero wifi patch Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2019-08-07 08:16:15 +02:00
Marek Belisko	a5cecabb42	Merge pull request #265 from nandra/mbe-update-kernels Update mainline kernels	2019-08-07 08:14:03 +02:00
Marek Belisko	d034a64bc4	linux-mainline: Added bleeding edge kernel 5.3-rc2 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2019-08-07 08:13:19 +02:00
Marek Belisko	6bfa745149	linux-mainline: Drop 5.0 and use 5.2 as latest release Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2019-08-07 08:13:19 +02:00
Marek Belisko	70d37fa203	linux-mainline: Bump 4.19 to latest stable Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2019-08-07 08:13:19 +02:00
Marek Belisko	741b6238b6	Merge pull request #262 from MdeVries86/feature/olinuxino-a64-wifi Add wifi support for olinuxino-a64	2019-07-09 11:35:36 +02:00
Marek Belisko	917850e01d	Merge pull request #261 from lorem-ipsum/sun50i-tune sun50i: change tuning params to cortex-a53	2019-07-04 10:00:17 +02:00
Marcel de Vries	5e1a2937bd	Add wifi support for olinuxino-a64	2019-06-25 23:50:52 +02:00
Hendrik v. Raven	be78fab082	drop layers older than warrior from layercompat	2019-06-25 16:23:08 +02:00
Hendrik v. Raven	f4e059ee3d	sun50i: change tuning params to cortex-a53	2019-06-25 16:17:10 +02:00