| Message ID | 13fcc8e72ba1447729fcd5261ed27620bd289f97.1626246759.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | 988002dcd931e7236422e4d158c397d964ba1360 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | net: remove CONFIG_NET_MULTI (again) | expand |
On 14/07/21 7:12 pm, Michal Simek wrote: > CONFIG_NET_MULTI has been removed long time ago by commit 795428fc679f > ("net: remove CONFIG_NET_MULTI") but 4 boards were added later which wasn't > found. The patch is removing this reference from 4 boards. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> For my boards Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- > > include/configs/SBx81LIFKW.h | 1 - > include/configs/SBx81LIFXCAT.h | 1 - > include/configs/ebisu.h | 1 - > include/configs/xilinx_versal.h | 1 - > 4 files changed, 4 deletions(-) > > diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h > index eaa6b9246c98..ded494cfa9b0 100644 > --- a/include/configs/SBx81LIFKW.h > +++ b/include/configs/SBx81LIFKW.h > @@ -84,7 +84,6 @@ > * Ethernet Driver configuration > */ > #ifdef CONFIG_CMD_NET > -#define CONFIG_NET_MULTI /* specify more that one ports available */ > #define CONFIG_MVGBE /* Enable kirkwood Gbe Controller Driver */ > #define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */ > #define CONFIG_PHY_BASE_ADR 0x01 > diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h > index c0dc3d38c123..06bbd8642e3f 100644 > --- a/include/configs/SBx81LIFXCAT.h > +++ b/include/configs/SBx81LIFXCAT.h > @@ -84,7 +84,6 @@ > * Ethernet Driver configuration > */ > #ifdef CONFIG_CMD_NET > -#define CONFIG_NET_MULTI /* specify more that one ports available */ > #define CONFIG_MVGBE /* Enable kirkwood Gbe Controller Driver */ > #define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */ > #define CONFIG_PHY_BASE_ADR 0x01 > diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h > index 19ec74fb588d..48d4c8a9480e 100644 > --- a/include/configs/ebisu.h > +++ b/include/configs/ebisu.h > @@ -14,7 +14,6 @@ > #include "rcar-gen3-common.h" > > /* Ethernet RAVB */ > -#define CONFIG_NET_MULTI > #define CONFIG_BITBANGMII_MULTI > > /* Generic Timer Definitions (use in assembler source) */ > diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h > index 99d58835887e..62680ad2386c 100644 > --- a/include/configs/xilinx_versal.h > +++ b/include/configs/xilinx_versal.h > @@ -51,7 +51,6 @@ > > /* Ethernet driver */ > #if defined(CONFIG_ZYNQ_GEM) > -# define CONFIG_NET_MULTI > # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN > # define PHY_ANEG_TIMEOUT 20000 > #endif
On Wed, Jul 14, 2021 at 09:12:41AM +0200, Michal Simek wrote: > CONFIG_NET_MULTI has been removed long time ago by commit 795428fc679f > ("net: remove CONFIG_NET_MULTI") but 4 boards were added later which wasn't > found. The patch is removing this reference from 4 boards. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Applied to u-boot/master, thanks!
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index eaa6b9246c98..ded494cfa9b0 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -84,7 +84,6 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_NET_MULTI /* specify more that one ports available */ #define CONFIG_MVGBE /* Enable kirkwood Gbe Controller Driver */ #define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */ #define CONFIG_PHY_BASE_ADR 0x01 diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index c0dc3d38c123..06bbd8642e3f 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -84,7 +84,6 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_NET_MULTI /* specify more that one ports available */ #define CONFIG_MVGBE /* Enable kirkwood Gbe Controller Driver */ #define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */ #define CONFIG_PHY_BASE_ADR 0x01 diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h index 19ec74fb588d..48d4c8a9480e 100644 --- a/include/configs/ebisu.h +++ b/include/configs/ebisu.h @@ -14,7 +14,6 @@ #include "rcar-gen3-common.h" /* Ethernet RAVB */ -#define CONFIG_NET_MULTI #define CONFIG_BITBANGMII_MULTI /* Generic Timer Definitions (use in assembler source) */ diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index 99d58835887e..62680ad2386c 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -51,7 +51,6 @@ /* Ethernet driver */ #if defined(CONFIG_ZYNQ_GEM) -# define CONFIG_NET_MULTI # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN # define PHY_ANEG_TIMEOUT 20000 #endif
CONFIG_NET_MULTI has been removed long time ago by commit 795428fc679f ("net: remove CONFIG_NET_MULTI") but 4 boards were added later which wasn't found. The patch is removing this reference from 4 boards. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- include/configs/SBx81LIFKW.h | 1 - include/configs/SBx81LIFXCAT.h | 1 - include/configs/ebisu.h | 1 - include/configs/xilinx_versal.h | 1 - 4 files changed, 4 deletions(-)