Bump two leftover radxa rk35xx uboot to next-dev-v2024.10

just remove these leftover overrides.

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
Co-authored-by: amazingfate <liujianfeng1994@gmail.com>
This commit is contained in:
nyanmisaka 2025-02-16 00:06:14 +08:00 committed by Igor
parent 8e825e7f9d
commit b8423db17a
2 changed files with 2 additions and 26 deletions

View File

@ -1,6 +1,7 @@
# Rockchip RK3568 quad core 4GB-8GB GBE PCIe USB3 SATA NVMe
BOARD_NAME="Mixtile Edge 2"
BOARDFAMILY="rockchip64"
BOARDFAMILY="rk35xx"
BOOTCONFIG="mixtile-edge2-rk3568_defconfig"
BOARD_MAINTAINER=""
BOOT_SOC="rk3568"
KERNEL_TARGET="current,edge,vendor"
@ -35,20 +36,3 @@ function post_family_config__h96_max_use_mainline_uboot() {
dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
}
}
function post_family_config_branch_vendor__kernel_and_uboot_rk35xx_mixtile_edge2() {
# Copypasta from rockchip-rk3588.conf family file -- we _really_ gotta find a better way!
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
declare -g KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
declare -g KERNELBRANCH='branch:rk-6.1-rkr5'
declare -g KERNELPATCHDIR='rk35xx-vendor-6.1'
declare -g LINUXFAMILY=rk35xx
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes
declare -g OVERLAY_PREFIX='rk35xx'
# Use vendor u-boot, same as rk35xx; we've a defconfig and dt in there
declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
declare -g BOOTBRANCH='branch:next-dev-v2024.03' # Always use same version as rk3588, they share a patch dir
declare -g BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
declare -g BOOTCONFIG="mixtile-edge2-rk3568_defconfig"
}

View File

@ -15,14 +15,6 @@ enable_extension "radxa-aic8800"
AIC8800_TYPE="usb"
ASOUND_STATE="asound.state.rock-5c"
function post_family_config__uboot_rock5c() {
display_alert "$BOARD" "Configuring armsom u-boot" "info"
declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
declare -g BOOTBRANCH="branch:next-dev-v2024.03"
declare -g OVERLAY_PREFIX='rockchip-rk3588'
declare -g BOOTDELAY=1 # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing
}
function post_family_tweaks__rock5c_naming_audios() {
display_alert "$BOARD" "Renaming rock5c audios" "info"