Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh
diff --git a/configs/renesas_rcar.config b/configs/renesas_rcar.config
index 351803b..d0a12f2 100644
--- a/configs/renesas_rcar.config
+++ b/configs/renesas_rcar.config
@@ -17,6 +17,7 @@
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 74dfd41..4ffc4d0 100644
--- a/configs/renesas_rcar2.config
+++ b/configs/renesas_rcar2.config
@@ -14,7 +14,6 @@
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 228e1b4..7f7fab7d 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 97b5d1b..57eff74 100644
--- a/drivers/net/rswitch.c
+++ b/drivers/net/rswitch.c
@@ -1113,6 +1113,9 @@
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);