linux-mainline: Added patch for nanopi-r1

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

classes/sdcard_image-sunxi.bbclass

@@ -13,11 +13,14 @@ inherit image_types
 #
 #
 
+# Use an uncompressed ext4 by default as rootfs
+SDIMG_ROOTFS_TYPE ?= "ext4"
+
 # This image depends on the rootfs image
-IMAGE_TYPEDEP_sunxi-sdimg = "${SDIMG_ROOTFS_TYPE}"
+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"
@@ -25,8 +28,6 @@ BOOT_SPACE ?= "40960"
 # First partition begin at sector 2048 : 2048*1024 = 2097152
 IMAGE_ROOTFS_ALIGNMENT = "2048"
 
-# Use an uncompressed ext4 by default as rootfs
-SDIMG_ROOTFS_TYPE ?= "ext4"
 SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
 
 do_image_sunxi_sdimg[depends] += " \
@@ -40,7 +41,7 @@ do_image_sunxi_sdimg[depends] += " \
 # SD card image name
 SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.sunxi-sdimg"
 
-IMAGE_CMD_sunxi-sdimg () {
+IMAGE_CMD:sunxi-sdimg () {
 
 	# Align partitions
 	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
@@ -94,6 +95,10 @@ IMAGE_CMD_sunxi-sdimg () {
 	then
 		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::boot.scr
 	fi
+        if [ -e "${DEPLOY_DIR_IMAGE}/splash.bmp" ]
+        then
+                mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/splash.bmp ::splash.bmp
+        fi
 
 
 	# Add stamp file
@@ -116,7 +121,7 @@ IMAGE_CMD_sunxi-sdimg () {
 }
 
 # write uboot.itb for arm64 boards
-IMAGE_CMD_sunxi-sdimg_append_sun50i () {
+IMAGE_CMD_sunxi-sdimg:append:sun50i () {
 	if [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_BINARY}" ]
 	then
 		dd if=${DEPLOY_DIR_IMAGE}/${UBOOT_BINARY} of=${SDIMG} bs=1024 seek=40 conv=notrunc

conf/layer.conf

@@ -12,6 +12,6 @@ BBFILE_PRIORITY_meta-sunxi = "10"
 # cause compatibility issues with other layers
 LAYERVERSION_meta-sunxi = "1"
 
-LAYERDEPENDS_meta-sunxi = "core openembedded-layer"
+LAYERDEPENDS_meta-sunxi = "core"
 
-LAYERSERIES_COMPAT_meta-sunxi = "zeus dunfell"
+LAYERSERIES_COMPAT_meta-sunxi = "honister"

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"
+

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"
+

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"

conf/machine/include/hardware/ap6212a.inc

@@ -1,5 +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"
+MACHINE_EXTRA_RRECOMMENDS:append = " kernel-module-brcmfmac"
+MACHINE_EXTRA_RDEPENDS:append = " linux-firmware-bcm43430"

conf/machine/include/sun4i.inc

@@ -1,5 +1,5 @@
 require conf/machine/include/sunxi.inc
 require conf/machine/include/sunxi-mali.inc
-require conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/arm/armv7a/tune-cortexa8.inc
 
 SOC_FAMILY = "sun4i"

conf/machine/include/sun50i.inc

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

conf/machine/include/sun5i.inc

@@ -1,5 +1,5 @@
 require conf/machine/include/sunxi.inc
 require conf/machine/include/sunxi-mali.inc
-require conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/arm/armv8a/tune-cortexa8.inc
 
 SOC_FAMILY = "sun5i"

conf/machine/include/sun7i.inc

@@ -1,5 +1,5 @@
 require conf/machine/include/sunxi.inc
 require conf/machine/include/sunxi-mali.inc
-require conf/machine/include/tune-cortexa7.inc
+require conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 SOC_FAMILY = "sun7i"

conf/machine/include/sun8i.inc

@@ -1,5 +1,5 @@
 require conf/machine/include/sunxi.inc
 require conf/machine/include/sunxi-mali.inc
-require conf/machine/include/tune-cortexa7.inc
+require conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 SOC_FAMILY = "sun8i"

conf/machine/include/sunxi-mali-driver.inc

@@ -4,7 +4,7 @@ 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)}"
+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,14 +15,14 @@ XSERVER = "xserver-xorg \
            xf86-input-keyboard"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
-PREFERRED_VERSION_linux-mainline ?= "5.4.%"
+PREFERRED_VERSION_linux-mainline ?= "5.10.%"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
 
 KERNEL_IMAGETYPE ?= "uImage"
 
 IMAGE_CLASSES += "sdcard_image-sunxi"
-IMAGE_FSTYPES += "ext3 tar.gz sunxi-sdimg"
+IMAGE_FSTYPES += "ext3 tar.gz sunxi-sdimg wic.gz wic.bmap"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 
@@ -32,3 +34,16 @@ SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat"
+
+# Mimic the sdcard_image-sunxi.bbclass
+# image-version-info file was also generated and installed to boot partition,
+# but it is missing here - can be added somehow (how?) if required
+SUNXI_FEX_FILE ?= " "
+SUNXI_BOOT_SPACE ?= "40"
+IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} boot.scr"
+# ship fex file for sunxi kernel, devicetree file for mainline kernel
+IMAGE_BOOT_FILES += "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel', 'linux-sunxi', '${SUNXI_FEX_FILE}', '${KERNEL_DEVICETREE}', d)}"
+WKS_FILES ?= "sunxi-sdcard-image.wks.in"
+WKS_FILE_DEPENDS ?= "virtual/kernel u-boot"
+# in case of sunxi kernel, sunxi-board-fex must be built prior wic image assembly
+WKS_FILE_DEPENDS += " ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel', 'linux-sunxi', 'sunxi-board-fex', '', d)}"

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/licheepi-zero.conf

@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: licheepi-zero
+#@DESCRIPTION: Machine configuration for the licheepi-zero, based on allwinner V3s CPU
+
+require conf/machine/include/sun8i.inc
+
+
+UBOOT_MACHINE = "LicheePi_Zero_defconfig"
+KERNEL_DEVICETREE = "sun8i-v3s-licheepi-zero.dtb"

conf/machine/marsboard-a10.conf

@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@NAME: HAOYU Electronics MarsBoard A10
+#@DESCRIPTION: Machine configuration for the HAOYU Electronics MarsBoard A10, based on Allwinner A10 CPU
+#https://linux-sunxi.org/MarsBoard_A10
+
+require conf/machine/include/sun4i.inc
+
+KERNEL_DEVICETREE = "sun4i-a10-marsboard.dtb"
+UBOOT_MACHINE = "Marsboard_A10_config"
+SUNXI_FEX_FILE = "sys_config/a10/marsboard_a10.fex"

conf/machine/nanopi-m1.conf

@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: NanoPi M1
+#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Neo, based on #the Allwinner H3 CPU
+
+require conf/machine/include/sun8i.inc
+
+KERNEL_DEVICETREE = "sun8i-h3-nanopi-m1.dtb"
+UBOOT_MACHINE = "nanopi_m1_defconfig"

conf/machine/nanopi-r1.conf

@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: NanoPi R1
+#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi R1, based on #the Allwinner H3 CPU
+
+require conf/machine/include/sun8i.inc
+
+KERNEL_DEVICETREE = "sun8i-h3-nanopi-r1.dtb"
+UBOOT_MACHINE = "nanopi_r1_defconfig"

conf/machine/orange-pi-r1.conf

@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: orange-pi-r1
+#@DESCRIPTION: Machine configuration for the orange-pi-r1, base on allwinner H2+ CPU
+
+require conf/machine/include/sun8i.inc
+
+KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-r1.dtb"
+UBOOT_MACHINE = "orangepi_r1_defconfig"
+

recipes-bsp/atf/atf-sunxi_git.bb

@@ -10,7 +10,7 @@ B = "${WORKDIR}/build"
 
 COMPATIBLE_MACHINE = "(sun50i)"
 
-PLATFORM_sun50i = "sun50iw1p1"
+PLATFORM:sun50i = "sun50iw1p1"
 
 LDFLAGS[unexport] = "1"
 

recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb

@@ -9,9 +9,9 @@ PR = "r0"
 
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
 
-SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=git"
+SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=https;branch=master"
 # Increase PV with SRCREV change
-SRCREV = "496ef0fbd166cc2395daa76dd3c359357420963d"
+SRCREV = "af5f938ea14a3614d35ad3d9ab51a5d392117444"
 
 S = "${WORKDIR}/git"
 

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 b1e4b9672d7bdd4a6a4d08b1514b46af25996cc8 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 baaccf145e..77fa1489e4 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"
+@@ -9,3 +9,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

recipes-bsp/u-boot/files/0002-Added-nanopi-r1-board-support.patch

@@ -0,0 +1,167 @@
+From 767a05572ef5b93c2e157749b1754cbe261ee43d Mon Sep 17 00:00:00 2001
+From: Marek Belisko <marek.belisko@open-nandra.com>
+Date: Fri, 8 Apr 2022 11:33:53 +0200
+Subject: [PATCH] Added nanopi-r1 board support
+
+Patch taken from : https://github.com/armbian/build/blob/master/patch/u-boot/u-boot-sunxi/add-nanopi-r1-and-duo2.patch
+
+Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
+---
+ arch/arm/dts/Makefile               |   1 +
+ arch/arm/dts/sun8i-h3-nanopi-r1.dts | 102 ++++++++++++++++++++++++++++++++++++
+ configs/nanopi_r1_defconfig         |  22 ++++++++
+ 3 files changed, 125 insertions(+)
+ create mode 100644 arch/arm/dts/sun8i-h3-nanopi-r1.dts
+ create mode 100644 configs/nanopi_r1_defconfig
+
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index 9fb3868..6743e32 100644
+--- a/arch/arm/dts/Makefile
++++ b/arch/arm/dts/Makefile
+@@ -600,6 +600,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \
+ 	sun8i-h3-nanopi-m1-plus.dtb \
+ 	sun8i-h3-nanopi-neo.dtb \
+ 	sun8i-h3-nanopi-neo-air.dtb \
++	sun8i-h3-nanopi-r1.dtb \
+ 	sun8i-h3-orangepi-2.dtb \
+ 	sun8i-h3-orangepi-lite.dtb \
+ 	sun8i-h3-orangepi-one.dtb \
+diff --git a/arch/arm/dts/sun8i-h3-nanopi-r1.dts b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
+new file mode 100644
+index 0000000..9c3c574
+--- /dev/null
++++ b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
+@@ -0,0 +1,102 @@
++/*
++ * Copyright (C) 2019 Igor Pecovnik <igor@armbian.com>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This file is distributed in the hope that it will be useful,
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++#include "sun8i-h3-nanopi.dtsi"
++
++/ {
++	model = "FriendlyARM NanoPi R1";
++	compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3";
++
++	reg_gmac_3v3: gmac-3v3 {
++		compatible = "regulator-fixed";
++		pinctrl-names = "default";
++		regulator-name = "gmac-3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		startup-delay-us = <100000>;
++		enable-active-high;
++		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
++	};
++
++};
++
++&ehci0 {
++	status = "okay";
++};
++
++&pio {
++	gmac_power_pin_nanopi: gmac_power_pin@0 {
++		pins = "PD6";
++		function = "gpio_out";
++	};
++};
++
++&ohci0 {
++	status = "okay";
++};
++
++&mmc2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc2_8bit_pins>;
++	vmmc-supply = <&reg_vcc3v3>;
++	bus-width = <8>;
++	non-removable;
++	cap-mmc-hw-reset;
++	status = "okay";
++};
++
++&emac {
++	pinctrl-names = "default";
++	pinctrl-0 = <&emac_rgmii_pins>;
++	phy-supply = <&reg_gmac_3v3>;
++	phy-handle = <&ext_rgmii_phy>;
++	phy-mode = "rgmii";
++
++	status = "okay";
++};
++
++&external_mdio {
++	ext_rgmii_phy: ethernet-phy@1 {
++		compatible = "ethernet-phy-ieee802.3-c22";
++		reg = <7>;
++	};
++};
+diff --git a/configs/nanopi_r1_defconfig b/configs/nanopi_r1_defconfig
+new file mode 100644
+index 0000000..e028b41
+--- /dev/null
++++ b/configs/nanopi_r1_defconfig
+@@ -0,0 +1,22 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_SPL=y
++CONFIG_MACH_SUN8I_H3=y
++CONFIG_DRAM_CLK=408
++CONFIG_DRAM_ZQ=3881979
++CONFIG_DRAM_ODT_EN=y
++CONFIG_MACPWR="PD6"
++# CONFIG_VIDEO_DE2 is not set
++CONFIG_NR_DRAM_BANKS=1
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_CONSOLE_MUX=y
++CONFIG_SYS_CLK_FREQ=480000000
++# CONFIG_CMD_FLASH is not set
++# CONFIG_SPL_DOS_PARTITION is not set
++# CONFIG_SPL_EFI_PARTITION is not set
++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-r1"
++CONFIG_SUN8I_EMAC=y
++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
+-- 
+2.7.4
+

recipes-bsp/u-boot/u-boot-sunxi.bb

@@ -19,7 +19,7 @@ UBOOT_MACHINE_olinuxino-a10s = "A10s-OLinuXino-Micro_config"
 UBOOT_MACHINE_meleg = "Mele_A1000G_config"
 
 SRC_URI = " \
-	git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi \
+	git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=https;branch=sunxi \
 	file://0001-gcc5-fixes.patch \
 	file://0002-gcc6-fixes.patch \
 	file://0003-No-gcc-version-specific-includes.patch \

recipes-bsp/u-boot/u-boot_%.bbappend

@@ -1,29 +1,30 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:sunxi := "${THISDIR}/files:"
 
-DEPENDS += " bc-native dtc-native swig-native python3-native flex-native bison-native "
-DEPENDS_append_sun50i = " atf-sunxi "
+DEPENDS:append:sunxi = " bc-native dtc-native swig-native python3-native flex-native bison-native "
+DEPENDS:append:sun50i = " atf-sunxi "
 
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
+COMPATIBLE_MACHINE:sunxi = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
 
-DEFAULT_PREFERENCE_sun4i="1"
-DEFAULT_PREFERENCE_sun5i="1"
-DEFAULT_PREFERENCE_sun7i="1"
-DEFAULT_PREFERENCE_sun8i="1"
-DEFAULT_PREFERENCE_sun50i="1"
+DEFAULT_PREFERENCE:sun4i = "1"
+DEFAULT_PREFERENCE:sun5i = "1"
+DEFAULT_PREFERENCE:sun7i = "1"
+DEFAULT_PREFERENCE:sun8i = "1"
+DEFAULT_PREFERENCE:sun50i = "1"
 
-SRC_URI += " \
-           file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
-           file://boot.cmd \
-           "
+SRC_URI:append:sunxi = " \
+        file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
+	file://0002-Added-nanopi-r1-board-support.patch \
+        file://boot.cmd \
+"
 
-UBOOT_ENV_SUFFIX = "scr"
-UBOOT_ENV = "boot"
+UBOOT_ENV_SUFFIX:sunxi = "scr"
+UBOOT_ENV:sunxi = "boot"
 
-EXTRA_OEMAKE += ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" '
-EXTRA_OEMAKE_append_sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin "
+EXTRA_OEMAKE:append:sunxi = ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" '
+EXTRA_OEMAKE:append:sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin "
 
 do_compile_sun50i[depends] += "atf-sunxi:do_deploy"
 
-do_compile_append() {
+do_compile:append:sunxi() {
     ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
 }

recipes-devtools/python/pya20_0.2.12.bb

@@ -15,7 +15,7 @@ S = "${WORKDIR}/pyA20-${PV}"
 
 inherit distutils3
 
-do_compile_prepend() { 
+do_compile:prepend() { 
 cp ${WORKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
 }
 

recipes-graphics/libgles/sunxi-mali_git.bb

@@ -21,7 +21,7 @@ python __anonymous() {
         raise bb.parse.SkipPackage("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv))
 }
 
-SRCREV_pn-${PN} = "d343311efc8db166d8371b28494f0f27b6a58724"
+SRCREV = "d343311efc8db166d8371b28494f0f27b6a58724"
 SRC_URI = "gitsm://github.com/linux-sunxi/sunxi-mali.git \
            file://0001-Add-EGLSyncKHR-EGLTimeKHR-and-GLChar-definition.patch \
            file://0002-Add-missing-GLchar-definition.patch \
@@ -92,13 +92,13 @@ do_install() {
 # Packages like xf86-video-fbturbo dlopen() libUMP.so, so we do need to ship the .so files in ${PN}
 PACKAGES =+ "${PN}-test"
 
-RPROVIDES_${PN} += "libGLESv2.so libEGL.so libGLESv2.so libGLESv1_CM.so libMali.so"
-RDEPENDS_${PN}-test = "${PN}"
+RPROVIDES:${PN} += "libGLESv2.so libEGL.so libGLESv2.so libGLESv1_CM.so libMali.so"
+RDEPENDS:${PN}-test = "${PN}"
 
-FILES_${PN} += "${libdir}/lib*.so"
-FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig/*"
-FILES_${PN}-test = "${bindir}/sunximali-test"
+FILES:${PN} += "${libdir}/lib*.so"
+FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig/*"
+FILES:${PN}-test = "${bindir}/sunximali-test"
 
 # These are closed binaries generated elsewhere so don't check ldflags & text relocations
-INSANE_SKIP_${PN} = "dev-so ldflags textrel"
-INSANE_SKIP_${PN}-test = "dev-so ldflags textrel"
+INSANE_SKIP:${PN} = "dev-so ldflags textrel"
+INSANE_SKIP:${PN}-test = "dev-so ldflags textrel"

recipes-graphics/libump/libump_git.bb

@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=edf7fb6071cae7ec80d537a05ee17198
 inherit autotools
 
 PV = "r4p0-00rel0+git${SRCPV}"
-SRCREV_pn-${PN} = "ec0680628744f30b8fac35e41a7bd8e23e59c39f"
+SRCREV = "ec0680628744f30b8fac35e41a7bd8e23e59c39f"
 
-SRC_URI = "git://github.com/linux-sunxi/libump.git"
+SRC_URI = "git://github.com/linux-sunxi/libump.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 

recipes-graphics/mesa/mesa_%.bbappend

@@ -1,5 +1,5 @@
 # Enable lima and panfrost Mesa drivers
-PACKAGECONFIG_append_use-mailine-graphics = " lima panfrost"
+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"
+GALLIUMDRIVERS:append:use-mailine-graphics = ",kmsro"

recipes-graphics/tslib/tslib_1.1.bbappend.disabled

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://tslib.patch"
 

recipes-graphics/xorg-xserver/libdri2_git.bb

@@ -9,7 +9,7 @@ PE = "1"
 PV = "1.0.0+git${SRCPV}"
 SRC_URI = "git://github.com/robclark/libdri2.git;protocol=http;branch=master"
 
-SRCREV_pn-${PN} = "4f1eef3183df2b270c3d5cbef07343ee5127a6a4"
+SRCREV = "4f1eef3183df2b270c3d5cbef07343ee5127a6a4"
 
 S = "${WORKDIR}/git"
 

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

@@ -9,7 +9,7 @@ DEPENDS += "sunxi-mali libump xorgproto"
 
 PE = "3"
 PV = "0.5.1+git${SRCPV}"
-SRCREV_pn-${PN} = "e094e3c8f9004ca3347694bd05b99d136e8621b9"
+SRCREV = "e094e3c8f9004ca3347694bd05b99d136e8621b9"
 
 SRC_URI = "git://github.com/ssvb/xf86-video-fbturbo.git;protocol=http;branch=master \
            file://20-fbturbo.conf"
@@ -18,9 +18,9 @@ S = "${WORKDIR}/git"
 
 CFLAGS += " -I${STAGING_INCDIR}/xorg "
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${datadir}/X11/xorg.conf.d
     install -m 0644 ${WORKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d
 }
 
-FILES_${PN} += "${datadir}/X11/xorg.conf.d/20-fbturbo.conf"
+FILES:${PN} += "${datadir}/X11/xorg.conf.d/20-fbturbo.conf"

recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend

@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

recipes-kernel/linux-firmware/linux-firmware_%.bbappend

@@ -6,7 +6,7 @@
 # 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() {
+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

recipes-kernel/linux/linux-mainline.inc

@@ -21,11 +21,13 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 S = "${WORKDIR}/linux-${PV}"
 
 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://0002-ARM-dts-sun8i-h3-Add-initial-NanoPi-R1-support.patch \
 	file://defconfig \
 "
 
-SRC_URI_append_use-mailine-graphics = " file://drm.cfg"
+SRC_URI:append:use-mailine-graphics = " file://drm.cfg"
+SRC_URI:append:bananapi = " file://axp20x.cfg"
+SRC_URI:append:cubietruck = " file://axp20x.cfg"
 
-FILES_${KERNEL_PACKAGE_NAME}-base_append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
+FILES_${KERNEL_PACKAGE_NAME}-base:append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"

recipes-kernel/linux/linux-mainline/0002-ARM-dts-sun8i-h3-Add-initial-NanoPi-R1-support.patch

@@ -0,0 +1,236 @@
+From 692c8efb60d033fa0df3d79d4aee6e3e1d966425 Mon Sep 17 00:00:00 2001
+From: Marek Belisko <marek.belisko@open-nandra.com>
+Date: Wed, 13 Apr 2022 11:19:29 +0200
+Subject: [PATCH] ARM: dts: sun8i: h3: Add initial NanoPi R1 support
+
+The NanoPi R1 is a complete open source board developed
+by FriendlyElec for makers, hobbyists, fans and etc.
+
+NanoPi R1 key features
+- Allwinner H3, Quad-core Cortex-A7@1.2GHz
+- 512MB/1GB DDR3 RAM
+- 8GB eMMC
+- microSD slot
+- 10/100/1000M Ethernet x 1
+- 10/100 Ethernet x 1
+- Wifi 802.11b/g/n
+- Bluetooth 4.0
+- Serial Debug Port
+- 5V 2A DC power-supply
+
+Signed-off-by: Yu-Tung Chang <mtwget@gmail.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://lore.kernel.org/r/20201102100157.85801-2-mtwget@gmail.com
+---
+ Documentation/devicetree/bindings/arm/sunxi.yaml |   5 +
+ arch/arm/boot/dts/Makefile                       |   1 +
+ arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts         | 169 +++++++++++++++++++++++
+ 3 files changed, 175 insertions(+)
+ create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts
+
+diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml
+index cab8e1b..5424bab 100644
+--- a/Documentation/devicetree/bindings/arm/sunxi.yaml
++++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
+@@ -251,6 +251,11 @@ properties:
+           - const: friendlyarm,nanopi-neo-plus2
+           - const: allwinner,sun50i-h5
+ 
++      - description: FriendlyARM NanoPi R1
++        items:
++          - const: friendlyarm,nanopi-r1
++          - const: allwinner,sun8i-h3
++
+       - description: Gemei G9 Tablet
+         items:
+           - const: gemei,g9
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 4c3ba04..494639a 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -1240,6 +1240,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
+ 	sun8i-h3-nanopi-m1-plus.dtb \
+ 	sun8i-h3-nanopi-neo.dtb \
+ 	sun8i-h3-nanopi-neo-air.dtb \
++	sun8i-h3-nanopi-r1.dtb \
+ 	sun8i-h3-orangepi-2.dtb \
+ 	sun8i-h3-orangepi-lite.dtb \
+ 	sun8i-h3-orangepi-one.dtb \
+diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts
+new file mode 100644
+index 0000000..204a39f
+--- /dev/null
++++ b/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts
+@@ -0,0 +1,169 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (C) 2019 Igor Pecovnik <igor@armbian.com>
++ * Copyright (C) 2020 Jayantajit Gogoi <jayanta.gogoi525@gmail.com>
++ * Copyright (C) 2020 Yu-Tung Chang <mtwget@gmail.com>
++*/
++
++#include "sun8i-h3-nanopi.dtsi"
++#include <dt-bindings/leds/common.h>
++
++/ {
++	model = "FriendlyARM NanoPi R1";
++	compatible = "friendlyarm,nanopi-r1", "allwinner,sun8i-h3";
++
++	aliases {
++		serial1 = &uart1;
++		ethernet0 = &emac;
++		ethernet1 = &wifi;
++	};
++
++	reg_gmac_3v3: gmac-3v3 {
++		compatible = "regulator-fixed";
++		regulator-name = "gmac-3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		startup-delay-us = <100000>;
++		enable-active-high;
++		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
++	};
++
++	reg_vdd_cpux: gpio-regulator {
++		compatible = "regulator-gpio";
++		regulator-name = "vdd-cpux";
++		regulator-type = "voltage";
++		regulator-boot-on;
++		regulator-always-on;
++		regulator-min-microvolt = <1100000>;
++		regulator-max-microvolt = <1300000>;
++		regulator-ramp-delay = <50>;
++		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
++		gpios-states = <0x1>;
++		states = <1100000 0x0
++			  1300000 0x1>;
++	};
++
++	wifi_pwrseq: wifi_pwrseq {
++		compatible = "mmc-pwrseq-simple";
++		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
++		clocks = <&rtc 1>;
++		clock-names = "ext_clock";
++	};
++
++	leds {
++		led-2 {
++			function = LED_FUNCTION_WAN;
++			color = <LED_COLOR_ID_GREEN>;
++			gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */
++		};
++
++		led-3 {
++			function = LED_FUNCTION_LAN;
++			color = <LED_COLOR_ID_GREEN>;
++			gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; /* PA9 */
++		};
++	};
++};
++
++&cpu0 {
++	cpu-supply = <&reg_vdd_cpux>;
++};
++
++&ehci1 {
++	status = "okay";
++};
++
++&ehci2 {
++	status = "okay";
++};
++
++&emac {
++	pinctrl-names = "default";
++	pinctrl-0 = <&emac_rgmii_pins>;
++	phy-supply = <&reg_gmac_3v3>;
++	phy-handle = <&ext_rgmii_phy>;
++	phy-mode = "rgmii-id";
++	status = "okay";
++};
++
++&external_mdio {
++	ext_rgmii_phy: ethernet-phy@7 {
++		compatible = "ethernet-phy-ieee802.3-c22";
++		reg = <7>;
++	};
++};
++
++&mmc1 {
++	vmmc-supply = <&reg_vcc3v3>;
++	vqmmc-supply = <&reg_vcc3v3>;
++	mmc-pwrseq = <&wifi_pwrseq>;
++	bus-width = <4>;
++	non-removable;
++	status = "okay";
++
++	wifi: wifi@1 {
++		reg = <1>;
++		compatible = "brcm,bcm4329-fmac";
++		interrupt-parent = <&pio>;
++		interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */
++		interrupt-names = "host-wake";
++	};
++};
++
++&mmc2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc2_8bit_pins>;
++	vmmc-supply = <&reg_vcc3v3>;
++	vqmmc-supply = <&reg_vcc3v3>;
++	bus-width = <8>;
++	non-removable;
++	status = "okay";
++};
++
++&ohci1 {
++	status = "okay";
++};
++
++&ohci2 {
++	status = "okay";
++};
++
++&reg_usb0_vbus {
++	gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */
++	status = "okay";
++};
++
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart1_pins>;
++	status = "okay";
++};
++
++&uart3 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart3_pins>, <&uart3_rts_cts_pins>;
++	uart-has-rtscts;
++	status = "okay";
++
++	bluetooth {
++		compatible = "brcm,bcm43438-bt";
++		clocks = <&rtc 1>;
++		clock-names = "lpo";
++		vbat-supply = <&reg_vcc3v3>;
++		vddio-supply = <&reg_vcc3v3>;
++		device-wakeup-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
++		host-wakeup-gpios = <&pio 0 7 GPIO_ACTIVE_HIGH>; /* PA7 */
++		shutdown-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
++	};
++};
++
++&usb_otg {
++	status = "okay";
++	dr_mode = "otg";
++};
++
++&usbphy {
++	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
++	usb0_vbus-supply = <&reg_usb0_vbus>;
++	status = "okay";
++};
+-- 
+2.7.4
+

recipes-kernel/linux/linux-mainline/0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch

@@ -1,80 +0,0 @@
-From 4ca766a768e783ee5198f1935b7f46a5df9b4a35 Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <jelle@vdwaa.nl>
-Date: Tue, 23 Jan 2018 15:58:44 -0800
-Subject: [PATCH] ARM: dts: nanopi-neo-air: Add WiFi / eMMC
-
-Enable the WiFi (AP6212) chip and eMMC support for the NanoPi NEO Air.
-
-This patch was originally submitted by Jelle van der Waa. Martin Kelly
-modified it to compile on the latest kernel, fixed up some review
-comments from Maxime Ripard, and re-tested the patch.
-
-The patch has been reworked to add back eMMC support which has been left
-out at the last backport.
-
-Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
-Cc: linux-sunxi@googlegroups.com
-Cc: devicetree@vger.kernel.org
-Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
-Signed-off-by: Martin Kelly <mkelly@xevo.com>
-Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-Signed-off-by: Florin Sarbu <florin@resin.io>
----
- arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 34 +++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
-
-diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
-index 03ff6f8..a9331fe 100644
---- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
-+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
-@@ -72,6 +72,11 @@
- 			gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
- 		};
- 	};
-+
-+	wifi_pwrseq: wifi_pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
-+	};
- };
- 
- &mmc0 {
-@@ -84,6 +89,35 @@
- 	status = "okay";
- };
- 
-+&mmc1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc1_pins_a>;
-+	vmmc-supply = <&reg_vcc3v3>;
-+	vqmmc-supply = <&reg_vcc3v3>;
-+	mmc-pwrseq = <&wifi_pwrseq>;
-+	bus-width = <4>;
-+	non-removable;
-+	status = "okay";
-+
-+	brcmf: bcrmf@1 {
-+		reg = <1>;
-+		compatible = "brcm,bcm4329-fmac";
-+		interrupt-parent = <&pio>;
-+		interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */
-+		interrupt-names = "host-wake";
-+	};
-+};
-+
-+&mmc2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc2_8bit_pins>;
-+	vmmc-supply = <&reg_vcc3v3>;
-+	vqmmc-supply = <&reg_vcc3v3>;
-+	bus-width = <8>;
-+	non-removable;
-+	status = "okay";
-+};
-+
- &uart0 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&uart0_pins_a>;
--- 
-2.11.0
-

recipes-kernel/linux/linux-mainline/aarch64/defconfig

@@ -339,6 +339,7 @@ CONFIG_MFD_MAX77620=y
 CONFIG_MFD_SPMI_PMIC=y
 CONFIG_MFD_RK808=y
 CONFIG_MFD_SEC_CORE=y
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_AXP20X=y
 CONFIG_REGULATOR_FAN53555=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y

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

recipes-kernel/linux/linux-mainline/drm.cfg

@@ -2,6 +2,7 @@ CONFIG_DRM=y
 CONFIG_DRM_SUN4I=y
 CONFIG_DRM_SUN8I_DW_HDMI=y
 CONFIG_DRM_SUN8I_MIXER=y
+CONFIG_IOMMU_SUPPORT=y
 CONFIG_DRM_LIMA=y
 CONFIG_DRM_PANFROST=y
 CONFIG_CMA=y

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

@@ -1,32 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Mainline Longterm 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] = "6287e6d6658e593a2978dc718f7de3f3"
-SRC_URI[sha256sum] = "b4784571bd7f3dc10ae3dc4414876dbd73fc6750401299b206670ce3e5c4bb43"
-
-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 \
-        file://defconfig \
-        "
-
-SRC_URI_append_orange-pi-zero += "\
-	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
-	"

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

@@ -0,0 +1,8 @@
+require linux-mainline.inc
+
+DESCRIPTION = "Mainline Longterm Linux kernel"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+SRC_URI[md5sum] = "0751179f60de73eb2cd93f161fa52fcf"
+SRC_URI[sha256sum] = "3b84e13abae26af17ebccc4d7212f5843a991127a73a320848d5c6942ef781a2"

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

@@ -1,6 +0,0 @@
-require linux-mainline.inc
-
-DESCRIPTION = "Mainline Longterm Linux kernel"
-
-SRC_URI[md5sum] = "dccb4d028c97b6fe5d0bca14a1afcd58"
-SRC_URI[sha256sum] = "92e9f1fd69543e9ce2a9e6eb918823b1846d2dd99246a74456263cd5ad234d89"

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

@@ -0,0 +1,8 @@
+require linux-mainline.inc
+
+DESCRIPTION = "Mainline Longterm Linux kernel"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+
+SRC_URI[md5sum] = "98c8187b801f006ba203db0669e307a5"
+SRC_URI[sha256sum] = "a8b31d716b397303a183e42ad525ff2871024a43e3ea530d0fdf73b7f9d27da7"

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"

recipes-kernel/linux/linux-sunxi_3.4.bb

@@ -3,15 +3,15 @@ require linux.inc
 DESCRIPTION = "Linux kernel for Allwinner a10/a20 processors"
 
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
-RDEPENDS_${PN} += "sunxi-board-fex"
+RDEPENDS:${PN} += "sunxi-board-fex"
 
 PV = "3.4.104"
 PR = "r1"
-SRCREV_pn-${PN} = "d47d367036be38c5180632ec8a3ad169a4593a88"
+SRCREV = "d47d367036be38c5180632ec8a3ad169a4593a88"
 
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR:append = "a"
 
-SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protocol=git \
+SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protocol=https \
         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 \
@@ -26,7 +26,7 @@ S = "${WORKDIR}/git"
 #fix QA issue "Files/directories were installed but not shipped: /usr/src/debug"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
-do_configure_prepend() {
+do_configure:prepend() {
     #fix arch QA issues ("Architecture did not match")
     rm -f ${S}/drivers/net/wireless/rtxx7x/tools/bin2h
     rm -f ${S}/modules/wifi/ar6302/AR6K_SDK_ISC.build_3.1_RC.329/host/lib/wac/wac

recipes-kernel/linux/linux.inc

@@ -39,7 +39,7 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sys
 do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot"
 do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot"
 
-do_configure_prepend() {
+do_configure:prepend() {
     CONF_SED_SCRIPT=""
 
     #
@@ -118,15 +118,9 @@ do_configure_prepend() {
     yes '' | oe_runmake -C ${S} O=${B} oldconfig
 }
 
-do_configure_append() {
+do_configure:append() {
     if test -e scripts/Makefile.fwinst ; then
         sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst
     fi
 }
 
-do_install_append() {
-    oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH
-}
-
-PACKAGES =+ "kernel-headers"
-FILES_kernel-headers = "${exec_prefix}/src/linux*"

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"
 
@@ -20,6 +20,6 @@ do_install() {
     install -m 0644 ${S}/xr819/fw_xr819.bin ${D}${base_libdir}/firmware/xr819/
 }
 
-FILES_${PN} = "${base_libdir}/*"
+FILES:${PN} = "${base_libdir}/*"
 
 PACKAGES = "${PN}"

recipes-kernel/xradio/xradio.bb

@@ -7,13 +7,15 @@ inherit module
 PV = "0.1"
 PR = "r0"
 
-RDEPENDS_${PN} += "xradio-firmware"
+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"

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
+

recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb

@@ -10,14 +10,14 @@ inherit autotools pkgconfig
 # 0.10.1 Initial Import
 SRCREV = "908987a74d341be1376895023698667892fe5569"
 
-SRC_URI = "git://github.com/ebutera/gst-plugin-cedar.git"
+SRC_URI = "git://github.com/ebutera/gst-plugin-cedar.git;protocol=https;branch=master"
 
 PV = "0.10.1+git${SRCPV}"
 PR = "r1"
 
 S = "${WORKDIR}/git"
 
-FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
-FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"
+FILES:${PN} += "${libdir}/gstreamer-0.10/*.so"
+FILES:${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+FILES:${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
+FILES:${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"

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

@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS += "libusb"
 
-SRC_URI = "git://github.com/linux-sunxi/sunxi-tools;protocol=git"
+SRC_URI = "git://github.com/linux-sunxi/sunxi-tools;protocol=https;branch=master"
 SRCREV = "9a3d62aa0c820b3dd42ba3409b2043f4143683cd"
 
 inherit pkgconfig
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native nativesdk"
 
-FILES_${PN} = "${bindir}/*"
+FILES:${PN} = "${bindir}/*"
 
 CFLAGS = "-std=c99 -D_POSIX_C_SOURCE=200112L -I./include"
 CFLAGS_class-native = "-std=c99 -D_POSIX_C_SOURCE=200112L -I./include"

wic/sunxi-sdcard-image.wks.in

@@ -0,0 +1,18 @@
+# short-description: Create SD card image with a boot partition
+# long-description:
+# Create an image that can be written onto a SD card using dd for use
+# with Allwinner arm (32-bit) SoC family
+#
+# The disk layout used is:
+#  - --------------------------- -------------- --------------
+# | | u-boot-sunxi-with-spl.bin |     boot     |    rootfs    |
+#  - --------------------------- -------------- --------------
+# ^ ^                           ^              ^              ^
+# | |                           |              |              |
+# 0 |                         2MiB  ${SUNXI_BOOT_SPACE}MiB  ${SUNXI_BOOT_SPACE}MiB + rootfs + IMAGE_EXTRA_SPACE
+#   8KiB 
+#
+
+part u-boot --source rawcopy --sourceparams="file=${SPL_BINARY}" --ondisk mmcblk0 --no-table --align 8
+part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 2048 --fixed-size ${SUNXI_BOOT_SPACE}
+part /     --source rootfs --ondisk mmcblk0 --fstype=ext4 --align 2048