linux-mainline: Added fix for bananapi

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

classes/sdcard_image-sunxi.bbclass

@@ -17,7 +17,7 @@ inherit image_types
 IMAGE_TYPEDEP_sunxi-sdimg = "${SDIMG_ROOTFS_TYPE}"
 
 # Boot partition volume id
-BOOTDD_VOLUME_ID ?= "boot"
+BOOTDD_VOLUME_ID ?= "${MACHINE}"
 
 # Boot partition size [in KiB]
 BOOT_SPACE ?= "40960"
@@ -94,6 +94,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

conf/machine/bananapi-m2m.conf

@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: bananapi-m2m
-#@DESCRIPTION: Machine configuration for the Banana Pi M2M, base on Allwinner H8 CPU
-
-require conf/machine/include/sun8i.inc
-
-KERNEL_DEVICETREE = "sun8i-r16-bananapi-m2m.dtb"
-UBOOT_MACHINE = "Bananapi_m2m_defconfig"
-

conf/machine/bananapi-m2plus.conf

@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: bananapi-m2plus
-#@DESCRIPTION: Machine configuration for the Banana Pi M2+, base on Allwinner H3 CPU
-
-require conf/machine/include/sun8i.inc
-
-KERNEL_DEVICETREE = "sun8i-h3-bananapi-m2-plus.dtb"
-UBOOT_MACHINE = "bananapi_m2_plus_h3_defconfig"
-

conf/machine/bananapi-m64.conf

@@ -1,8 +0,0 @@
-#@TYPE: Machine
-#@NAME: pine64-plus
-#@DESCRIPTION: Machine configuration for the pine64-plus, based on Allwinner A64 CPU
-
-require conf/machine/include/sun50i.inc
-
-KERNEL_DEVICETREE = "allwinner/sun50i-a64-bananapi-m64.dtb"
-UBOOT_MACHINE = "bananapi_m64_defconfig"

conf/machine/orange-pi-plus2e.conf

@@ -1,8 +0,0 @@
-#@TYPE: Machine
-#@NAME: orange-pi-plus2e
-#@DESCRIPTION: Machine configuration for the orange-pi-plus2e, base on allwinner H3 CPU
-
-require conf/machine/include/sun8i.inc
-
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-plus2e.dtb"
-UBOOT_MACHINE = "orangepi_plus2e_defconfig"

recipes-bsp/atf/atf-sunxi_git.bb

@@ -1,26 +1,16 @@
-inherit deploy
-
-DESCRIPTION = "ARM Trusted Firmware"
+DESCRIPTION = "ARM Trusted Firmware Allwinner"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
+LIC_FILES_CHKSUM = "file://license.md;md5=829bdeb34c1d9044f393d5a16c068371"
 
-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"
+SRC_URI = "git://github.com/apritzel/arm-trusted-firmware;nobranch=1"
+SRCREV = "aa75c8da415158a94b82a430b2b40000778e851f"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
-COMPATIBLE_MACHINE = "(sun50iw2|sun50iw6|sun50i)"
+COMPATIBLE_MACHINE = "(sun50i)"
 
-PLATFORM_sun50iw2 = "sun50i_a64"
-PLATFORM_sun50i = "sun50i_a64"
-PLATFORM_sun50iw6 = "sun50i_h6"
+PLATFORM_sun50i = "sun50iw1p1"
 
 LDFLAGS[unexport] = "1"
 
@@ -32,8 +22,6 @@ do_compile() {
       all
 }
 
-do_deploy() {
-    install -D -p -m 0644 ${B}/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31.bin
+do_install() {
+    install -D -p -m 0644 ${B}/${PLATFORM}/release/bl31.bin ${DEPLOY_DIR_IMAGE}/bl31.bin
 }
-
-addtask deploy after do_compile

recipes-bsp/u-boot/files/0002-Revert-sunxi-psci-avoid-error-address-of-packed-memb.patch

@@ -1,67 +0,0 @@
-From bb6f500c10cc8f5f31245626899e0732b7b287c5 Mon Sep 17 00:00:00 2001
-From: Marek Belisko <marek.belisko@open-nandra.com>
-Date: Wed, 19 Aug 2020 13:39:49 +0200
-Subject: [PATCH] Revert "sunxi: psci: avoid error address-of-packed-member"
-
-This reverts commit 9bd34a69a453d409792e08c00953ce8862145e65.
----
- arch/arm/cpu/armv7/sunxi/psci.c | 16 +++++-----------
- 1 file changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
-index 5b68900..2c5d99e 100644
---- a/arch/arm/cpu/armv7/sunxi/psci.c
-+++ b/arch/arm/cpu/armv7/sunxi/psci.c
-@@ -75,7 +75,7 @@ static void __secure __mdelay(u32 ms)
- 	isb();
- }
- 
--static void __secure clamp_release(void __maybe_unused *clamp)
-+static void __secure clamp_release(u32 __maybe_unused *clamp)
- {
- #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
- 	defined(CONFIG_MACH_SUN8I_H3) || \
-@@ -90,7 +90,7 @@ static void __secure clamp_release(void __maybe_unused *clamp)
- #endif
- }
- 
--static void __secure clamp_set(void __maybe_unused *clamp)
-+static void __secure clamp_set(u32 __maybe_unused *clamp)
- {
- #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
- 	defined(CONFIG_MACH_SUN8I_H3) || \
-@@ -99,28 +99,22 @@ static void __secure clamp_set(void __maybe_unused *clamp)
- #endif
- }
- 
--static void __secure sunxi_power_switch(void *clamp, void *pwroff_ptr, bool on,
-+static void __secure sunxi_power_switch(u32 *clamp, u32 *pwroff, bool on,
- 					int cpu)
- {
--	u32 pwroff;
--
--	memcpy(&pwroff, pwroff_ptr, sizeof(u32));
--
- 	if (on) {
- 		/* Release power clamp */
- 		clamp_release(clamp);
- 
- 		/* Clear power gating */
--		clrbits_le32(&pwroff, BIT(cpu));
-+		clrbits_le32(pwroff, BIT(cpu));
- 	} else {
- 		/* Set power gating */
--		setbits_le32(&pwroff, BIT(cpu));
-+		setbits_le32(pwroff, BIT(cpu));
- 
- 		/* Activate power clamp */
- 		clamp_set(clamp);
- 	}
--
--	memcpy(pwroff_ptr, &pwroff, sizeof(u32));
- }
- 
- #ifdef CONFIG_MACH_SUN8I_R40
--- 
-2.7.4
-

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

@@ -15,8 +15,6 @@ SRC_URI += " \
            file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
            file://boot.cmd \
            "
-# fix booting issue on orange pi zero
-SRC_URI_append_orange-pi-zero = " file://0002-Revert-sunxi-psci-avoid-error-address-of-packed-memb.patch"
 
 UBOOT_ENV_SUFFIX = "scr"
 UBOOT_ENV = "boot"

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

@@ -19,8 +19,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 
-SRC_URI[md5sum] = "dfb4db3d95bdcd8114281e32eb0be5cd"
-SRC_URI[sha256sum] = "d8c5d7844214510e85ceb9f5236f27f63fc03535a143f3aaa0c1677a8f92e631"
+SRC_URI[md5sum] = "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 \

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

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

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

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

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

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a
 PV = "1.0"
 PR = "r0"
 
-SRCREV = "761658e1701c77a0a84706754e6db1a25ee60b82"
+SRCREV = "bddd21b7f895be9f0c37e435f0a7ac84405c6091"
 
 COMPATIBLE_MACHINE = "orange-pi-zero"
 

recipes-kernel/xradio/xradio.bb

@@ -11,11 +11,9 @@ RDEPENDS_${PN} += "xradio-firmware"
 
 COMPATIBLE_MACHINE = "orange-pi-zero"
 
-SRCREV = "279868ac96f6db34b65f68c6722830fa0aacb86b"
+SRCREV = "d649e5a78efdc56ecd0951e35ca60db175650232"
 
-SRC_URI = "\
-	   git://github.com/dbeinder/xradio.git;protocol=https;branch=karabek_rebase \
-	file://0001-Enable-out-of-tree-compilation.patch \
+SRC_URI = "git://github.com/fifteenhex/xradio.git;protocol=https \
           "
 
 S = "${WORKDIR}/git"

recipes-kernel/xradio/xradio/0001-Enable-out-of-tree-compilation.patch

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