Skip to content

Commit 57954a9

Browse files
rpardiniigorpecovnik
authored andcommitted
odroidm1: u-boot: bump to v2026.01
- 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
1 parent 5eabdce commit 57954a9

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

config/boards/odroidm1.conf

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ IMAGE_PARTITION_TABLE="gpt"
1313
FULL_DESKTOP="yes"
1414
BOOT_LOGO="desktop"
1515

16-
BOOTBRANCH_BOARD="tag:v2025.10"
17-
BOOTPATCHDIR="v2025.10" # but all changes are done in this board file, not patches
16+
BOOTBRANCH_BOARD="tag:v2026.01"
17+
BOOTPATCHDIR="v2026.01" # but all changes are done in this board file, not patches
1818

1919
BOOTCONFIG="odroid-m1-rk3568_defconfig"
2020
BOOTDIR="u-boot-${BOARD}"
@@ -88,6 +88,8 @@ function post_family_tweaks__odroidm1_rename_gmac_eth0() {
8888

8989
}
9090

91+
# Important: micro-USB OTG port is shared with lower blue USB3 type-A port; that won't work for booting.
92+
# use the upper port, or the USB2 ports for booting.
9193
function pre_config_uboot_target__odroidm1_patch_uboot_dtsi_for_ums() {
9294
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
9395
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() {
105107
}
106108

107109
# A better equivalent to patching a defconfig, do changes to .config via code.
108-
# 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
109110
function post_config_uboot_target__extra_configs_for_odroid-m1() {
110111
[[ "${BRANCH}" == "edge" || "${BRANCH}" == "current" ]] || return 0
111112

@@ -118,7 +119,7 @@ function post_config_uboot_target__extra_configs_for_odroid-m1() {
118119

119120
display_alert "u-boot for ${BOARD}" "u-boot: enable preboot & reset environment once in preboot" "info"
120121
run_host_command_logged scripts/config --enable CONFIG_USE_PREBOOT
121-
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
122+
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
122123

123124
display_alert "u-boot for ${BOARD}" "u-boot: enable EFI debugging command" "info"
124125
run_host_command_logged scripts/config --enable CMD_EFIDEBUG
@@ -151,7 +152,7 @@ function post_config_uboot_target__extra_configs_for_odroid-m1() {
151152
run_host_command_logged scripts/config --enable CONFIG_CMD_XXD
152153

153154
display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enabling UMS/RockUSB Gadget functionality" "info"
154-
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")
155+
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")
155156
for config in "${enable_configs[@]}"; do
156157
run_host_command_logged scripts/config --enable "${config}"
157158
done

0 commit comments

Comments
 (0)