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

odroidm1: u-boot: bump to v2026.01

Browse Source 
- tested on actual hardware
- small fixes for:
  - LEDs (new names; was wrong also in v2025.10 and previous)
  - remove duplicate enablement of CONFIG_CMD_USB_MASS_STORAGE
  - comment about lower USB3 port not working due share with OTG/UMS
    micro-usb port that is enabled
This commit is contained in:
Ricardo Pardini 2026-02-01 23:31:14 -03:00 committed by Igor
parent 5eabdce18a
commit 57954a916b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/boards/odroidm1.conf
View File

@ -13,8 +13,8 @@ IMAGE_PARTITION_TABLE="gpt"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOTBRANCH_BOARD="tag:v2025.10"
BOOTPATCHDIR="v2025.10" # but all changes are done in this board file, not patches
BOOTBRANCH_BOARD="tag:v2026.01"
BOOTPATCHDIR="v2026.01" # but all changes are done in this board file, not patches
BOOTCONFIG="odroid-m1-rk3568_defconfig"
BOOTDIR="u-boot-${BOARD}"
@ -88,6 +88,8 @@ function post_family_tweaks__odroidm1_rename_gmac_eth0() {
}
# Important: micro-USB OTG port is shared with lower blue USB3 type-A port; that won't work for booting.
# use the upper port, or the USB2 ports for booting.
function pre_config_uboot_target__odroidm1_patch_uboot_dtsi_for_ums() {
display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file
cat <<- UBOOT_BOARD_DTSI_OTG >> arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
@ -105,7 +107,6 @@ function pre_config_uboot_target__odroidm1_patch_rockchip_common_boot_order() {
}
# A better equivalent to patching a defconfig, do changes to .config via code.
# For UMS/RockUSB to work in u-boot, &usb_host0_xhci { dr_mode = "otg" } is required. See 0002-board-rockchip-ODROID-M1-override-kernel-DT-for-xhci-otg-dr_mode.patch
function post_config_uboot_target__extra_configs_for_odroid-m1() {
[[ "${BRANCH}" == "edge" || "${BRANCH}" == "current" ]] || return 0
@ -118,7 +119,7 @@ function post_config_uboot_target__extra_configs_for_odroid-m1() {
display_alert "u-boot for ${BOARD}" "u-boot: enable preboot & reset environment once in preboot" "info"
run_host_command_logged scripts/config --enable CONFIG_USE_PREBOOT
run_host_command_logged scripts/config --set-str CONFIG_PREBOOT "'echo armbian leds; led led-0 on; led led-1 on; sleep 0.1; led led-0 off; led led-1 off; sleep 0.1; led led-0 on; if test a\${armbian}a = atwicea; then echo armbian env already set once; else echo armbian resetting environment once; env default -f -a; setenv armbian twice; saveenv; fi'" # double quote
run_host_command_logged scripts/config --set-str CONFIG_PREBOOT "'echo armbian leds; led red:power on; led blue:heartbeat on; sleep 0.1; led red:power off; led blue:heartbeat off; sleep 0.1; led red:power on; if test a\${armbian}a = atwicea; then echo armbian env already set once; else echo armbian resetting environment once; env default -f -a; setenv armbian twice; saveenv; fi'" # double quote
display_alert "u-boot for ${BOARD}" "u-boot: enable EFI debugging command" "info"
run_host_command_logged scripts/config --enable CMD_EFIDEBUG
@ -151,7 +152,7 @@ function post_config_uboot_target__extra_configs_for_odroid-m1() {
run_host_command_logged scripts/config --enable CONFIG_CMD_XXD
display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enabling UMS/RockUSB Gadget functionality" "info"
declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB" "CONFIG_CMD_USB_MASS_STORAGE")
declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB")
for config in "${enable_configs[@]}"; do
run_host_command_logged scripts/config --enable "${config}"
done