u-boot: v2026.04 (final) fixes and bumps for some boards

config/boards/cm3588-nas.csc

@@ -45,8 +45,8 @@ function post_family_config__cm3588_nas_use_mainline_uboot() {
 
 	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
-	declare -g BOOTBRANCH="tag:v2026.01"
-	declare -g BOOTPATCHDIR="v2026.01"
+	declare -g BOOTBRANCH="tag:v2026.04"
+	declare -g BOOTPATCHDIR="v2026.04"
 	declare -g BOOTDIR="u-boot-${BOARD}"
 	declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.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
@@ -107,6 +107,10 @@ function post_config_uboot_target__extra_configs_for_cm3588-nas_uboot() {
 	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP
 	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK
 
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable LWIP (new networking stack)" "info"
+	run_host_command_logged scripts/config --enable CONFIG_CMD_MII
+	run_host_command_logged scripts/config --enable CONFIG_NET_LWIP
+
 	# UMS, RockUSB, gadget stuff
 	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "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")

config/boards/mekotronics-r58s2.conf

@@ -53,7 +53,7 @@ function post_family_config__meko_r58s2_use_mainline_uboot() {
 	declare -g BOOTCONFIG="mekotronics-r58s2-rk3588s_defconfig"
 	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
-	declare -g BOOTBRANCH="tag:v2026.04-rc2"
+	declare -g BOOTBRANCH="tag:v2026.04"
 	declare -g BOOTPATCHDIR="v2026.04"
 	declare -g BOOTDIR="u-boot-${BOARD}"
 

config/boards/mekotronics-r58x-4g.csc

@@ -30,7 +30,7 @@ function post_family_config__mekor58x_4g_use_mainline_uboot() {
 	declare -g BOOTCONFIG="mekotronics-r58x-4g-rk3588_defconfig" # mainline
 	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
-	declare -g BOOTBRANCH="tag:v2026.04-rc2"
+	declare -g BOOTBRANCH="tag:v2026.04"
 	declare -g BOOTPATCHDIR="v2026.04"
 	declare -g BOOTDIR="u-boot-${BOARD}"
 

config/boards/mekotronics-r58x-pro.csc

@@ -31,7 +31,7 @@ function post_family_config__meko_r58x_pro_use_mainline_uboot() {
 	declare -g BOOTCONFIG="mekotronics-r58x-pro-rk3588_defconfig" # mainline
 	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
-	declare -g BOOTBRANCH="tag:v2026.04-rc2"
+	declare -g BOOTBRANCH="tag:v2026.04"
 	declare -g BOOTPATCHDIR="v2026.04"
 	declare -g BOOTDIR="u-boot-${BOARD}"
 
@@ -101,9 +101,13 @@ function post_config_uboot_target__extra_configs_for_meko_r58x_pro_mainline_envi
 	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP
 	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK
 
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable LWIP (new networking stack)" "info"
+	run_host_command_logged scripts/config --enable CONFIG_CMD_MII
+	run_host_command_logged scripts/config --enable CONFIG_NET_LWIP
+
 	# UMS, RockUSB, gadget stuff
 	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "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

config/boards/mixtile-blade3.csc

@@ -42,8 +42,8 @@ function post_family_config__blade3_use_mainline_uboot() {
 	declare -g BOOTDELAY=1
 
 	BOOTSOURCE="https://github.com/u-boot/u-boot.git"
-	declare -g BOOTBRANCH="tag:v2026.01"
-	declare -g BOOTPATCHDIR="v2026.01" # with 000.patching_config.yaml - no patching, straight .dts/defconfigs et al
+	declare -g BOOTBRANCH="tag:v2026.04"
+	declare -g BOOTPATCHDIR="v2026.04" # with 000.patching_config.yaml - no patching, straight .dts/defconfigs et al
 
 	BOOTDIR="u-boot-${BOARD}"
 

config/boards/nanopct6.conf

@@ -45,8 +45,8 @@ function post_family_config__nanopct6_use_mainline_uboot() {
 	declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"
 	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
-	declare -g BOOTBRANCH="tag:v2026.01"
-	declare -g BOOTPATCHDIR="v2026.01"
+	declare -g BOOTBRANCH="tag:v2026.04"
+	declare -g BOOTPATCHDIR="v2026.04"
 	declare -g BOOTDIR="u-boot-${BOARD}"
 	declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin 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
@@ -134,9 +134,13 @@ function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environme
 	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP
 	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK
 
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable LWIP (new networking stack)" "info"
+	run_host_command_logged scripts/config --enable CONFIG_CMD_MII
+	run_host_command_logged scripts/config --enable CONFIG_NET_LWIP
+
 	# UMS, RockUSB, gadget stuff
 	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "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

config/boards/odroidn2.conf

@@ -17,7 +17,7 @@ enable_extension "uboot-btrfs"
 enable_extension "watchdog"
 
 # Newer u-boot for the N2/N2+
-BOOTBRANCH_BOARD="tag:v2026.04-rc3"
+BOOTBRANCH_BOARD="tag:v2026.04"
 BOOTPATCHDIR="v2026.04"
 
 # Enable writing u-boot to SPI on the N2(+) for current and edge

config/boards/orangepi5.conf

@@ -27,7 +27,7 @@ function post_family_config__orangepi5_use_mainline_uboot() {
 	declare -g BOOTCONFIG="orangepi-5-rk3588s_defconfig"
 	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
-	declare -g BOOTBRANCH="tag:v2026.04-rc3"
+	declare -g BOOTBRANCH="tag:v2026.04"
 	declare -g BOOTPATCHDIR="v2026.04"
 	declare -g BOOTDIR="u-boot-${BOARD}"
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} $BOOTCONFIG_SATA;;u-boot-rockchip-spi-sata.bin

config/boards/radxa-rock-4d.conf

@@ -33,7 +33,7 @@ function post_family_config__rock4d_use_mainline_uboot() {
 	declare -g BOOTCONFIG="rock-4d-rk3576_defconfig"
 	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
-	declare -g BOOTBRANCH="tag:v2026.04-rc2"
+	declare -g BOOTBRANCH="tag:v2026.04"
 	declare -g BOOTPATCHDIR="v2026.04"
 	unset BOOT_FDT_FILE # mainline defconfig has DEFAULT_FDT_FILE set
 

config/boards/rock-3a.conf

@@ -21,15 +21,15 @@ function post_family_config__rock-3a_use_mainline_uboot_except_vendor_and_add_sa
 	UBOOT_TARGET_MAP="
 	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
 	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG_SATA spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img"
-	
+
 	# use mainline uboot for _current_ and _edge_
 	[[ "${BRANCH}" == "vendor" ]] && return 0
 
 	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
 	declare -g BOOTCONFIG="rock-3a-rk3568_defconfig"
 	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot"
-	declare -g BOOTBRANCH="tag:v2026.04-rc4"
+	declare -g BOOTBRANCH="tag:v2026.04"
 	declare -g BOOTPATCHDIR="v2026.04"
 	declare -g BOOTDIR="u-boot-${BOARD}"
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"

patch/u-boot/v2026.04/1001-fdt_fixup_ethernet-add-logs.patch

@@ -4,19 +4,16 @@ Date: Mon, 12 Jan 2026 18:26:25 +0100
 Subject: fdt_fixup_ethernet: add logs
 
 ---
- boot/fdt_support.c | 57 +++++++---
- boot/image-fdt.c   | 25 ++++
- 2 files changed, 67 insertions(+), 15 deletions(-)
+ boot/fdt_support.c | 56 +++++++---
+ boot/image-fdt.c   | 18 +++
+ 2 files changed, 59 insertions(+), 15 deletions(-)
 
 diff --git a/boot/fdt_support.c b/boot/fdt_support.c
 index 111111111111..222222222222 100644
 --- a/boot/fdt_support.c
 +++ b/boot/fdt_support.c
-@@ -630,29 +630,34 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size)
- 	return fdt_fixup_memory_banks(blob, &start, &size, 1);
- }
+@@ -632,27 +632,31 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size)
 
-+#warning "Compiling fdt_fixup_ethernet() for MAC debugging."
  void fdt_fixup_ethernet(void *fdt)
  {
 +	log_info("[fdt_fixup_ethernet] called\n");
@@ -50,7 +47,7 @@ index 111111111111..222222222222 100644
  		/* Select property number 'prop' */
  		for (j = 0; j < prop; j++)
  			offset = fdt_next_property_offset(fdt, offset);
-@@ -660,7 +665,10 @@ void fdt_fixup_ethernet(void *fdt)
+@@ -660,7 +664,10 @@ void fdt_fixup_ethernet(void *fdt)
  		if (offset < 0)
  			break;
 
@@ -61,7 +58,7 @@ index 111111111111..222222222222 100644
  		if (!strncmp(name, "ethernet", 8)) {
  			/* Treat plain "ethernet" same as "ethernet0". */
  			if (!strcmp(name, "ethernet")
-@@ -679,33 +687,52 @@ void fdt_fixup_ethernet(void *fdt)
+@@ -679,33 +686,52 @@ void fdt_fixup_ethernet(void *fdt)
  				else
  					sprintf(mac, "eth%daddr", i);
  			} else {
@@ -135,61 +132,51 @@ index 111111111111..222222222222 100644
  // SPDX-License-Identifier: GPL-2.0+
  /*
   * Copyright (c) 2013, Google Inc.
-@@ -584,13 +585,31 @@ __weak int ft_verify_fdt(void *fdt)
- 	return 1;
- }
+@@ -586,11 +587,25 @@ __weak int ft_verify_fdt(void *fdt)
 
-+#warning "Compiling arch_fixup_fdt() weak stub for MAC debugging."
  __weak int arch_fixup_fdt(void *blob)
  {
 +	log_info("[arch_fixup_fdt] called (weak stub)\n");
- 	return 0;
- }
-
-+#warning "Compiling ft_board_setup() weak stub for MAC debugging."
++	return 0;
++}
++
 +__weak int ft_board_setup(void *blob, struct bd_info *bd)
 +{
 +	log_info("[ft_board_setup] called (weak stub)\n");
 +	return 0;
 +}
 +
-+#warning "Compiling ft_system_setup() weak stub for MAC debugging."
 +__weak int ft_system_setup(void *blob, struct bd_info *bd)
 +{
 +	log_info("[ft_system_setup] called (weak stub)\n");
-+	return 0;
-+}
-+
-+#warning "Compiling image_setup_libfdt()"
+ 	return 0;
+ }
+
  int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
  {
 +	log_info("[image_setup_libfdt] called\n");
  	ulong *initrd_start = &images->initrd_start;
  	ulong *initrd_end = &images->initrd_end;
  	bool skip_board_fixup = false;
-@@ -638,6 +657,8 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
+@@ -638,6 +653,7 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
  					strlen(images->fit_uname_cfg) + 1, 1);
 
  	/* Update ethernet nodes */
-+	#warning "Compiling fdt_fixup_ethernet() call site in image_setup_libfdt()"
 +	log_info("[image_setup_libfdt] calling fdt_fixup_ethernet\n");
  	fdt_fixup_ethernet(blob);
  #if IS_ENABLED(CONFIG_CMD_PSTORE)
  	/* Append PStore configuration */
-@@ -651,6 +672,8 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
+@@ -651,6 +667,7 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
  	}
 
  	if (IS_ENABLED(CONFIG_OF_BOARD_SETUP) && !skip_board_fixup) {
-+		#warning "Compiling ft_board_setup() call site in image_setup_libfdt()"
 +		log_info("[image_setup_libfdt] calling ft_board_setup\n");
  		fdt_ret = ft_board_setup(blob, gd->bd);
  		if (fdt_ret) {
  			printf("ERROR: board-specific fdt fixup failed: %s\n",
-@@ -658,7 +681,9 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
- 			goto err;
+@@ -659,6 +676,7 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
  		}
  	}
-+	#warning "Compiling ft_system_setup() call site in image_setup_libfdt()"
  	if (IS_ENABLED(CONFIG_OF_SYSTEM_SETUP)) {
 +		log_info("[image_setup_libfdt] calling ft_system_setup\n");
  		fdt_ret = ft_system_setup(blob, gd->bd);

patch/u-boot/v2026.04/v5-1-4-spl-Make-UFS-available-for-SPL-builds.patch → patch/u-boot/v2026.04/board_radxa-rock-4d/v5-1-4-spl-Make-UFS-available-for-SPL-builds.patch

@@ -30,7 +30,7 @@ diff --git a/MAINTAINERS b/MAINTAINERS
 index 111111111111..222222222222 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -1887,6 +1887,7 @@ M:	Neil Armstrong <neil.armstrong@linaro.org>
+@@ -1886,6 +1886,7 @@ M:	Neil Armstrong <neil.armstrong@linaro.org>
  M:	Bhupesh Sharma <bhupesh.linux@gmail.com>
  M:	Neha Malcom Francis <n-francis@ti.com>
  S:	Maintained