Merge pull request #339 from grzegorzheldt/dunfell

Fix nanopi-neo booting on Dunfell

classes/sdcard_image-sunxi.bbclass

@@ -94,10 +94,6 @@ 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/layer.conf

@@ -14,4 +14,4 @@ LAYERVERSION_meta-sunxi = "1"
 
 LAYERDEPENDS_meta-sunxi = "core openembedded-layer"
 
-LAYERSERIES_COMPAT_meta-sunxi = "zeus dunfell gatesgarth hardknott"
+LAYERSERIES_COMPAT_meta-sunxi = "zeus dunfell"

conf/machine/include/sunxi.inc

@@ -1,8 +1,6 @@
 SOC_FAMILY ??= ""
 include conf/machine/include/soc-family.inc
 
-MACHINEOVERRIDES =. "sunxi:"
-
 # Sub-architecture support
 MACHINE_SOCARCH_SUFFIX ?= ""
 MACHINE_SOCARCH_SUFFIX_sun4i = "-sun4i"
@@ -22,7 +20,7 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
 KERNEL_IMAGETYPE ?= "uImage"
 
 IMAGE_CLASSES += "sdcard_image-sunxi"
-IMAGE_FSTYPES += "ext3 tar.gz sunxi-sdimg wic.gz wic.bmap"
+IMAGE_FSTYPES += "ext3 tar.gz sunxi-sdimg"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 
@@ -34,16 +32,3 @@ 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,8 +1,6 @@
 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

@@ -1,9 +0,0 @@
-#@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

@@ -1,10 +0,0 @@
-#@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

@@ -1,8 +0,0 @@
-#@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/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"

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

@@ -1,20 +1,21 @@
-From b1e4b9672d7bdd4a6a4d08b1514b46af25996cc8 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 baaccf145e..77fa1489e4 100644
+index 5ad90ddd16..8b7a4eb45d 100644
 --- a/configs/nanopi_neo_air_defconfig
 +++ b/configs/nanopi_neo_air_defconfig
-@@ -9,3 +9,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

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
+

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

@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend_sunxi := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-DEPENDS_append_sunxi = " bc-native dtc-native swig-native python3-native flex-native bison-native "
+DEPENDS += " bc-native dtc-native swig-native python3-native flex-native bison-native "
 DEPENDS_append_sun50i = " atf-sunxi "
 
-COMPATIBLE_MACHINE_sunxi = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
 
 DEFAULT_PREFERENCE_sun4i="1"
 DEFAULT_PREFERENCE_sun5i="1"
@@ -11,19 +11,23 @@ DEFAULT_PREFERENCE_sun7i="1"
 DEFAULT_PREFERENCE_sun8i="1"
 DEFAULT_PREFERENCE_sun50i="1"
 
-SRC_URI_append_sunxi = " \
+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_sunxi = "scr"
-UBOOT_ENV_sunxi = "boot"
+SRC_URI_append_nanopi-neo = " file://0002-Revert-sunxi-psci-avoid-error-address-of-packed-memb.patch"
 
-EXTRA_OEMAKE_append_sunxi = ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" '
+UBOOT_ENV_SUFFIX = "scr"
+UBOOT_ENV = "boot"
+
+EXTRA_OEMAKE += ' 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_sunxi() {
+do_compile_append() {
     ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
 }

recipes-kernel/linux/linux-mainline.inc

@@ -1,5 +1,6 @@
 SECTION = "kernel"
 LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
 
 inherit kernel
@@ -27,6 +28,5 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \
 
 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"

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

@@ -339,7 +339,6 @@ 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/drm.cfg

@@ -2,7 +2,6 @@ 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.186.bb

@@ -0,0 +1,32 @@
+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] = "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 \
+        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

@@ -1,8 +0,0 @@
-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.111.bb

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

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

@@ -1,8 +0,0 @@
-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

@@ -0,0 +1,6 @@
+require linux-mainline.inc
+
+DESCRIPTION = "Mainline Stable Linux kernel"
+
+SRC_URI[md5sum] = "3ea50025d8c679a327cf2fc225d81a46"
+SRC_URI[sha256sum] = "2bef3edcf44c746383045f4a809b2013e18c52319c827875ed8e89138951cab2"

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"
 

wic/sunxi-sdcard-image.wks.in

@@ -1,18 +0,0 @@
-# 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