enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mekotronics(all): bump generic mainline u-boot to v2026.01-rc5

Browse Source 
- also enable CONFIG_ROCKCHIP_MASKROM_IMAGE for quick development
- fix conflicting vendor hook
  - only hack the vendor u-boot down to next-dev-v2024.03 for vendor/legacy
This commit is contained in:
Ricardo Pardini 2025-12-24 19:24:57 +01:00
parent d40033d2a0
commit 1a4d46d3d7
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
config/sources/vendors/mekotronics/mekotronics-rk3588.hooks.sh vendored
View File

@ -4,12 +4,17 @@
# This file is a part of the Armbian Build Framework https://github.com/armbian/build/
#
# Vendor u-boot; use the default family (rockchip-rk3588) u-boot. See config/sources/families/rockchip-rk3588.conf
# Vendor u-boot
# Override the stuff from rockchip-rk3588 family; Meko's have a patch for stable MAC address that breaks with Radxa's next-dev-v2024.10+
function post_family_config__vendor_uboot_mekotronics() {
# Don't do it if forcing mainline u-boot or on edge/current branches
if [[ "${MEKO_USE_MAINLINE_UBOOT:-"no"}" == "yes" || "${BRANCH}" == "edge" || "${BRANCH}" == "current" ]]; then
return 0 # separate, conditional hook below
fi
display_alert "$BOARD" "Configuring $BOARD vendor u-boot" "info"
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
# Override the stuff from rockchip-rk3588 family; Meko's have a patch for stable MAC address that breaks with Radxa's next-dev-v2024.10+
declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
declare -g BOOTBRANCH='branch:next-dev-v2024.03' # NOT next-dev-v2024.10
declare -g BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
@ -23,17 +28,16 @@ if [[ "${MEKO_USE_MAINLINE_UBOOT:-"no"}" == "yes" ]]; then
display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
declare -g BOOTCONFIG="generic-rk3588_defconfig" # MAINLINE U-BOOT OVERRIDE
declare -g BOOTDELAY=1 # Wait for UART interrupt
declare -g BOOTDELAY=1 # Wait for UART interrupt
BOOTSOURCE="https://github.com/u-boot/u-boot.git"
BOOTBRANCH="tag:v2025.01"
BOOTPATCHDIR="v2025.01-mekotronics" # empty
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
declare -g BOOTBRANCH="tag:v2026.01-rc5"
declare -g BOOTPATCHDIR="v2026.01"
BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin" # NOT u-boot-rockchip-spi.bin
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-usb471.bin u-boot-rockchip-usb472.bin"
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
function write_uboot_platform() {
@ -42,4 +46,10 @@ if [[ "${MEKO_USE_MAINLINE_UBOOT:-"no"}" == "yes" ]]; then
declare -g PLYMOUTH="no" # Disable plymouth as that only causes more confusion
}
function post_config_uboot_target__extra_configs_for_meko_mainline_uboot() {
display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable RAMBoot images" "info"
run_host_command_logged scripts/config --enable CONFIG_ROCKCHIP_MASKROM_IMAGE
}
fi