Skip to content

Commit bafd879

Browse files
committed
Orange Pi 5 Max/Ultra: assure correct test kernel builds are installed
Those require the bcmdhd module to be compiled in SDIO mode rather than USB mode for their onboard WiFi to work. We should probably make this the default for all vendor Rockchip Linux builds, since I doubt any USB WiFi dongle uses this vendor bcmdhd driver that was actually meant for Android, while Linux has its brcmfmac.
1 parent 1222479 commit bafd879

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.build/images/dietpi-installer

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,8 +1232,11 @@ fi' /boot/boot.cmd
12321232
# Install testing kernel build if requested
12331233
if (( $TEST_KERNEL ))
12341234
then
1235-
G_EXEC_OUTPUT=1 G_EXEC curl -fo package1.deb "https://dietpi.com/downloads/binaries/testing/linux-image-$branch-$kernel.deb"
1236-
G_EXEC_OUTPUT=1 G_EXEC curl -fo package2.deb "https://dietpi.com/downloads/binaries/testing/linux-dtb-$branch-$kernel.deb"
1235+
local suffix=
1236+
# Orange Pi 5 Max/Ultra: Install kernel build with bcmdhd WiFi module configured for SDIO rather than USB
1237+
(( $G_HW_MODEL == 91 || $G_HW_MODEL == 94 )) && suffix='_bcmdhd-sdio'
1238+
G_EXEC_OUTPUT=1 G_EXEC curl -fo package1.deb "https://dietpi.com/downloads/binaries/testing/linux-image-$branch-$kernel$suffix.deb"
1239+
G_EXEC_OUTPUT=1 G_EXEC curl -fo package2.deb "https://dietpi.com/downloads/binaries/testing/linux-dtb-$branch-$kernel$suffix.deb"
12371240
G_EXEC_OUTPUT=1 G_EXEC dpkg -i package[12].deb
12381241
G_EXEC rm package[12].deb
12391242
fi

dietpi/func/dietpi-globals

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2035,6 +2035,8 @@ Press any key to continue...'
20352035
[[ $branch ]] || branch=$(uname -r) branch=${branch%-*} branch=${branch##*-}
20362036
mapfile -t packages < <(dpkg-query -l | mawk -v "branch=$branch" '$1=="ii" && match($2,"^(linux-(image|dtb|headers|libc-dev)-"branch"-|linux-u-boot-.*-"branch"$|armbian-firmware$|firmware-(quartz64[ab]|soquartz)$|linux-image-(star64|visionfive2)$)") {print "https://dietpi.com/downloads/binaries/testing/"$2".deb"}')
20372037
[[ ${packages[0]} ]] || { G_DIETPI-NOTIFY 1 'No matching packages are installed on your system, aborting ...'; return 1; }
2038+
# Orange Pi 5 Max/Ultra: Install kernel build with bcmdhd WiFi module configured for SDIO rather than USB
2039+
(( $G_HW_MODEL == 91 || $G_HW_MODEL == 94 )) && packages=("${packages[@]/vendor-rk35xx/vendor-rk35xx_bcmdhd-sdio}")
20382040
G_EXEC cd /tmp
20392041
G_EXEC_DESC="Downloading packages: ${packages[*]##*/}" G_EXEC rm -f "${packages[@]##*/}"
20402042
wget "${packages[@]}"

0 commit comments

Comments
 (0)