Skip to content

Commit e615c61

Browse files
committed
Merge remote-tracking branch 'armbian/build:main' into ti-main
* live_main_upstream/main: (24 commits) framework - enable NTSYNC as a module on most kernels Add compilation of `resolve_btfids` to the kernel headers postinst script Make pahole as hard dependency on kernel headers ZFS requires package pahole in order to compile zfs module with success Rock-4D: Enable Wi-Fi & Bluetooth (armbian#9029) rockchip64-6.18: Enable the NPU on Turing RK1 config/kernel: (many) change CONFIG_DUMMY=y to =m ti: configs: Update K3 kernel configs (armbian#9019) `Automatic` board configs status synchronise fix missing bracket meson64: fix broken patch and overall rewrite patches Genio: Collabora Kernel config post rewrite Genio: Update Linux Kernel config build(deps): bump tj-actions/changed-files bump VERSION edge: bump to stable and rewrite patches add new board radxa-cm5-io ODroid-N2: enable btrfs support in u-boot ODroid-N2: switch uBoot v2022.10 to v2026.01 reapply patches Helios4: enable uboot-btrfs extension extensions: add uboot-btrfs extension to add btrfs support in u-boot `Automatic` board configs status synchronise board: youyeetoo-r1-v3: fix boot order to prioritize SD card over eMMC (armbian#9006) board: add Youyeetoo YY3588 support (armbian#9003) Signed-off-by: Jonas Wood <[email protected]>
2 parents aa51484 + f53eac4 commit e615c61

File tree

47 files changed

+1665
-804
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1665
-804
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ config/boards/pocketbeagle2.conf @Grippy98
143143
config/boards/pocketchip-sd.csc @TheSnowfield
144144
config/boards/qemu-uboot-arm64.csc @rpardini
145145
config/boards/qemu-uboot-x86.csc @rpardini
146+
config/boards/radxa-cm5-io.csc @amazingfate
146147
config/boards/radxa-dragon-q6a.conf @HeyMeco
147148
config/boards/radxa-e20c.csc @mattx433
148149
config/boards/radxa-e25.conf @krachlatte
@@ -196,6 +197,7 @@ config/boards/x96q.tvb @sicXnull
196197
config/boards/xiaomi-elish.conf @amazingfate
197198
config/boards/xpressreal-t3.csc @wei633
198199
config/boards/youyeetoo-r1-v3.csc @SuperKali
200+
config/boards/youyeetoo-yy3588.csc @SuperKali
199201
config/boards/yy3568.csc @hqnicolas
200202
config/boards/zeropi.csc @igorpecovnik
201203
config/kernel/linux-arm64-*.config @PeterChrz @rpardini
@@ -298,7 +300,6 @@ patch/u-boot/u-boot-tqma/ @schmiedelm
298300
patch/u-boot/u-boot-xpressreal/ @wei633
299301
patch/u-boot/v2022.01/ @teknoid
300302
patch/u-boot/v2022.07/ @Tonymac32 @igorpecovnik
301-
patch/u-boot/v2022.10/ @NicoD-SBC
302303
patch/u-boot/v2023.07.02/ @engineer-80
303304
patch/u-boot/v2023.10/ @adeepn
304305
patch/u-boot/v2024.01/ @Tonymac32 @igorpecovnik
@@ -317,7 +318,7 @@ patch/u-boot/v2025.07/ @pyavitz
317318
patch/u-boot/v2025.10/ @HeyMeco @SuperKali @ZazaBR @alexl83 @amazingfate @catalinii @efectn @fridtjof @igorpecovnik @paolosabatino @pyavitz @rpardini @vamzii
318319
patch/u-boot/v2025.10/board_9tripod-x3568-v4/ @rbqvq
319320
patch/u-boot/v2025.10/board_helios4/ @leggewie
320-
patch/u-boot/v2026.01/ @ColorfulRhino @SuperKali @Tonymac32 @amazingfate @biot @linhz0hz @rpardini
321+
patch/u-boot/v2026.01/ @ColorfulRhino @NicoD-SBC @SuperKali @Tonymac32 @amazingfate @biot @linhz0hz @rpardini
321322
sources/families/bcm2711.conf @PanderMusubi @teknoid
322323
sources/families/genio.conf @HeyMeco
323324
sources/families/imx8m.conf @schmiedelm

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Get changed files
3636
id: changed-files
37-
uses: tj-actions/changed-files@6da3c88b60ebf09464ada9b06fba5b6f2d34bb94 # v46.0.3
37+
uses: tj-actions/changed-files@abdd2f68ea150cee8f236d4a9fb4e0f2491abf1b # v46.0.3
3838

3939
- name: Checkout repository
4040
uses: actions/checkout@v6

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Get changed files
3232
id: changed-files
33-
uses: tj-actions/changed-files@6da3c88b60ebf09464ada9b06fba5b6f2d34bb94 # v46.0.3
33+
uses: tj-actions/changed-files@abdd2f68ea150cee8f236d4a9fb4e0f2491abf1b # v46.0.3
3434

3535
- name: List all changed files
3636
run: |

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
25.11.0-trunk
1+
26.02.0-trunk

config/boards/helios4.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ FORCE_BOOTSCRIPT_UPDATE="yes"
1111
KERNEL_TARGET="current,edge"
1212
KERNEL_TEST_TARGET="current"
1313

14+
# Enable btrfs support in u-boot
15+
enable_extension "uboot-btrfs"
16+
1417
function post_family_config__helios4_extra_packages() {
1518
add_packages_to_image "fancontrol"
1619
add_packages_to_image "ethtool"

config/boards/odroidn2.conf

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
88
FULL_DESKTOP="yes"
99
FORCE_BOOTSCRIPT_UPDATE="yes"
1010
BOOT_LOGO="desktop"
11-
BOOTFS_TYPE="ext4"
1211
BOOTCONFIG="odroid-n2_defconfig" # For mainline uboot
1312

14-
# Newer u-boot for the N2/N2+, less patches: a single boot order patch
15-
BOOTBRANCH_BOARD="tag:v2022.10"
16-
BOOTPATCHDIR="v2022.10"
13+
# Enable btrfs support in u-boot
14+
enable_extension "uboot-btrfs"
15+
16+
# Newer u-boot for the N2/N2+
17+
BOOTBRANCH_BOARD="tag:v2026.01-rc2"
18+
BOOTPATCHDIR="v2026.01"
1719

1820
# Enable writing u-boot to SPI on the N2(+) for current and edge
1921
# @TODO: replace this with an overlay, after meson64 overlay revamp

config/boards/radxa-cm5-io.csc

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Rockchip RK3588s SoC octa core 4-16GB SoC eMMC USB3
2+
BOARD_NAME="Radxa CM5 IO"
3+
BOARDFAMILY="rockchip-rk3588"
4+
BOARD_MAINTAINER="amazingfate"
5+
BOOTCONFIG="radxa-cm5-io-rk3588s_defconfig"
6+
KERNEL_TARGET="vendor"
7+
KERNEL_TEST_TARGET="vendor"
8+
FULL_DESKTOP="yes"
9+
BOOT_LOGO="desktop"
10+
BOOT_FDT_FILE="rockchip/rk3588s-radxa-cm5-io.dtb"
11+
BOOT_SCENARIO="spl-blobs"
12+
BOOT_SOC="rk3588"
13+
IMAGE_PARTITION_TABLE="gpt"
14+
15+
function post_family_tweaks__radxa-cm5-io_naming_audios() {
16+
display_alert "$BOARD" "Renaming radxa-cm5-io audios" "info"
17+
18+
mkdir -p $SDCARD/etc/udev/rules.d/
19+
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
20+
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
21+
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
22+
23+
return 0
24+
}

config/boards/radxa-rock-4d.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ BOOT_SCENARIO="spl-blobs"
1212
BOOT_SUPPORT_SPI="yes"
1313
BOOT_SPI_RKSPI_LOADER="yes"
1414
IMAGE_PARTITION_TABLE="gpt"
15+
enable_extension "radxa-aic8800"
16+
AIC8800_TYPE="usb"
1517

1618
function post_family_tweaks__rock-4d_naming_audios() {
1719
display_alert "$BOARD" "Renaming Rock-4D audios" "info"

config/boards/youyeetoo-r1-v3.csc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ function post_family_config__youyeetoo_r1_use_mainline_uboot() {
5454
}
5555
}
5656

57-
# "rockchip-common: boot SD card first, then NVMe, then mmc"
57+
# "rockchip-common: boot SD card first, then NVMe, then eMMC"
5858
# include/configs/rockchip-common.h
59-
# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp"
60-
# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp"
61-
# On Youyeetoo R1, mmc0 is the SD card, mmc1 is the eMMC slot
59+
# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp" (default)
60+
# +#define BOOT_TARGETS "mmc1 nvme mmc0 scsi usb pxe dhcp"
61+
# On Youyeetoo R1, mmc0 is the eMMC (sdhci), mmc1 is the SD card (sdmmc)
6262
function pre_config_uboot_target__youyeetoo_r1_patch_rockchip_common_boot_order() {
63-
declare -a rockchip_uboot_targets=("mmc0" "nvme" "mmc1" "scsi" "usb" "pxe" "dhcp") # for future make-this-generic delight
63+
declare -a rockchip_uboot_targets=("mmc1" "nvme" "mmc0" "scsi" "usb" "pxe" "dhcp") # mmc1=SD, mmc0=eMMC
6464
display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
6565
sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
6666
regular_git diff -u include/configs/rockchip-common.h || true
@@ -72,7 +72,7 @@ function post_family_tweaks__youyeetoo_r1 {
7272
[[ "${BRANCH}" == "vendor" ]] && return 0
7373

7474
display_alert "$BOARD" "Adjusting rtw89_8852be module" "info"
75-
75+
7676
cat <<- EOF > "${SDCARD}/etc/modprobe.d/rtw8852be.conf"
7777
options rtw89_pci disable_aspm_l1=y disable_aspm_l1ss=y
7878
options rtw89pci disable_aspm_l1=y disable_aspm_l1ss=y

config/boards/youyeetoo-yy3588.csc

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Rockchip RK3588 octa core 4-32GB RAM SoC eMMC NVMe SATA USB3 GbE 2x HDMI DP
2+
BOARD_NAME="Youyeetoo YY3588"
3+
BOARDFAMILY="rockchip-rk3588"
4+
BOARD_MAINTAINER="SuperKali"
5+
BOOTCONFIG="youyeetoo-yy3588-rk3588_defconfig"
6+
BOOT_SOC="rk3588"
7+
KERNEL_TARGET="vendor"
8+
FULL_DESKTOP="yes"
9+
BOOT_LOGO="desktop"
10+
IMAGE_PARTITION_TABLE="gpt"
11+
BOOT_FDT_FILE="rockchip/rk3588-youyeetoo-yy3588.dtb"
12+
BOOT_SCENARIO="spl-blobs"
13+
BOOT_SUPPORT_SPI="yes"
14+
BOOT_SPI_RKSPI_LOADER="yes"
15+
16+
function post_family_tweaks__youyeetoo_yy3588_naming_audios() {
17+
display_alert "$BOARD" "Renaming Youyeetoo YY3588 audios" "info"
18+
19+
mkdir -p $SDCARD/etc/udev/rules.d/
20+
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
21+
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
22+
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmiin-sound", ENV{SOUND_DESCRIPTION}="HDMI-In Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
23+
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
24+
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8323-sound", ENV{SOUND_DESCRIPTION}="ES8323 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
25+
26+
return 0
27+
}

0 commit comments

Comments
 (0)