diff --git a/config/boards/mixtile-edge2.csc b/config/boards/mixtile-edge2.csc index bcc07993dd..c984d29757 100644 --- a/config/boards/mixtile-edge2.csc +++ b/config/boards/mixtile-edge2.csc @@ -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" -} diff --git a/config/boards/rock-5c.conf b/config/boards/rock-5c.conf index 9297f37eb9..0d3a11e54d 100644 --- a/config/boards/rock-5c.conf +++ b/config/boards/rock-5c.conf @@ -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"