pickman: Record cherry-pick of 3 commits from us/next

- 118a10e1dd ARM: renesas: Consistently enable ENV_OVERWRITE on Renesas R-Car
- 70da4f2859 net: rswitch: Do not register disabled ports as ethernet devices
- 0d05bd2058 Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh

.gitlab-ci.yml

@@ -782,17 +782,6 @@ pcduino3_nano:
     ROLE: pcduino3_nano
   <<: *lab_dfn
 
-samus:
-  variables:
-    ROLE: samus
-  <<: *lab_dfn
-
-# chromebook_samus_tpl
-samus_tpl:
-  variables:
-    ROLE: samus_tpl
-  <<: *lab_dfn
-
 link:
   variables:
     ROLE: link
@@ -927,11 +916,6 @@ rpi5:
     ROLE: rpi5
   <<: *lab_dfn
 
-zybo:
-  variables:
-    ROLE: zybo
-  <<: *lab_dfn
-
 qemu-x86_64:
   variables:
     ROLE: qemu-x86_64

.pickman-history

@@ -732,3 +732,46 @@ The build completed successfully. Let me provide a summary:
 
 ---
 
+## 2025-12-19: us/next
+
+Branch: cherry-118a10e1dde
+
+Commits:
+- 118a10e1dde ARM: renesas: Consistently enable ENV_OVERWRITE on Renesas R-Car
+- 70da4f28592 net: rswitch: Do not register disabled ports as ethernet devices
+- 0d05bd2058b Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh
+
+### Conversation log
+The repository is clean. Now let me create and checkout the new branch based on ci/master:
+
+Now let me cherry-pick the first commit:
+
+First commit cherry-picked successfully. Now the second commit:
+
+Second commit cherry-picked successfully. Now the third commit which is a merge commit:
+
+The merge commit is empty (expected since the parent commits were already cherry-picked). Let me commit it as an empty commit to preserve the merge message:
+
+All three commits cherry-picked successfully. Let me verify with git log:
+
+All 3 commits are present. Now let me run the build verification:
+
+## Final Status
+
+**Cherry-pick Summary:**
+- ✅ All 3 commits successfully cherry-picked to branch `cherry-118a10e1dde`
+
+| Commit | Subject | Status |
+|--------|---------|--------|
+| 118a10e1dde | ARM: renesas: Consistently enable ENV_OVERWRITE on Renesas R-Car | ✅ Cherry-picked |
+| 70da4f28592 | net: rswitch: Do not register disabled ports as ethernet devices | ✅ Cherry-picked |
+| 0d05bd2058b | Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh | ✅ Cherry-picked (empty commit) |
+
+**Build Result:** ✅ **OK** - 1 board built successfully, no warnings or errors
+
+**Fix-ups Made:** None - all cherry-picks applied cleanly
+
+**Branch Status:** `cherry-118a10e1dde` is ready for pushing, 3 commits ahead of `ci/master`
+
+---
+

Makefile

@@ -17,7 +17,7 @@ include include/host_arch.h
 ifeq ("", "$(CROSS_COMPILE)")
   MK_ARCH="${shell uname -m}"
 else
-  MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^\(ccache\)\{0,1\}[[:space:]]*\([^\/]*\/\)*\([^-]*\)-[^[:space:]]*/\3/p'}"
+  MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^\(.*ccache\)\{0,1\}[[:space:]]*\([^\/]*\/\)*\([^-]*\)-[^[:space:]]*/\3/p'}"
 endif
 unexport HOST_ARCH
 ifeq ("x86_64", $(MK_ARCH))

arch/arm/dts/rk3399-firefly-u-boot.dtsi

@@ -6,6 +6,12 @@
 #include "rk3399-u-boot.dtsi"
 #include "rk3399-sdram-ddr3-1600.dtsi"
 
+&sdmmc {
+	max-frequency = <25000000>;  /* 25MHz for SD-wire compatibility */
+	/delete-property/ cap-sd-highspeed;
+	/delete-property/ cap-mmc-highspeed;
+};
+
 &vdd_log {
 	regulator-init-microvolt = <950000>;
 };

arch/arm/mach-imx/imx8m/soc.c

@@ -362,7 +362,7 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size)
 	 * space below the 4G address boundary (which is 3GiB big),
 	 * even when the effective available memory is bigger.
 	 */
-	top_addr = clamp_val((u64)PHYS_SDRAM + gd->ram_size, 0, 0xffffffff);
+	top_addr = clamp_val((u64)PHYS_SDRAM + gd->ram_size, 0, SZ_4G);
 
 	/*
 	 * rom_pointer[0] stores the TEE memory start address.

common/memtop.c

@@ -121,8 +121,8 @@ static long region_overlap_check(struct mem_region *mem_rgn, phys_addr_t base,
 	return (i < mem_rgn->count) ? i : -1;
 }
 
-static int find_ram_top(struct mem_region *free_mem,
+static phys_addr_t find_ram_top(struct mem_region *free_mem,
-			struct mem_region *reserved_mem, phys_size_t size)
+				struct mem_region *reserved_mem, phys_size_t size)
 {
 	long i, rgn;
 	phys_addr_t base = 0;

configs/renesas_rcar.config

@@ -17,6 +17,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_SPI=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_ENV_OVERWRITE=y
 CONFIG_FIT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_MTD=y

configs/renesas_rcar2.config

@@ -14,7 +14,6 @@ CONFIG_CMD_USB=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4f000000
 CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_SECT_SIZE=0x40000
 CONFIG_ENV_SIZE=0x40000
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y

configs/renesas_rcar3.config

@@ -2,5 +2,4 @@
 
 CONFIG_BITBANGMII=y
 CONFIG_BITBANGMII_MULTI=y
-CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_PBSIZE=2068

configs/starfive_visionfive2_defconfig

@@ -32,7 +32,6 @@ CONFIG_CMODEL_MEDANY=y
 CONFIG_RISCV_SMODE=y
 # CONFIG_OF_BOARD_FIXUP is not set
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
 CONFIG_FIT=y
 CONFIG_BOOTSTD_DEFAULTS=y
 CONFIG_BOOTSTAGE=y

drivers/clk/renesas/r8a779h0-cpg-mssr.c

@@ -39,7 +39,6 @@ enum clk_ids {
 	CLK_PLL6,
 	CLK_PLL7,
 	CLK_PLL1_DIV2,
-	CLK_PLL2_DIV2,
 	CLK_PLL3_DIV2,
 	CLK_PLL4_DIV2,
 	CLK_PLL4_DIV5,
@@ -82,7 +81,6 @@ static const struct cpg_core_clk r8a779h0_core_clks[] = {
 	DEF_BASE(".pll7", CLK_PLL7,	CLK_TYPE_GEN4_PLL7,	CLK_MAIN),
 
 	DEF_FIXED(".pll1_div2",	CLK_PLL1_DIV2,	CLK_PLL1,	2, 1),
-	DEF_FIXED(".pll2_div2",	CLK_PLL2_DIV2,	CLK_PLL2,	2, 1),
 	DEF_FIXED(".pll3_div2",	CLK_PLL3_DIV2,	CLK_PLL3,	2, 1),
 	DEF_FIXED(".pll4_div2",	CLK_PLL4_DIV2,	CLK_PLL4,	2, 1),
 	DEF_FIXED(".pll4_div5",	CLK_PLL4_DIV5,	CLK_PLL4,	5, 1),
@@ -106,10 +104,10 @@ static const struct cpg_core_clk r8a779h0_core_clks[] = {
 	DEF_RATE(".oco",	CLK_OCO,	32768),
 
 	/* Core Clock Outputs */
-	DEF_GEN4_Z("zc0",	R8A779H0_CLK_ZC0,	CLK_TYPE_GEN4_Z,	CLK_PLL2_DIV2,	2, 0),
+	DEF_GEN4_Z("zc0",	R8A779H0_CLK_ZC0,	CLK_TYPE_GEN4_Z,	CLK_PLL2,	4, 0),
-	DEF_GEN4_Z("zc1",	R8A779H0_CLK_ZC1,	CLK_TYPE_GEN4_Z,	CLK_PLL2_DIV2,	2, 8),
+	DEF_GEN4_Z("zc1",	R8A779H0_CLK_ZC1,	CLK_TYPE_GEN4_Z,	CLK_PLL2,	4, 8),
-	DEF_GEN4_Z("zc2",	R8A779H0_CLK_ZC2,	CLK_TYPE_GEN4_Z,	CLK_PLL2_DIV2,	2, 32),
+	DEF_GEN4_Z("zc2",	R8A779H0_CLK_ZC2,	CLK_TYPE_GEN4_Z,	CLK_PLL2,	4, 32),
-	DEF_GEN4_Z("zc3",	R8A779H0_CLK_ZC3,	CLK_TYPE_GEN4_Z,	CLK_PLL2_DIV2,	2, 40),
+	DEF_GEN4_Z("zc3",	R8A779H0_CLK_ZC3,	CLK_TYPE_GEN4_Z,	CLK_PLL2,	4, 40),
 	DEF_FIXED("s0d2",	R8A779H0_CLK_S0D2,	CLK_S0,		2, 1),
 	DEF_FIXED("s0d3",	R8A779H0_CLK_S0D3,	CLK_S0,		3, 1),
 	DEF_FIXED("s0d4",	R8A779H0_CLK_S0D4,	CLK_S0,		4, 1),

drivers/net/rswitch.c

@@ -837,6 +837,7 @@ static int rswitch_send(struct udevice *dev, void *packet, int len)
 
 	/* Update TX descriptor */
 	rswitch_flush_dcache((uintptr_t)packet, len);
+	rswitch_invalidate_dcache((uintptr_t)desc, sizeof(*desc));
 	memset(desc, 0x0, sizeof(*desc));
 	desc->die_dt = DT_FSINGLE;
 	desc->info_ds = len;
@@ -1112,6 +1113,9 @@ static int rswitch_bind(struct udevice *parent)
 		return -ENOENT;
 
 	ofnode_for_each_subnode(node, ports_np) {
+		if (!ofnode_is_enabled(node))
+			continue;
+
 		ret = device_bind_with_driver_data(parent, drv,
 						   ofnode_get_name(node),
 						   (ulong)priv, node, &dev);

net/Kconfig

@@ -90,7 +90,7 @@ config TFTP_WINDOWSIZE
 config TFTP_TSIZE
 	bool "Track TFTP transfers based on file size option"
 	depends on CMD_TFTPBOOT
-	default y if (ARCH_OMAP2PLUS || ARCH_K3)
+	default y if (ARCH_OMAP2PLUS || ARCH_K3 || ARCH_RENESAS)
 	help
 	  By default, TFTP progress bar is increased for each received UDP
 	  frame, which can lead into long time being spent for sending

test/py/console_base.py

@@ -309,6 +309,8 @@ class ConsoleBase():
         try:
             self.log.info('Waiting for U-Boot to be ready')
 
+            if self.lab_mode:
+                self.timeout = TIMEOUT_PREPARE_MS
             if not self.lab_mode:
                 self._wait_for_banner(loop_num)
                 self.u_boot_version_string = self.after

test/py/tests/test_distro.py

@@ -105,49 +105,9 @@ def test_distro_arm_app_efi(ubman):
         ubman.expect(
             ["Booting bootflow 'efi_media_1.bootdev.part_1' with efi"])
 
-        # Press Escape to force GRUB to appear, even if the silent menu was
+    # Wait for Linux to boot to userspace (kernel may be quiet)
-        # enabled by a previous boot. If the menu is already set to appear, this
+    with ubman.log.section('Linux'):
-        # will exit to the grub> prompt
+        with ubman.temporary_timeout(200 * 1000):
-        ubman.send('\x1b')
+            ubman.expect(['Ubuntu 25.04 qarm ttyAMA0'])
-
-        # Press Escape again, to force it to the grub> prompt
-        ubman.send('\x1b')
-
-    # Wait until we see the editor appear
-    with ubman.log.section('grub'):
-        ubman.expect(['grub>'])
-
-        ubman.run_command('normal', wait_for_prompt=False)
-
-        ubman.expect(['ESC to return previous'])
-
-        # Press 'e' to edit the command line
-        ubman.log.info("Pressing 'e'")
-        ubman.send('e')
-        for _ in range(10):
-            ubman.ctrl('N')
-        expected = '\tlinux\t/boot/vmlinuz-6.14.0-27-generic '
-        expected += 'root=UUID=e5665fb4-e1de-4335-86da-357ad5422319 ro  '
-        for _ in expected:
-            ubman.ctrl('F')
-
-        to_erase = 'quiet splash'
-        for _ in to_erase:
-            ubman.ctrl('D')
-        ubman.ctrl('X')
-        ubman.expect(['Booting a command list'])
-
-    with ubman.log.section('exit boot-services'):
-        ubman.expect(['EFI stub: Exiting boot services...'])
-
-        ubman.log.info("boot")
-        ubman.expect(['Booting Linux on physical CPU'])
-
-    with ubman.log.section('initrd'):
-        ubman.expect(['Freeing initrd memory:'])
-        ubman.expect(['Run /init as init process'])
-
-    with ubman.temporary_timeout(200 * 1000):
-        ubman.expect(['Ubuntu 25.04 qarm ttyAMA0'])
 
     ubman.restart_uboot()