Merge branch 'armbian:main' into main

xaqbr · Jun 23, 2024 · 6b761cc · 6b761cc
2 parents d86dbc8 + 75ce67f
commit 6b761cc
Show file tree

Hide file tree

Showing 213 changed files with 7,033 additions and 52,402 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -14,27 +14,27 @@
 - all:
   - changed-files:
     - any-glob-to-any-file: ['patch/**/*','config/**/*']
-    - any-glob-to-all-files: ['!config/cli/*','!config/desktop/*','!config/distributions/*']
+    - any-glob-to-all-files: ['!config/cli/**/*','!config/desktop/**/*','!config/distributions/**/*']
 
 "Framework":
 - all:
   - changed-files:
-    - any-glob-to-any-file: ['lib/*','tools/*','config/cli/*','packages/*','extensions/*']
+    - any-glob-to-any-file: ['lib/**/*','tools/**/*','config/cli/**/*','packages/**/*','extensions/**/*']
 
 "Actions scripts":
 - all:
   - changed-files:
-    - any-glob-to-any-file: ['.github/workflows/*']
+    - any-glob-to-any-file: ['.github/workflows/**/*']
 
 "Desktop":
 - all:
   - changed-files:
-    - any-glob-to-any-file: ['config/desktop/*']
+    - any-glob-to-any-file: ['config/desktop/**/*']
 
 "Patches":
 - all:
   - changed-files:
-    - any-glob-to-any-file: ['patch/*']
+    - any-glob-to-any-file: ['patch/**/*']
 
 # Add 'Documentation' label to any change to .md files within the entire repository 
 "Documentation":

diff --git a/config/boards/khadas-edge2.conf b/config/boards/khadas-edge2.conf
@@ -14,10 +14,28 @@ enable_extension "bluetooth-hciattach"                                       # E
 declare -g KHADAS_OOWOW_BOARD_ID="Edge2" # for use with EXT=output-image-oowow
 declare -g UEFI_EDK2_BOARD_ID="edge2"    # This _only_ used for uefi-edk2-rk3588 extension
 
+function post_family_tweaks__kedge2_naming_audios() {
+	display_alert "$BOARD" "Renaming khadas-edge2 audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}
+
+declare -g DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
+declare -g BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
+declare -g BL32_BLOB='rk35/rk3588_bl32_v1.15.bin'
+
 # for the kedge2, we're counting on the blobs+u-boot in SPI working, as it comes from factory. It does not support bootscripts.
 function post_family_config__uboot_kedge2() {
-	display_alert "$BOARD" "Configuring ($BOARD) non-u-boot" "info"
-	unset BOOTSOURCE
-	declare -g BOOTCONFIG='none'
+	display_alert "$BOARD" "Configuring ($BOARD) u-boot" "info"
+
+	declare -g BOOTSOURCE='https://github.com/khadas/u-boot.git'
+	declare -g BOOTBRANCH='branch:khadas-edges-v2017.09'
+	declare -g BOOTPATCHDIR="legacy/u-boot-khadas-edge2-rk3588"
+	declare -g BOOTCONFIG="khadas-edge2-rk3588s_defconfig"
 	declare -g SRC_EXTLINUX="yes" # For now, use extlinux. Thanks Monka
 }
diff --git a/config/boards/lckfb-taishanpi.csc b/config/boards/lckfb-taishanpi.csc
@@ -0,0 +1,21 @@
+# Rockchip RK3566 quad core 1GB-2GB GBE eMMC USB3 WiFi
+BOARD_NAME="LCKFB Taishan Pi"
+BOARDFAMILY="rk35xx"
+BOARD_MAINTAINER=""
+BOOTCONFIG="radxa-zero3-rk3566_defconfig"
+KERNEL_TARGET="legacy,vendor"
+BOOT_FDT_FILE="rockchip/rk3566-taishanpi-v10.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+
+# Override family config for this board; let's avoid conditionals in family config.
+function post_family_config__tspi_use_radxa_vendor() {
+	BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	BOOTBRANCH='branch:rk35xx-2024.01'
+	BOOTPATCHDIR="u-boot-radxa-latest"
+	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+	function write_uboot_platform() {
+		dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
+	}
+}
diff --git a/config/boards/leez-p710.csc b/config/boards/leez-p710.csc
@@ -0,0 +1,10 @@
+# Rockchip RK3399 hexa core 4GB RAM SOC 16GB eMMC 2x USB2 1x USB3 1x USB-C HDMI 1x GbE WiFi/BT
+BOARD_NAME="Lenovo Leez P710"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="Andyshrk"
+BOOTCONFIG="leez-rk3399_defconfig"
+BOOT_FDT_FILE="rockchip/rk3399-leez-p710.dtb"
+BOOT_LOGO="desktop"
+BOOT_SCENARIO="blobless"
+FULL_DESKTOP="yes"
+KERNEL_TARGET="current,edge"
diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf
@@ -1,4 +1,4 @@
-# Rockchip RK3588 octa core 4/8/16GB RAM SoC NVMe USB3 USB-C 2.5GbE eMMC
+# Rockchip RK3588 octa core 4/8/16GB RAM SoC SPI NVMe 2x USB2 2x USB3 1x USB-C 2x 2.5GbE 3x HDMI
 BOARD_NAME="Orange Pi 5 Plus"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
@@ -10,6 +10,8 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-plus.dtb"
 BOOT_SCENARIO="spl-blobs"
+DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
+BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
@@ -28,9 +30,39 @@ function post_family_tweaks__orangepi5plus_naming_audios() {
 	return 0
 }
 
-# Override uboot family config for this board; let's avoid conditionals in family config.
-function post_family_config__orangepi5plus_use_vendor_uboot() {
+# Use vendor-provided U-Boot for 'legacy' kernel branch; let's avoid conditionals in family config.
+function post_family_config_branch_legacy__orangepi5plus_use_vendor_uboot() {
 	BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git'
 	BOOTBRANCH='branch:v2017.09-rk3588'
 	BOOTPATCHDIR="legacy/u-boot-orangepi5-rk3588"
 }
+
+# Use vendor-provided U-Boot for 'vendor' kernel branch; let's avoid conditionals in family config.
+function post_family_config_branch_vendor__orangepi5plus_use_vendor_uboot() {
+	BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git'
+	BOOTBRANCH='branch:v2017.09-rk3588'
+	BOOTPATCHDIR="legacy/u-boot-orangepi5-rk3588"
+}
+
+# Mainline U-Boot for edge kernel
+function post_family_config_branch_edge__orangepi5plus_use_mainline_uboot() {
+	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
+
+	declare -g BOOTCONFIG="orangepi-5-plus-rk3588_defconfig"      # override the default for the board/family
+	declare -g BOOTDELAY=1                                        # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"  # We ❤️ mainline U-Boot
+	declare -g BOOTBRANCH="tag:v2024.07-rc4"
+	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
+	declare -g BOOTDIR="u-boot-${BOARD}"                          # do not share u-boot directory
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
+	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=notrunc status=none
+	}
+
+	function write_uboot_platform_mtd() {
+		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+}
diff --git a/config/boards/station-m2.csc b/config/boards/station-m2.csc
@@ -2,29 +2,34 @@
 BOARD_NAME="Station M2"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
-BOOTCONFIG="firefly-m2-rk3568_defconfig"
+BOOTCONFIG="station-m2-rk3566_defconfig"
 KERNEL_TARGET="legacy,vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-firefly-roc-pc.dtb"
-SRC_EXTLINUX="yes"
-SRC_CMDLINE="console=ttyS02,1500000 console=tty0"
+BOOT_SCENARIO="spl-blobs"
 ASOUND_STATE="asound.state.station-m2"
 IMAGE_PARTITION_TABLE="gpt"
 
 function post_family_tweaks__station_m2() {
     display_alert "$BOARD" "Installing board tweaks" "info"
 
-	cp -R $SRC/packages/blobs/rtl8723bt_fw/* $SDCARD/lib/firmware/rtl_bt/
 	cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/
 
 	return 0
 }
 
 # Override family config for this board; let's avoid conditionals in family config.
-function post_family_config__stationm2_use_vendor_uboot() {
-	BOOTSOURCE='https://github.com/150balbes/u-boot-rk'
-	BOOTBRANCH='branch:rk356x'
-	BOOTDIR="u-boot-${BOARD}"
-	BOOTPATCHDIR="u-boot-station-p2"
+function post_family_config__stationm2_use_radxa_vendor_uboot() {
+	BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	BOOTBRANCH='branch:rk35xx-2024.01'
+	BOOTPATCHDIR="u-boot-radxa-latest"
+
+	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
+
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+
+	function write_uboot_platform() {
+		dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
+	}
 }
diff --git a/config/boards/xiaomi-elish.conf b/config/boards/xiaomi-elish.conf
@@ -37,6 +37,10 @@ function post_family_tweaks_bsp__xiaomi-elish_firmware() {
 	install -Dm655 $SRC/packages/bsp/usb-gadget-network/remove-usbgadget-network.sh $destination/usr/local/bin/
 	install -Dm644 $SRC/packages/bsp/usb-gadget-network/usbgadget-rndis.service $destination/usr/lib/systemd/system/
 
+	# Bluetooth MAC addr setup service
+	install -Dm655 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.sh $destination/usr/local/bin/
+	install -Dm644 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.service $destination/usr/lib/systemd/system/
+
 	# Kernel postinst script to update abl boot partition
 	install -Dm655 $SRC/packages/bsp/xiaomi-elish/zz-update-abl-kernel $destination/etc/kernel/postinst.d/
 
@@ -71,6 +75,7 @@ function post_family_tweaks__xiaomi-elish_enable_services() {
 	chroot_sdcard systemctl enable usbgadget-rndis.service
 	chroot_sdcard systemctl enable pd-mapper.service
 	chroot_sdcard systemctl enable tqftpserv.service
+	chroot_sdcard systemctl enable bt-fixed-mac.service
 	return 0
 }
 

diff --git a/config/cli/bullseye/main/packages b/config/cli/bullseye/main/packages
@@ -1,8 +1,6 @@
 alsa-utils
 bc
 bridge-utils
-chrony
-command-not-found
 console-setup
 cron
 curl
@@ -30,8 +28,6 @@ man-db
 mmc-utils
 ncurses-term
 nano
-netplan.io
-network-manager
 openssh-server
 parted
 psmisc

diff --git a/config/cli/common/main/packages b/config/cli/common/main/packages
@@ -1,25 +1,22 @@
 alsa-utils
+bash-completion
 bc
-bridge-utils
-chrony
-command-not-found
 console-setup
 cron
 curl
 dbus-user-session
 dialog
 debconf-utils
 debsums
-device-tree-compiler
 dosfstools
-ethtool
 fake-hwclock
 fdisk
 figlet
 htop
 inetutils-ping
 init
 initramfs-tools
+iproute2
 iw
 jq
 logrotate
@@ -30,22 +27,17 @@ man-db
 mmc-utils
 ncurses-term
 nano
-netplan.io
-network-manager
 openssh-server
 parted
 psmisc
 rsync
 rsyslog
 sudo
 systemd-resolved
-sysfsutils
-sysstat
 toilet
 tzdata
 u-boot-tools
 usbutils
-vlan
 wget
 wireless-tools
 wireguard-tools

diff --git a/config/cli/common/main/packages.additional b/config/cli/common/main/packages.additional
@@ -3,12 +3,14 @@ apt-utils
 aptitude
 automake
 avahi-autoipd
-bash-completion
 bison
 btrfs-progs
 build-essential
+command-not-found
 cracklib-runtime
+device-tree-compiler
 dkms
+ethtool
 evtest
 expect
 f2fs-tools
@@ -23,7 +25,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
@@ -37,7 +38,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils
@@ -51,7 +51,8 @@ screen
 software-properties-common
 smartmontools
 stress
-sudo
+sysfsutils
+sysstat
 unattended-upgrades
 unicode-data
 unzip

diff --git a/config/cli/jammy/main/packages b/config/cli/jammy/main/packages
@@ -1,8 +1,6 @@
 alsa-utils
 bc
 bridge-utils
-chrony
-command-not-found
 console-setup
 cron
 curl
@@ -30,8 +28,6 @@ man-db
 mmc-utils
 ncurses-term
 nano
-netplan.io
-network-manager
 openssh-server
 parted
 psmisc

diff --git a/config/cli/noble/main/packages.additional b/config/cli/noble/main/packages.additional
@@ -23,7 +23,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
@@ -37,7 +36,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils

diff --git a/config/cli/sid/main/packages.additional b/config/cli/sid/main/packages.additional
@@ -23,7 +23,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
@@ -37,7 +36,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils

diff --git a/config/cli/trixie/main/packages.additional b/config/cli/trixie/main/packages.additional
@@ -23,7 +23,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
@@ -37,7 +36,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils