diff options
| author | Tom Rini <trini@konsulko.com> | 2024-12-23 08:45:34 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-12-23 08:45:34 -0600 |
| commit | 0d05bd2058bc5f415f0e3460f961e6414877db5a (patch) | |
| tree | 6757b7c8f06cbe4e1116e76f3383fd821666690f | |
| parent | cfe57427c28763fd94e5bdcf89de9dabca4b1684 (diff) | |
| parent | 70da4f28592d0a2296b27a9126da97cc3b30891e (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh
| -rw-r--r-- | configs/renesas_rcar.config | 1 | ||||
| -rw-r--r-- | configs/renesas_rcar2.config | 1 | ||||
| -rw-r--r-- | configs/renesas_rcar3.config | 1 | ||||
| -rw-r--r-- | drivers/net/rswitch.c | 3 |
4 files changed, 4 insertions, 2 deletions
diff --git a/configs/renesas_rcar.config b/configs/renesas_rcar.config index 351803b743a..d0a12f266aa 100644 --- a/configs/renesas_rcar.config +++ b/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 diff --git a/configs/renesas_rcar2.config b/configs/renesas_rcar2.config index 74dfd41f1a3..4ffc4d05882 100644 --- a/configs/renesas_rcar2.config +++ b/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 diff --git a/configs/renesas_rcar3.config b/configs/renesas_rcar3.config index 228e1b4c679..7f7fab7df1d 100644 --- a/configs/renesas_rcar3.config +++ b/configs/renesas_rcar3.config @@ -2,5 +2,4 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y -CONFIG_ENV_OVERWRITE=y CONFIG_SYS_PBSIZE=2068 diff --git a/drivers/net/rswitch.c b/drivers/net/rswitch.c index 97b5d1b75c1..57eff748c90 100644 --- a/drivers/net/rswitch.c +++ b/drivers/net/rswitch.c @@ -1113,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); |