修改文档

README.md

@@ -46,9 +46,18 @@ Gerber:
 
 Linux Kernel: https://github.com/niuyuling/linux  
 U-BOOT: https://github.com/niuyuling/u-boot  
-使用[ArmDebian](https://git.aixiao.me/aixiao/build.git)构建系统，是官方也非官方(二次修改)。  
-如果自己构建请选择 Debian GNU/Linux 12 (bookworm) 系统并且安装 Docker version 24.0.7 磁盘不少于 60G，内存不少于 2G。  
 
+如果自己构建请选择 Debian GNU/Linux 12 (bookworm) 系统并且安装 Docker version 24.0.7 磁盘不少于 60G，内存不少于 2G。  
+如果选择 ArmDebian 官方 [build](https://github.com/armbian/build) 构建系统，请下载补丁文件 [blueberry.patch](SF/ArmDebian/blueberry.patch)  
+```
+apt-get -y install git
+git clone --depth=1 --branch=main https://github.com/armbian/build
+cd build
+git apply ../blueberry.patch # 打补丁
+./compile.sh build BOARD=blueberry BRANCH=legacy BUILD_DESKTOP=no BUILD_MINIMAL=yes KERNEL_CONFIGURE=yes RELEASE=bookworm
+```
+
+如果使用 [build](https://git.aixiao.me/aixiao/build.git) 构建系统，是官方也非官方(二次修改)。  
 ```
 apt-get -y install git
 git clone --depth=1 --branch=main https://git.aixiao.me/aixiao/build.git

SF/ArmDebian/blueberry.conf

@@ -0,0 +1,14 @@
+# Allwinner H616 quad core 2GB RAM SoC WiFi
+BOARD_NAME="Blueberry"
+BOARDFAMILY="sun50iw9-blb"
+BOARD_MAINTAINER="blueberry"
+BOOTCONFIG="blueberry_defconfig"
+DEFAULT_CONSOLE="serial"
+SERIALCON="ttyS0"
+KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="legacy"
+FORCE_BOOTSCRIPT_UPDATE="yes"
+BOOTFS_TYPE="fat"
+BOOT_FS_LABEL="BOOT"
+OVERLAY_PREFIX="sun50i-h616"
+BOOT_FDT_FILE="allwinner/sun50i-h616-blueberry-sd.dtb"

SF/ArmDebian/sun50iw9-blb.conf

@@ -0,0 +1,83 @@
+#
+# 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-blb
+		KERNELSOURCE='https://github.com/niuyuling/linux.git'
+		declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
+		KERNELBRANCH="branch:linux-6.1.y-blb"
+		KERNELPATCHDIR="NEED-NOT"
+		BOOTSOURCE='https://github.com/niuyuling/u-boot.git'
+		BOOTBRANCH='branch:v2023.07-blb'
+		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'
+		KERNEL_DRIVERS_SKIP+=(driver_rtw88) # This is custom 6.1 driver, skip rtw88 to avoid patching failures
+		;;
+
+	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'
+
+		# Stick to 6.2.16 kernel for edge until ws2812 driver is fixed
+		if [[ "$BRANCH" == "edge" ]]; then
+			LINUXFAMILY="sun50iw9-btt"       # Use a separate kernel deb
+			LINUXCONFIG="linux-sunxi64-edge" # But the same kernel config, will be modified below in armbian_kernel_config__enable_ws2812_driver
+			KERNEL_MAJOR_MINOR="6.2"
+			KERNELBRANCH="tag:v6.2.16"
+			KERNELPATCHDIR="archive/sunxi-${KERNEL_MAJOR_MINOR}"
+		fi
+
+		;;
+esac
+
+# Enable ws2812 driver for edge kernel
+function armbian_kernel_config__enable_ws2812_driver() {
+	if [[ "$BRANCH" == "edge" ]]; then
+		kernel_config_modifying_hashes+=("CONFIG_LEDS_WS2812=m")
+		if [[ -f .config ]]; then
+			kernel_config_set_m CONFIG_LEDS_WS2812
+		fi
+	fi
+}
+
+# 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/
+
+}