Merge branch 'armbian:main' into main

.github/CODEOWNERS

@@ -30,6 +30,7 @@ config/boards/espressobin.conf		@ManoftheSea
 config/boards/firefly-rk3399.conf		@150balbes
 config/boards/fxblox-rk1.wip		@mahdichi
 config/boards/helios4.conf		@Heisath
+config/boards/hinlink-h28k.csc		@sputnik2019
 config/boards/indiedroid-nova.csc		@lanefu
 config/boards/jethubj100.conf		@adeepn
 config/boards/jethubj80.conf		@adeepn
@@ -44,7 +45,6 @@ config/boards/khadas-vim4.wip		@rpardini
 config/boards/lafrite.conf		@Tonymac32
 config/boards/lepotato.conf		@Tonymac32
 config/boards/licheepi-4a.wip		@chainsx
-config/boards/mangopi-mq.wip		@Zinput
 config/boards/mekotronics-r58-minipc.wip		@monkaBlyat
 config/boards/mekotronics-r58x-4g.wip		@monkaBlyat
 config/boards/mekotronics-r58x.wip		@monkaBlyat
@@ -92,6 +92,7 @@ config/boards/rockpro64.conf		@joekhoobyar
 config/boards/rpi4b.conf		@PanderMusubi @teknoid
 config/boards/sk-am62b.conf		@glneo
 config/boards/sk-am64b.conf		@glneo
+config/boards/sk-tda4vm.conf		@glneo
 config/boards/station-m1.conf		@150balbes
 config/boards/station-m2.conf		@150balbes
 config/boards/station-m3.conf		@150balbes
@@ -105,7 +106,6 @@ config/boards/uefi-arm64.conf		@rpardini
 config/boards/uefi-x86.conf		@rpardini
 config/kernel/linux-arm64-*.config		@rpardini
 config/kernel/linux-bcm2711-*.config		@PanderMusubi @teknoid
-config/kernel/linux-d1-*.config		@Zinput
 config/kernel/linux-k3-*.config		@glneo
 config/kernel/linux-media-*.config		@150balbes
 config/kernel/linux-meson-*.config		@hzyitc
@@ -115,7 +115,7 @@ config/kernel/linux-mvebu-*.config		@Heisath
 config/kernel/linux-mvebu64-*.config		@ManoftheSea
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-rk3568-odroid-*.config		@rpardini
-config/kernel/linux-rk35xx-*.config		@Tonymac32 @ZazaBR @amazingfate @catalinii @efectn @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @vamzii
+config/kernel/linux-rk35xx-*.config		@Tonymac32 @ZazaBR @amazingfate @catalinii @efectn @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
 config/kernel/linux-rockchip-*.config		@paolosabatino
 config/kernel/linux-rockchip-rk3588-*.config		@Tonymac32 @amazingfate @efectn @lanefu @linhz0hz
 config/kernel/linux-rockchip64-*.config		@Manouchehri @TRSx80 @Tonymac32 @ZazaBR @ahoneybun @amazingfate @brentr @catalinii @clee @joekhoobyar @krachlatte @paolosabatino @schwar3kat @vamzii
@@ -135,7 +135,7 @@ patch/kernel/archive/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretm
 patch/kernel/archive/mvebu-*/		@Heisath
 patch/kernel/archive/odroidxu4-*/		@joekhoobyar
 patch/kernel/archive/rk3568-odroid-*/		@rpardini
-patch/kernel/archive/rk35xx-*/		@Tonymac32 @ZazaBR @amazingfate @catalinii @efectn @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @vamzii
+patch/kernel/archive/rk35xx-*/		@Tonymac32 @ZazaBR @amazingfate @catalinii @efectn @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
 patch/kernel/archive/rockchip-*/		@paolosabatino
 patch/kernel/archive/rockchip64-*/		@Manouchehri @TRSx80 @Tonymac32 @ZazaBR @ahoneybun @amazingfate @brentr @catalinii @clee @joekhoobyar @krachlatte @paolosabatino @schwar3kat @vamzii
 patch/kernel/archive/rockpis-*/		@brentr
@@ -144,15 +144,14 @@ patch/kernel/archive/sunxi-*/		@AGM1968 @AaronNGray @DylanHP @Kreyren @PanderMus
 patch/kernel/archive/uefi-arm64-*/		@rpardini
 patch/kernel/arm64-*/		@rpardini
 patch/kernel/bcm2711-*/		@PanderMusubi @teknoid
-patch/kernel/d1-*/		@Zinput
 patch/kernel/k3-*/		@glneo
 patch/kernel/media-*/		@150balbes
 patch/kernel/meson-*/		@hzyitc
 patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 patch/kernel/mvebu-*/		@Heisath
 patch/kernel/mvebu64-*/		@ManoftheSea
 patch/kernel/odroidxu4-*/		@joekhoobyar
-patch/kernel/rk35xx-*/		@Tonymac32 @ZazaBR @amazingfate @catalinii @efectn @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @vamzii
+patch/kernel/rk35xx-*/		@Tonymac32 @ZazaBR @amazingfate @catalinii @efectn @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
 patch/kernel/rockchip-*/		@paolosabatino
 patch/kernel/rockchip-rk3588-*/		@Tonymac32 @amazingfate @efectn @lanefu @linhz0hz
 patch/kernel/rockchip64-*/		@Manouchehri @TRSx80 @Tonymac32 @ZazaBR @ahoneybun @amazingfate @brentr @catalinii @clee @joekhoobyar @krachlatte @paolosabatino @schwar3kat @vamzii
@@ -163,7 +162,6 @@ patch/kernel/uefi-arm64-*/		@rpardini
 patch/kernel/uefi-x86-*/		@rpardini
 sources/families/arm64.conf		@rpardini
 sources/families/bcm2711.conf		@PanderMusubi @teknoid
-sources/families/d1.conf		@Zinput
 sources/families/k3.conf		@glneo
 sources/families/media.conf		@150balbes
 sources/families/meson-s4t7.conf		@rpardini @viraniac
@@ -173,7 +171,7 @@ sources/families/mvebu.conf		@Heisath
 sources/families/mvebu64.conf		@ManoftheSea
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/rk3568-odroid.conf		@rpardini
-sources/families/rk35xx.conf		@Tonymac32 @ZazaBR @amazingfate @catalinii @efectn @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @vamzii
+sources/families/rk35xx.conf		@Tonymac32 @ZazaBR @amazingfate @catalinii @efectn @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
 sources/families/rockchip-rk3588.conf		@Tonymac32 @amazingfate @efectn @lanefu @linhz0hz
 sources/families/rockchip.conf		@paolosabatino
 sources/families/rockchip64.conf		@Manouchehri @TRSx80 @Tonymac32 @ZazaBR @ahoneybun @amazingfate @brentr @catalinii @clee @joekhoobyar @krachlatte @paolosabatino @schwar3kat @vamzii

.github/workflows/kernel-security-analysis-pr.yml

@@ -31,7 +31,7 @@ jobs:
 
        - name: Get changed files
          id: changed-files
-         uses: tj-actions/changed-files@v38
+         uses: tj-actions/changed-files@v39
 
        - name: Checkout repository
          uses: actions/checkout@v4

.github/workflows/lint-scripts-pr.yml

@@ -27,7 +27,7 @@ jobs:
 
        - name: Get changed files
          id: changed-files
-         uses: tj-actions/changed-files@v38
+         uses: tj-actions/changed-files@v39
 
        - name: List all changed files
          run: |

.github/workflows/scorecard.yml

@@ -50,7 +50,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: SARIF file
           path: results.sarif

VERSION

@@ -1 +1 @@
-23.08.0-trunk
+23.11.0-trunk

config/boards/hinlink-h28k.csc

@@ -0,0 +1,22 @@
+# Rockchip RK3528 quad core 1-8GB SoC GBe eMMC PCIE2.0/USB3
+BOARD_NAME="HinLink H28k"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="hinlink_rk3528_defconfig"
+BOARD_MAINTAINER="sputnik2019"
+KERNEL_TARGET="legacy"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3528-hinlink-h28k.dtb"
+BOOT_SCENARIO="spl-blobs"
+WIREGUARD="no"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+BOOTFS_TYPE="ext4"
+
+# Override family config for this board; let's avoid conditionals in family config.
+function post_family_config__hinlink-h28k_use_vendor_uboot() {
+	BOOTSOURCE='https://github.com/rockchip-linux/u-boot.git'
+	BOOTBRANCH='commit:32640b0ada9344f91e7a407576568782907161cd'
+	BOOTPATCHDIR="legacy/board_hinlink-h28k"
+}

config/boards/inovato-quadra.csc

@@ -0,0 +1,14 @@
+# Allwinner H6 quad core 2GB SoC WiFi eMMC
+BOARD_NAME="Inovato Quadra"
+BOARDFAMILY="sun50iw6"
+BOARD_MAINTAINER=""
+BOOTCONFIG="tanix_tx6_defconfig"
+CRUSTCONFIG="tanix_tx6_defconfig"
+BOOT_FDT_FILE="allwinner/sun50i-h6-inovato-quadra.dtb"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current,edge"
+BOOT_LOGO="desktop"
+FULL_DESKTOP="yes"
+SRC_EXTLINUX="yes"
+SRC_CMDLINE="console=ttyS0,115200 console=tty0 mem=2048M video=HDMI-A-1:e"
+OFFSET=16

config/boards/licheepi-4a.wip

@@ -2,17 +2,21 @@
 BOARD_NAME="LicheePi 4A"
 BOARDFAMILY="thead"
 BOARD_MAINTAINER="chainsx"
-KERNEL_TARGET="legacy"
-BOOT_FDT_FILE="thead/light-lpi4a.dtb"
+KERNEL_TARGET="legacy,edge"
+BOOT_FDT_FILE="thead/th1520-lichee-pi-4a.dtb"
 SRC_EXTLINUX="yes"
-SRC_CMDLINE="console=ttyS0,115200 rootwait rw earlycon clk_ignore_unused loglevel=7 eth=$ethaddr rootrwoptions=rw,noatime rootrwreset=yes"
+SRC_CMDLINE="console=ttyS0,115200 rootwait rw earlycon clk_ignore_unused loglevel=7 eth=\$ethaddr rootrwoptions=rw,noatime rootrwreset=yes"
 BOOTCONFIG="light_lpi4a_defconfig"
 SKIP_BOOTSPLASH="yes"
 BOOTFS_TYPE="ext4"
 
 function post_family_tweaks__licheepi4a() {
-    display_alert "Applying blobs"
+    display_alert "Applying boot blobs"
 	cp -v "$SRC/packages/blobs/riscv64/thead/light_aon_fpga.bin" "$SDCARD/boot/light_aon_fpga.bin"
 	cp -v "$SRC/packages/blobs/riscv64/thead/light_c906_audio.bin" "$SDCARD/boot/light_c906_audio.bin"
 	cp -v "$SRC/packages/blobs/riscv64/thead/fw_dynamic.bin" "$SDCARD/boot/fw_dynamic.bin"
+
+    display_alert "Temp add HDMI audio output on Volume control"
+    	mkdir -p $SDCARD/etc/pulse/
+	echo "load-module module-alsa-sink device=hw:0,2" >> "$SDCARD/etc/pulse/default.pa"
 }

config/boards/mangopi-mq.csc

@@ -0,0 +1,9 @@
+# RISC-V Mangopi-MQ D1
+BOARD_NAME="Mangopi-MQ"
+BOARDFAMILY="d1"
+BOARD_MAINTAINER=""
+KERNEL_TARGET="edge"
+BOOT_FDT_FILE="allwinner/sun20i-d1-nezha.dtb"
+SRC_EXTLINUX="yes"
+SRC_CMDLINE="console=ttyS0,115200n8 console=tty0 earlycon=sbi cma=96M rootflags=data=writeback stmmaceth=chain_mode:1 rw"
+BOOTCONFIG="nezha_defconfig"

config/boards/mekotronics-r58x-4g.wip

@@ -7,3 +7,6 @@ declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-edge-v12-linux.dtb" # Specif
 
 # Source vendor-specific configuration
 source "${SRC}/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh"
+
+# Board-specific override
+declare -g BOOTCONFIG="rk3588_meko_r58x_defconfig" # specific, with nvme

config/boards/mixtile-blade3.wip

@@ -18,8 +18,8 @@ declare -g BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
 # post_family_config hook which only runs when branch is legacy.
 function post_family_config_branch_legacy__uboot_mixtile() {
 	display_alert "$BOARD" "Configuring Mixtile u-boot" "info"
-	declare -g BOOTSOURCE='https://github.com/rockchip-linux/u-boot.git'
-	declare -g BOOTBRANCH="commit:cc781e0266d589b937b5af9e4850fb1e7222f0f1" # specific commit in next-dev branch; tested to work
+	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	declare -g BOOTBRANCH="commit:ddc91cd08c10f625f7a7c93033042aa4071c78a8" # specific commit in next-dev branch
 	declare -g OVERLAY_PREFIX='rockchip-rk3588'
 	declare -g BOOTDIR="u-boot-${BOARD}"                   # do not share u-boot directory
 	declare -g BOOTPATCHDIR="legacy/u-boot-mixtile-rk3588" # Few patches in there; defconfig & PD hacks

config/boards/nanopct4.csc

@@ -1,6 +1,7 @@
 # Rockchip RK3399 hexa core 4GB RAM SoC GBE USB3 USB-C WiFi/BT eMMC NVMe
 BOARD_NAME="NanoPC T4"
 BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER=""
 BOOTCONFIG="nanopc-t4-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
@@ -10,20 +11,3 @@ BOOT_FDT_FILE="rockchip/rk3399-nanopc-t4.dtb"
 BOOT_SCENARIO="spl-blobs"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyS2,1500000 console=tty0"
-
-function post_family_tweaks_bsp__nanopc-t4_BSP() {
-    display_alert "Installing BSP firmware and fixups"
-
-	if [[ $BRANCH == legacy ]]; then
-
-		# Bluetooth for most of others (custom patchram is needed only in legacy)
-		install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
-		cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
-
-		# need to swap chips in the service
-		sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
-
-	fi
-
-	return 0
-}

config/boards/nanopi-r6s.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="legacy"
+KERNEL_TARGET="legacy,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-nanopi-r6s.dtb"
@@ -23,3 +23,15 @@ function post_family_tweaks__nanopir6s_naming_audios() {
 
 	return 0
 }
+
+function post_family_tweaks__nanopir6s_udev_network_interfaces() {
+	display_alert "$BOARD" "Renaming interfaces WAN LAN1 LAN2" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	cat << EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
+SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNELS=="fe1c0000.ethernet", NAME:="wan"
+SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8169", KERNELS=="0003:31:00.0", NAME:="lan1"
+SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8169", KERNELS=="0004:41:00.0", NAME:="lan2"
+EOF
+
+}

config/boards/odroidxu4.conf

@@ -6,3 +6,4 @@ BOOTCONFIG="odroid-xu4_defconfig"
 SERIALCON="ttySAC2"
 KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
+KERNEL_TEST_TARGET="current"

config/boards/orangepi3-lts.csc

@@ -3,8 +3,8 @@ BOARD_NAME="Orange Pi 3 LTS"
 BOARDFAMILY="sun50iw6"
 BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi_3_lts_defconfig"
+BOOT_LOGO="desktop"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current,edge"
-MODULES="sprdbt_tty sprdwl_ng"
-MODULES_BLACKLIST_LEGACY="bcmdhd"
-CRUSTCONFIG="h6_defconfig"
+MODULES="sprdbt_tty"
+CRUSTCONFIG="orangepi_3_lts_defconfig"

config/boards/orangepi3.csc

@@ -6,4 +6,4 @@ BOOTCONFIG="orangepi_3_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current,edge"
 FULL_DESKTOP="yes"
-CRUSTCONFIG="h6_defconfig"
+CRUSTCONFIG="orangepi_3_defconfig"

config/boards/orangepi3b.csc

@@ -1,8 +1,9 @@
-# Rockchip RK3566 quad core 4GB RAM SoC WIFI/BT eMMC USB2
+# Rockchip RK3566 quad core 4/8GB RAM SoC WIFI/BT eMMC USB2 USB3 NVMe PCIe GbE HDMI SPI
 BOARD_NAME="orangepi3b"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi-3b-rk3566_defconfig"
+BOOT_SOC="rk3566"
 KERNEL_TARGET="legacy,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -14,9 +15,60 @@ BOOT_SPI_RKSPI_LOADER="yes"
 MODULES="sprdbt_tty sprdwl_ng"
 MODULES_BLACKLIST_LEGACY="bcmdhd"
 
+# Newer blobs. Tested to work with opi3b
+DDR_BLOB="rk35/rk3566_ddr_1056MHz_v1.18.bin"
+BL31_BLOB="rk35/rk3568_bl31_v1.43.elf"         # NOT a typo, bl31 is shared across 68 and 66
+ROCKUSB_BLOB="rk35/rk3566_spl_loader_1.14.bin" # For `EXT=rkdevflash` flashing
+
 # Override family config for this board; let's avoid conditionals in family config.
-function post_family_config__orangepi3b_use_vendor_uboot() {
-	BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git'
-	BOOTBRANCH='branch:v2017.09-rk3588'
-	BOOTPATCHDIR="legacy"
+function post_family_config__orangepi3b_use_mainline_uboot() {
+	display_alert "$BOARD" "mainline u-boot overrides" "info"
+
+	BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git"
+	BOOTBRANCH="commit:63073b4af636146d26a7f0f258610eed060c8f34" # specific commit, from "branch:rk3568-2023.10"
+	BOOTDIR="u-boot-${BOARD}"                                    # do not share u-boot directory
+	BOOTPATCHDIR="v2023.10-orangepi3b"                           # empty, patches are already in Kwiboo's branch:rk3568-2023.10
+
+	BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin u-boot.itb idbloader.img idbloader-spi.img"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd if=${1}/u-boot-rockchip.bin of=${2} bs=32k seek=1 conv=fsync
+	}
+
+	# Smarter/faster/better to-spi writer using flashcp (hopefully with --partition), using the binman-provided 'u-boot-rockchip-spi.bin'
+	function write_uboot_platform_mtd() {
+		declare -a extra_opts_flashcp=("--verbose")
+		if flashcp -h | grep -q -e '--partition'; then
+			echo "Confirmed flashcp supports --partition -- read and write only changed blocks." >&2
+			extra_opts_flashcp+=("--partition")
+		else
+			echo "flashcp does not support --partition, will write full SPI flash blocks." >&2
+		fi
+		flashcp "${extra_opts_flashcp[@]}" "${1}/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+
+}
+
+function add_host_dependencies__new_uboot_wants_python3_orangepi3b() {
+	declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools" # @TODO: convert to array later
+}
+
+function post_family_tweaks_bsp__orangepi3b() {
+	display_alert "$BOARD" "Installing sprd-bluetooth.service" "info"
+
+	# Bluetooth on orangepi3b board is handled by a Spreadtrum (sprd) chip and requires
+	# a custom hciattach_opi binary, plus a systemd service to run it at boot time
+	install -m 755 $SRC/packages/bsp/rk3399/hciattach_opi $destination/usr/bin
+	cp $SRC/packages/bsp/rk3399/sprd-bluetooth.service $destination/lib/systemd/system/
+
+	return 0
+}
+
+function post_family_tweaks__orangepi3b_enable_services() {
+	display_alert "$BOARD" "Enabling sprd-bluetooth.service" "info"
+	chroot_sdcard systemctl enable sprd-bluetooth.service
+	return 0
 }

config/boards/orangepi5-plus.conf

@@ -5,6 +5,7 @@ BOARD_MAINTAINER="efectn"
 BOOTCONFIG="orangepi_5_plus_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
 KERNEL_TARGET="legacy,edge"
+KERNEL_TEST_TARGET="legacy"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-plus.dtb"

config/boards/orangepi5.conf

@@ -6,6 +6,7 @@ BOOTCONFIG="orangepi_5_defconfig" # vendor name, not standard, see hook below, s
 BOOTCONFIG_SATA="orangepi_5_sata_defconfig"
 BOOT_SOC="rk3588"
 KERNEL_TARGET="legacy,edge"
+KERNEL_TEST_TARGET="legacy"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb"

config/boards/orangepilite2.csc

@@ -4,4 +4,4 @@ BOARDFAMILY="sun50iw6"
 BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi_lite2_defconfig"
 KERNEL_TARGET="legacy,current,edge"
-CRUSTCONFIG="h6_defconfig"
+CRUSTCONFIG="orangepi_3_lts_defconfig"

config/boards/orangepioneplus.csc

@@ -4,4 +4,4 @@ BOARDFAMILY="sun50iw6"
 BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi_one_plus_defconfig"
 KERNEL_TARGET="legacy,current,edge"
-CRUSTCONFIG="h6_defconfig"
+CRUSTCONFIG="orangepi_3_lts_defconfig"