conf: added sunxi and sunxi64 machine overrides.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>

README.md

@@ -3,9 +3,9 @@ meta-sunxi
 
 Official sunxi OpenEmbedded layer for Allwinner-based boards.
 
-This layer depends on the additional layer:
+This layer depends on the additional layers:
 
-meta-openembedded: git://git.openembedded.org/meta-openembedded
+* [meta-openembedded/meta-oe](http://git.openembedded.org/meta-openembedded/tree/meta-oe)
 
 Tested with core-image-base.
 
@@ -14,12 +14,13 @@ Maintainers:
 * Nicolas Aguirre <aguirre.nicolas@gmail.com>
 * Enrico Butera <ebutera@users.sourceforge.net>
 * Sergey Lapin <slapin@ossfans.org>
+* Marek Belisko <marek.belisko@gmail.com>
 
 Kernel / U-Boot Version
 ===========
 Most Allwinner devices and hardware are supported in mainline kernel and U-Boot, so this layer builds mainline by default.
 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
@@ -33,6 +34,10 @@ If you already have built the mainline versions it might be necessary to reset t
 
 	bitbake -c clean virtual/kernel virtual/bootloader
 
+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/4921234ed77f9df77c65c88637ce50468f65bde7/conf/machine/include/sunxi.inc#L16)
+
 Performance
 ===========
 The default machine settings are meant to be the lowest common denominator, maximizing generality.

classes/sdcard_image-sunxi.bbclass

@@ -71,16 +71,16 @@ IMAGE_CMD_sunxi-sdimg () {
 		for DTS_FILE in ${KERNEL_DEVICETREE}; do
 			DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
 			DTS_DIR_NAME=`dirname ${DTS_FILE}`
-			if [ -e ${DEPLOY_DIR_IMAGE}/"${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then
+			if [ -e ${DEPLOY_DIR_IMAGE}/"${DTS_BASE_NAME}.dtb" ]; then
 
 				if [ ${DTS_FILE} != ${DTS_BASE_NAME}.dtb ]; then
 					mmd -i ${WORKDIR}/boot.img ::/${DTS_DIR_NAME}
 				fi
 
 				kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`"
-				kernel_bin_for_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${MACHINE},g;s,\.dtb$,.bin,g"`"
+				kernel_bin_for_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${KERNEL_IMAGETYPE},g;s,\.dtb$,.bin,g"`"
 				if [ $kernel_bin = $kernel_bin_for_dtb ]; then
-					mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb ::/${DTS_FILE}
+					mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${DTS_BASE_NAME}.dtb ::/${DTS_FILE}
 				fi
 			fi
 		done

conf/layer.conf

@@ -7,4 +7,11 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
 BBFILE_COLLECTIONS += "meta-sunxi"
 BBFILE_PATTERN_meta-sunxi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-sunxi = "10"
-LAYERSERIES_COMPAT_meta-sunxi = "morty pyro rocko sumo thud"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_meta-sunxi = "1"
+
+LAYERDEPENDS_meta-sunxi = "core openembedded-layer"
+
+LAYERSERIES_COMPAT_meta-sunxi = "morty pyro rocko sumo thud warrior"

conf/machine/include/sun50i.inc

@@ -1,4 +1,4 @@
 require conf/machine/include/sunxi64.inc
-require conf/machine/include/arm/arch-armv8.inc
+require conf/machine/include/arm/arch-armv8a.inc
 
 SOC_FAMILY = "sun50i"

conf/machine/include/sunxi-mali.inc

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

conf/machine/include/sunxi.inc

@@ -1,6 +1,8 @@
 SOC_FAMILY ??= ""
 include conf/machine/include/soc-family.inc
 
+MACHINEOVERRIDES =. "sunxi:"
+
 # Sub-architecture support
 MACHINE_SOCARCH_SUFFIX ?= ""
 MACHINE_SOCARCH_SUFFIX_sun4i = "-sun4i"
@@ -13,6 +15,7 @@ XSERVER = "xserver-xorg \
            xf86-input-keyboard"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
+PREFERRED_VERSION_linux-mainline ?= "4.19%"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
 
@@ -26,7 +29,6 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
 
 UBOOT_ENTRYPOINT ?= "0x40008000"
-UBOOT_LOADADDRESS ?= "0x400080OB00"
 
 SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"
 

conf/machine/include/sunxi64.inc

@@ -1,6 +1,8 @@
 SOC_FAMILY ??= ""
 include conf/machine/include/soc-family.inc
 
+MACHINEOVERRIDES =. "sunxi:sunxi64:"
+
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"

conf/machine/nanopi-m1-plus.conf

@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: nanopi M1 Plus
+#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Neo, based on the Allwinner H3 CPU
+
+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"
+

conf/machine/nanopi-neo-air.conf

@@ -5,7 +5,7 @@
 
 require conf/machine/include/sun8i.inc
 
-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_u-boot = "v2018.09%"
 
 KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo-air.dtb"
 UBOOT_MACHINE = "nanopi_neo_air_defconfig"

conf/machine/nanopi-neo-plus2.conf

@@ -5,7 +5,7 @@
 
 require conf/machine/include/sun50i.inc
 
-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_u-boot = "v2018.09%"
 
 KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo-plus2.dtb"
 UBOOT_MACHINE = "nanopi_neo_plus2_defconfig"

conf/machine/nanopi-neo.conf

@@ -4,7 +4,7 @@
 
 require conf/machine/include/sun8i.inc
 
-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_u-boot = "v2018.09%"
 
 KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
 UBOOT_MACHINE = "nanopi_neo_defconfig"

conf/machine/nanopi-neo2.conf

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

conf/machine/olinuxino-a64.conf

@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: Olimex A64-OLinuXino Board
+#@DESCRIPTION: Machine configuration for the Olimex A64-OLinuXino Board, based on Allwinner A64 CPU
+#https://github.com/OLIMEX/OLINUXINO
+
+require conf/machine/include/sun50i.inc
+
+PREFFERED_VERSION_u-boot = "v2018.09%"
+
+KERNEL_DEVICETREE = "allwinner/sun50i-a64-olinuxino.dtb"
+UBOOT_MACHINE = "a64-olinuxino_defconfig"

conf/machine/orange-pi-one.conf

@@ -4,7 +4,7 @@
 
 require conf/machine/include/sun8i.inc
 
-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_u-boot = "v2018.09%"
 
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
 UBOOT_MACHINE = "orangepi_one_defconfig"

conf/machine/orange-pi-pc-plus.conf

@@ -4,7 +4,7 @@
 
 require conf/machine/include/sun8i.inc
 
-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_u-boot = "v2018.09%"
 
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc-plus.dtb"
 UBOOT_MACHINE = "orangepi_pc_plus_defconfig"

conf/machine/orange-pi-pc.conf

@@ -4,7 +4,7 @@
 
 require conf/machine/include/sun8i.inc
 
-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_u-boot = "v2018.09%"
 
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb"
 UBOOT_MACHINE = "orangepi_pc_defconfig"

conf/machine/orange-pi-zero-plus2.conf

@@ -5,7 +5,7 @@
 
 require conf/machine/include/sun50i.inc
 
-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_u-boot = "v2018.09%"
 
 KERNEL_DEVICETREE = "allwinner/sun50i-h5-orangepi-zero-plus2.dtb"
 UBOOT_MACHINE = "orangepi_zero_plus2_defconfig"

conf/machine/orange-pi-zero.conf

@@ -4,7 +4,7 @@
 
 require conf/machine/include/sun8i.inc
 
-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_u-boot = "v2018.09%"
 
 KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb"
 UBOOT_MACHINE = "orangepi_zero_defconfig"

conf/machine/pcduino.conf

@@ -4,7 +4,7 @@
 
 require conf/machine/include/sun4i.inc
 
-PREFERRED_VERSION_u-boot = "v2018.03%"
+PREFERRED_VERSION_u-boot = "v2018.09%"
 
 KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino_defconfig"

conf/machine/pcduino3.conf

@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: Linksprite A20-pcduino3 Board
+#@DESCRIPTION: Machine configuration for the pcDuino 3, based on Allwinner A20 CPU
+
+require conf/machine/include/sun7i.inc
+
+KERNEL_DEVICETREE = "sun7i-a20-pcduino3.dtb"
+UBOOT_MACHINE = "Linksprite_pcDuino3_defconfig"
+SUNXI_FEX_FILE = "sys_config/a20/linksprite_pcduino3.fex"

conf/machine/pine64-plus.conf

@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: pine64-plus
+#@DESCRIPTION: Machine configuration for the pine64-plus, based on Allwinner A64 CPU
+
+
+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"

recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch

@@ -10,17 +10,11 @@ Signed-off-by: Florin Sarbu <florin@resin.io>
  1 file changed, 1 insertion(+)
 
 diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
-index ca9c2dd..74ce044 100644
+index 8c362fa885..c7929ff015 100644
 --- a/configs/nanopi_neo_air_defconfig
 +++ b/configs/nanopi_neo_air_defconfig
-@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
- CONFIG_CONSOLE_MUX=y
- CONFIG_SPL=y
+@@ -15,3 +15,4 @@ CONFIG_CONSOLE_MUX=y
+ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2
- # CONFIG_CMD_FLASH is not set
- # CONFIG_SPL_DOS_PARTITION is not set
- # CONFIG_SPL_ISO_PARTITION is not set
--- 
-2.7.4
-

recipes-bsp/u-boot/files/u-boot-pylibfdt-native-build.patch

@@ -1,16 +0,0 @@
-diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile
-index 01d5e0ffe3..2b2dfe0bd9 100644
---- a/scripts/dtc/pylibfdt/Makefile
-+++ b/scripts/dtc/pylibfdt/Makefile
-@@ -15,6 +15,8 @@ PYLIBFDT_srcs = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_SRCS)) \
- 
- quiet_cmd_pymod = PYMOD   $@
-       cmd_pymod = unset CC; unset CROSS_COMPILE; unset CFLAGS;\
-+		CC="$(HOSTCC)" \
-+		LDSHARED="$(HOSTLDSHARED)" \
- 		LDFLAGS="$(HOSTLDFLAGS)" \
- 		VERSION="u-boot-$(UBOOTVERSION)" \
- 		CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \
--- 
-2.11.0
-

recipes-bsp/u-boot/u-boot_2018.09.bb

@@ -2,11 +2,11 @@ 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 "
+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=a2c678cfd4a4d97135585cad908541c6"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
 
@@ -17,14 +17,13 @@ DEFAULT_PREFERENCE_sun8i="1"
 DEFAULT_PREFERENCE_sun50i="1"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
-           file://u-boot-pylibfdt-native-build.patch \
            file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
            file://boot.cmd \
            "
 
-SRCREV = "f95ab1fb6e37f0601f397091bb011edf7a98b890"
+SRCREV = "f88b6facb87dc4a52f1630eb9d858c0f54c6628e"
 
-PV = "v2018.03+git${SRCPV}"
+PV = "v2018.09+git${SRCPV}"
 PE = "2"
 
 S = "${WORKDIR}/git"

recipes-graphics/libgles/sunxi-mali_git.bb

@@ -31,7 +31,7 @@ SRC_URI = "gitsm://github.com/linux-sunxi/sunxi-mali.git \
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "libdrm dri2proto libump"
+DEPENDS = "libdrm xorgproto libump patchelf-native"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
 PACKAGECONFIG[wayland] = "EGL_TYPE=framebuffer,,,"
@@ -70,11 +70,13 @@ 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}
 
     mv ${D}${libdir}/libMali.so ${D}${libdir}/libMali.so.3
+    patchelf --set-soname libMali.so.3 ${D}${libdir}/libMali.so.3
     ln -sf libMali.so.3 ${D}${libdir}/libMali.so
 
     for flib in libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0 ; do

recipes-graphics/xorg-xserver/libdri2_git.bb

@@ -3,7 +3,7 @@ DESCRIPTION = "Library for the DRI2 extension to the X Window System"
 LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://COPYING;md5=827da9afab1f727f2a66574629e0f39c"
 
-DEPENDS = "libdrm libxext xextproto libxfixes dri2proto"
+DEPENDS = "libdrm libxext libxfixes xorgproto"
 
 PE = "1"
 PV = "1.0.0+git${SRCPV}"

recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb

@@ -5,7 +5,7 @@ DESCRIPTION = "X.Org X server -- A10/A13 display driver"
 LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f91dc3ee5ce59eb4b528e67e98a31266"
 
-DEPENDS += "sunxi-mali libump xf86driproto"
+DEPENDS += "sunxi-mali libump xorgproto"
 
 PE = "3"
 PV = "0.5.1+git${SRCPV}"

recipes-kernel/linux/linux-mainline/orange-pi-zero/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;
- };

recipes-kernel/linux/linux-mainline_4.19.63.bb

@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Mainline Linux kernel"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
 
 inherit kernel
@@ -18,9 +18,9 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
-	
-SRC_URI[md5sum] = "86f56f586f35ac3a98e086dccfd2ff99"
-SRC_URI[sha256sum] = "6f0a7b3abd48eca3df5e29bfbcfc1c06dd2792f86d23cdb9ad37cf3e572df2e3"
+
+SRC_URI[md5sum] = "5f72b9a1e40192aecf867ff2cdcc15ba"
+SRC_URI[sha256sum] = "75988760b931864b46292dcfad1dd54b3f4da10168041f48ca6d7f6dd4e5d25d"
 
 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 \
 	"

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

@@ -15,17 +15,18 @@ KBRANCH ?= "master"
 # Pull in the devicetree files into the rootfs
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
 
-# Default is to use stable kernel version
-# If you want to use latest git version set to "1"
-DEFAULT_PREFERENCE = "-1"
-
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-	
-# v4.17-rc7
-PV = "v4.17-rc7+git${SRCPV}"
-SRCREV_pn-${PN} = "b04e217704b7f879c6b91222b066983a44a7a09f"
 
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
+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 \
         "
-S = "${WORKDIR}/git"
+
+SRC_URI_append_orange-pi-zero += "\
+	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
+	"

recipes-kernel/linux/linux-mainline_5.2-rc2.bb

@@ -0,0 +1,34 @@
+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-dts-orange-pi-zero-Add-wifi-support.patch \
+	"
+
+FILES_${KERNEL_PACKAGE_NAME}-base_append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
+

recipes-kernel/xradio-firmware/xradio-firmware.bb

@@ -5,19 +5,19 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a
 PV = "1.0"
 PR = "r0"
 
-SRCREV = "8b4a4ed16f7f9d12e59ff2f9ceba3cc335374dbe"
+SRCREV = "bddd21b7f895be9f0c37e435f0a7ac84405c6091"
 
 COMPATIBLE_MACHINE = "orange-pi-zero"
 
-SRC_URI = "git://github.com/armbian/build.git;protocol=https"
+SRC_URI = "git://github.com/armbian/firmware.git;protocol=https"
 
 S = "${WORKDIR}/git"
 
 do_install() {
     install -d ${D}${base_libdir}/firmware/xr819
-    install -m 0644 ${S}/bin/firmware-overlay/xr819/boot_xr819.bin ${D}${base_libdir}/firmware/xr819/
-    install -m 0644 ${S}/bin/firmware-overlay/xr819/sdd_xr819.bin ${D}${base_libdir}/firmware/xr819/
-    install -m 0644 ${S}/bin/firmware-overlay/xr819/fw_xr819.bin ${D}${base_libdir}/firmware/xr819/
+    install -m 0644 ${S}/xr819/boot_xr819.bin ${D}${base_libdir}/firmware/xr819/
+    install -m 0644 ${S}/xr819/sdd_xr819.bin ${D}${base_libdir}/firmware/xr819/
+    install -m 0644 ${S}/xr819/fw_xr819.bin ${D}${base_libdir}/firmware/xr819/
 }
 
 FILES_${PN} = "${base_libdir}/*"

recipes-support/sunxi-tools/sunxi-tools_git.bb

@@ -10,6 +10,8 @@ DEPENDS += "libusb"
 SRC_URI = "git://github.com/linux-sunxi/sunxi-tools;protocol=git"
 SRCREV = "9a3d62aa0c820b3dd42ba3409b2043f4143683cd"
 
+inherit pkgconfig
+
 S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native nativesdk"