Skip to content

Commit 0f5db61

Browse files
rpardiniigorpecovnik
authored andcommitted
u-boot: bump u-boot to v2026.01 (final) for boards that had -rcX
- cm3588-nas: u-boot: bump v2026.01-rc2 -> v2026.01-rc - khadas-vim3l: u-boot: bump v2026.01-rc2 -> v2026.01 - mekotronics-458-4x4: : bump v2026.01-rcX -> v2026.01 - nanopct6: u-boot: bump v2026.01-rc2 -> v2026.01 - nanopi-r6c: u-boot: bump v2026.01-rc2 -> v2026.01 - nanopi-r76s: u-boot: bump v2026.01-rcX -> v2026.01 - odroidhc4: u-boot: bump v2026.01-rc2 -> v2026.01 - odroidn2: u-boot: bump v2026.01-rcX -> v2026.01 - rock-5b: u-boot: bump v2026.01-rc2 -> v2026.01 - this is tedious. time for `UBOOT_MAJOR_MINOR`?
1 parent 4164b77 commit 0f5db61

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

config/boards/cm3588-nas.csc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function post_family_config__cm3588_nas_use_mainline_uboot() {
4444

4545
declare -g BOOTDELAY=1
4646
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
47-
declare -g BOOTBRANCH="tag:v2026.01-rc2"
47+
declare -g BOOTBRANCH="tag:v2026.01"
4848
declare -g BOOTPATCHDIR="v2026.01"
4949
declare -g BOOTDIR="u-boot-${BOARD}"
5050
declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"

config/boards/khadas-vim3l.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ BOOT_LOGO="desktop"
1313
BOOT_FDT_FILE="amlogic/meson-sm1-khadas-vim3l.dtb"
1414
ASOUND_STATE="asound.state.khadas-vim3l"
1515

16-
BOOTBRANCH_BOARD="tag:v2026.01-rc2"
16+
BOOTBRANCH_BOARD="tag:v2026.01"
1717
BOOTPATCHDIR="v2026.01" # this has 'board_khadas-vim3' which has a patch to boot USB/NVMe/SCSI first
1818

1919
declare -g KHADAS_OOWOW_BOARD_ID="VIM3L" # for use with EXT=output-image-oowow

config/boards/mekotronics-r58-4x4.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function post_family_config__meko4x4_use_mainline_uboot() {
2929
declare -g BOOTCONFIG="mekotronics-r58-4x4-rk3588_defconfig" # mainline
3030
declare -g BOOTDELAY=1
3131
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
32-
declare -g BOOTBRANCH="tag:v2026.01-rc5"
32+
declare -g BOOTBRANCH="tag:v2026.01"
3333
declare -g BOOTPATCHDIR="v2026.01"
3434
declare -g BOOTDIR="u-boot-${BOARD}"
3535

config/boards/mixtile-core3588e.csc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function post_family_config__core3588e_use_mainline_uboot() {
3535

3636
declare -g BOOTDELAY=1
3737
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
38-
declare -g BOOTBRANCH="tag:v2026.01-rc4"
38+
declare -g BOOTBRANCH="tag:v2026.01"
3939
declare -g BOOTPATCHDIR="v2026.01"
4040
declare -g BOOTDIR="u-boot-${BOARD}"
4141

config/boards/nanopct6.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function post_family_config__nanopct6_use_mainline_uboot() {
4444
declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"
4545
declare -g BOOTDELAY=1
4646
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
47-
declare -g BOOTBRANCH="tag:v2026.01-rc2"
47+
declare -g BOOTBRANCH="tag:v2026.01"
4848
declare -g BOOTPATCHDIR="v2026.01"
4949
declare -g BOOTDIR="u-boot-${BOARD}"
5050
declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"

config/boards/nanopi-r6c.csc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function post_family_config__nanopi_r6c_use_mainline_uboot() {
3838

3939
declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
4040
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
41-
declare -g BOOTBRANCH="tag:v2026.01-rc2"
41+
declare -g BOOTBRANCH="tag:v2026.01"
4242
declare -g BOOTPATCHDIR="v2026.01"
4343
declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
4444
declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"

config/boards/nanopi-r76s.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function post_family_config__nanopi_r76s_use_mainline_uboot() {
2929

3030
declare -g BOOTDELAY=1
3131
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
32-
declare -g BOOTBRANCH="tag:v2026.01-rc2"
32+
declare -g BOOTBRANCH="tag:v2026.01"
3333
declare -g BOOTPATCHDIR="v2026.01"
3434
unset BOOT_FDT_FILE
3535

config/boards/odroidhc4.csc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ BOOT_FDT_FILE="amlogic/meson-sm1-odroid-hc4.dtb"
1313
PACKAGE_LIST_BOARD="lm-sensors fancontrol" # SPI, sensors, manual fan control via 'pwmconfig'
1414

1515
# Newer u-boot for the HC4. There's patches in `board_odroidhc4` for the defconfigs used in the UBOOT_TARGET_MAP below.
16-
BOOTBRANCH_BOARD="tag:v2026.01-rc2"
16+
BOOTBRANCH_BOARD="tag:v2026.01"
1717
BOOTPATCHDIR="v2026.01"
1818

1919
# We build u-boot twice: C4 config for SD cards, and HC4 (with SATA/PCI/SPI) config for SPI.

config/boards/odroidn2.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ enable_extension "uboot-btrfs"
1616
enable_extension "watchdog"
1717

1818
# Newer u-boot for the N2/N2+
19-
BOOTBRANCH_BOARD="tag:v2026.01-rc2"
19+
BOOTBRANCH_BOARD="tag:v2026.01"
2020
BOOTPATCHDIR="v2026.01"
2121

2222
# Enable writing u-boot to SPI on the N2(+) for current and edge

config/boards/rock-5b.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function post_family_config_branch_edge__rock-5b_use_mainline_uboot() {
3939
declare -g BOOTCONFIG="rock5b-rk3588_defconfig"
4040
declare -g BOOTDELAY=1
4141
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
42-
declare -g BOOTBRANCH="tag:v2026.01-rc2"
42+
declare -g BOOTBRANCH="tag:v2026.01"
4343
declare -g BOOTPATCHDIR="v2026.01"
4444
declare -g BOOTDIR="u-boot-${BOARD}"
4545
declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"

0 commit comments

Comments
 (0)