Merge branch 'main' into v23.05

config/boards/bananapim2s.wip

@@ -8,6 +8,6 @@ SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-a311d-bananapi-m2s.dtb"
 
-# Newer u-boot; new DT, Makefile and defconfig in patch/u-boot/v2022.10/board_bananapi-m2s
+# Newer u-boot; new DT, Makefile and defconfig in patch/u-boot/v2022.10/board_bananapim2s
 BOOTBRANCH_BOARD="tag:v2022.10"
-BOOTPATCHDIR="v2022.10"
+BOOTPATCHDIR="v2022.10/board_bananapim2s" # this avoid the "USB first" patch in the v2022.10 folder

config/boards/bananapim5.conf

@@ -8,4 +8,4 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOTBRANCH_BOARD="tag:v2022.10"
-BOOTPATCHDIR="v2022.10"
+BOOTPATCHDIR="v2022.10/board_bananapim5" # this avoid the "USB first" patch in the v2022.10 folder

config/boards/bigtreetech-cb1.conf

@@ -0,0 +1,12 @@
+# Allwinner H616 quad core 512MB/1GB RAM SoC WiFi
+BOARD_NAME="BigTreeTech CB1"
+BOARDFAMILY="sun50iw9-btt"
+BOOTCONFIG="bigtreetech_cb1_defconfig"
+DEFAULT_CONSOLE="serial"
+SERIALCON="ttyS0"
+KERNEL_TARGET="legacy"
+FORCE_BOOTSCRIPT_UPDATE="yes"
+BOOTFS_TYPE="fat"
+BOOT_FS_LABEL="BOOT"
+OVERLAY_PREFIX="sun50i-h616"
+BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-cb1-sd.dtb"

config/desktop/focal/environments/i3-wm/architectures

@@ -1 +1 @@
-armhf, arm64, amd64
+armhf, arm64, amd64, riscv64

config/sources/families/sun50iw9-btt.conf

@@ -0,0 +1,64 @@
+#
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (c) 2013-2023 Igor Pecovnik, igor@armbian.com
+#
+# This file is a part of the Armbian Build Framework
+# https://github.com/armbian/build/
+#
+source "${BASH_SOURCE%/*}/include/sunxi64_common.inc"
+
+[[ -z $CPUMIN ]] && CPUMIN=480000
+[[ -z $CPUMAX ]] && CPUMAX=1512000
+GOVERNOR=ondemand
+
+case $BRANCH in
+
+	legacy)
+		LINUXFAMILY=sun50iw9-btt
+		KERNELSOURCE='https://github.com/bigtreetech/linux.git'
+		declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
+		KERNELBRANCH="branch:linux-6.1.y-cb1"
+		KERNELPATCHDIR="NEED-NOT"
+		BOOTSOURCE='https://github.com/bigtreetech/u-boot.git'
+		BOOTBRANCH='branch:v2023.07-cb1'
+		BOOTPATCHDIR='NEED-NOT'
+		BOOTDELAY=-2
+		ASOUND_STATE='asound.state.sun50iw9-legacy'
+
+		ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
+		ATFBRANCH='branch:master'
+		ATF_PLAT="sun50i_h616"
+		ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
+		BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
+
+		;;
+
+	current | edge)
+		ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
+		ATFBRANCH='branch:master'
+		ATF_PLAT="sun50i_h616"
+		ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
+		BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
+
+		;;
+esac
+
+# This build requires busybox (and dos2unix)
+function add_host_dependencies__sun50iw9_add_busybox_hostdep() {
+	display_alert "Adding busybox dep" "for ${BOARD} bootloader compile" "debug"
+	declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} busybox"
+}
+
+function family_tweaks_s() {
+	if [[ -f $SDCARD/lib/systemd/system/hdmi-audio.service ]]; then
+		chroot $SDCARD /bin/bash -c "systemctl --no-reload enable hdmi-audio.service >/dev/null 2>&1"
+	fi
+}
+
+function family_tweaks_bsp() {
+	install -m 755 $SRC/packages/blobs/sunxi/h616/inithdmiaudio $destination/usr/bin/
+	cp $SRC/packages/blobs/sunxi/h616/libtinyalsa.so $destination/usr/lib/
+	cp $SRC/packages/bsp/sunxi/hdmi-audio.service $destination/lib/systemd/system/
+
+}

patch/u-boot/v2022.10/board_bananapim2s/meson64-boot-nvme-scsi-first.patch

@@ -0,0 +1,19 @@
+diff --git a/include/configs/meson64.h b/include/configs/meson64.h
+index 9244601284..cdfc605ed5 100644
+--- a/include/configs/meson64.h
++++ b/include/configs/meson64.h
+@@ -71,12 +71,12 @@
+ #ifndef BOOT_TARGET_DEVICES
+ #define BOOT_TARGET_DEVICES(func) \
+ 	func(ROMUSB, romusb, na)  \
++	BOOT_TARGET_NVME(func) \
++	BOOT_TARGET_SCSI(func) \
+ 	func(MMC, mmc, 0) \
+ 	func(MMC, mmc, 1) \
+ 	func(MMC, mmc, 2) \
+ 	BOOT_TARGET_DEVICES_USB(func) \
+-	BOOT_TARGET_NVME(func) \
+-	BOOT_TARGET_SCSI(func) \
+ 	func(PXE, pxe, na) \
+ 	func(DHCP, dhcp, na)
+ #endif

patch/u-boot/v2022.10/board_bananapim5/meson64-boot-nvme-scsi-first.patch

@@ -0,0 +1,19 @@
+diff --git a/include/configs/meson64.h b/include/configs/meson64.h
+index 9244601284..cdfc605ed5 100644
+--- a/include/configs/meson64.h
++++ b/include/configs/meson64.h
+@@ -71,12 +71,12 @@
+ #ifndef BOOT_TARGET_DEVICES
+ #define BOOT_TARGET_DEVICES(func) \
+ 	func(ROMUSB, romusb, na)  \
++	BOOT_TARGET_NVME(func) \
++	BOOT_TARGET_SCSI(func) \
+ 	func(MMC, mmc, 0) \
+ 	func(MMC, mmc, 1) \
+ 	func(MMC, mmc, 2) \
+ 	BOOT_TARGET_DEVICES_USB(func) \
+-	BOOT_TARGET_NVME(func) \
+-	BOOT_TARGET_SCSI(func) \
+ 	func(PXE, pxe, na) \
+ 	func(DHCP, dhcp, na)
+ #endif