Skip to content

Add 6.1.y kernel for rk35xx & rk3588 #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
unifreq merged 5 commits into from
Aug 9, 2025
Merged

Add 6.1.y kernel for rk35xx & rk3588 #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
101d0a3
Add 6.1.y kernel for rk35xx & rk3588
ophub Aug 2, 2025
de5f1a4
Devices configured to use only the rk35xx/5.10.y kernel
ophub Aug 2, 2025
3c6fe46
Adjust version matching
ophub Aug 2, 2025
3733978
Solve the problem of multiple dtb entries in uEnv.txt
ophub Aug 2, 2025
adaa1a2
Adjust to array matching
ophub Aug 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions files/openwrt-install-amlogic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ else
# 7. ANDROID_UBOOT
AMLOGIC_SOC="$(echo "${ret}" | awk -F ':' '{print $3}')"
FDTFILE="$(
grep -oE 'meson[^[:space:]]*\.dtb' /boot/extlinux/extlinux.conf 2>/dev/null ||
grep -oE 'meson[^[:space:]]*\.dtb' /boot/uEnv.txt 2>/dev/null ||
grep -iE '^[[:space:]]*fdt[[:space:]]+/.*\.dtb' /boot/extlinux/extlinux.conf 2>/dev/null | grep -v '^[[:space:]]*#' | awk '{print $2}' | xargs basename 2>/dev/null ||
grep -oE '^FDT=.*meson[^[:space:]]*\.dtb' /boot/uEnv.txt 2>/dev/null | cut -d= -f2 | xargs basename 2>/dev/null ||
echo "${ret}" | awk -F':' '{print $4}'
)"
UBOOT_OVERLOAD="$(echo "${ret}" | awk -F ':' '{print $5}')"
Expand Down
16 changes: 11 additions & 5 deletions openwrt_flippy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@ PACKAGE_OPENWRT=(
# Set the list of devices using the [ rk3588 ] kernel
PACKAGE_OPENWRT_RK3588=("ak88" "e52c" "e54c" "h88k" "h88k-v3" "rock5b" "rock5c")
# Set the list of devices using the [ rk35xx ] kernel
# Devices from the rk3528/rk3566/rk3568 series can utilize the rk35xx and rk3588 kernels.
PACKAGE_OPENWRT_RK35XX=("e20c" "e24c" "h28k" "h66k" "h68k" "h69k" "h69k-max" "ht2" "jp-tvbox" "watermelon-pi" "yixun-rs6pro" "zcube1-max")
# Devices from the rk3528/rk3399/rk3566/rk3568 series can utilize the rk35xx kernels.
PACKAGE_OPENWRT_RK35XX=("e20c" "e24c" "h28k" "h66k" "h68k" "ht2" "jp-tvbox" "yixun-rs6pro")
# The following devices lack DTB support in the unifreq/linux-6.1.y-rockchip kernel and can only use the rk35xx/5.1.y kernel.
PACKAGE_OPENWRT_RK35XX_5XY=("h69k" "h69k-max" "watermelon-pi" "zcube1-max")
# Set the list of devices using the [ 6.x.y ] kernel
PACKAGE_OPENWRT_6XY=("cm3" "e25" "photonicat" "r66s" "r68s" "rk3399")
# All are packaged by default, and independent settings are supported, such as: [ s905x3_s905d_rock5b ]
Expand All @@ -52,8 +54,9 @@ KERNEL_REPO_URL_VALUE="breakingbadboy/OpenWrt"
# Set kernel tag: kernel_stable, kernel_rk3588, kernel_rk35xx
KERNEL_TAGS=("stable" "rk3588" "rk35xx")
STABLE_KERNEL=("6.1.y" "6.12.y")
RK3588_KERNEL=("5.10.y")
RK35XX_KERNEL=("5.10.y")
RK3588_KERNEL=("5.10.y" "6.1.y")
RK35XX_KERNEL=("5.10.y" "6.1.y")
RK35XX_KERNEL_5XY=("5.10.y")
KERNEL_AUTO_LATEST_VALUE="true"

# Set the working directory under /opt
Expand Down Expand Up @@ -231,7 +234,7 @@ init_var() {
for kt in "${PACKAGE_OPENWRT[@]}"; do
if [[ " ${PACKAGE_OPENWRT_RK3588[@]} " =~ " ${kt} " ]]; then
KERNEL_TAGS_TMP+=("rk3588")
elif [[ " ${PACKAGE_OPENWRT_RK35XX[@]} " =~ " ${kt} " ]]; then
elif [[ " ${PACKAGE_OPENWRT_RK35XX[@]} " =~ " ${kt} " || " ${PACKAGE_OPENWRT_RK35XX_5XY[@]} " =~ " ${kt} " ]]; then
KERNEL_TAGS_TMP+=("rk35xx")
else
KERNEL_TAGS_TMP+=("stable")
Expand Down Expand Up @@ -475,6 +478,9 @@ make_openwrt() {
elif [[ " ${PACKAGE_OPENWRT_RK35XX[@]} " =~ " ${PACKAGE_VAR} " ]]; then
build_kernel=(${RK35XX_KERNEL[@]})
vb="rk35xx"
elif [[ " ${PACKAGE_OPENWRT_RK35XX_5XY[@]} " =~ " ${PACKAGE_VAR} " ]]; then
build_kernel=($(printf "%s\n" "${RK35XX_KERNEL[@]}" | grep -E "^$(IFS='|'; echo "${RK35XX_KERNEL_5XY[@]//.y/\\.}" | sed 's/ /|/g')"))
vb="rk35xx"
else
build_kernel=(${STABLE_KERNEL[@]})
vb="stable"
Expand Down