diff mbox series

[U-Boot,14/16] net: remove CONFIG_NET_MULTI

Message ID 1509020671-1321-15-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit 795428fc679fb74734a7144498a00e2274214f03
Delegated to: Tom Rini
Headers show
Series Remove two unused drivers and unused CONFIG options | expand

Commit Message

Masahiro Yamada Oct. 26, 2017, 12:24 p.m. UTC
This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 include/configs/am335x_shc.h     | 1 -
 include/configs/blanche.h        | 1 -
 include/configs/cm_t43.h         | 1 -
 include/configs/cyrus.h          | 1 -
 include/configs/ls1012aqds.h     | 1 -
 include/configs/ls1012ardb.h     | 1 -
 include/configs/ls1043a_common.h | 1 -
 include/configs/nsa310s.h        | 1 -
 include/configs/pengwyn.h        | 3 ---
 include/configs/salvator-x.h     | 1 -
 include/configs/ulcb.h           | 1 -
 include/configs/xilinx_zynqmp.h  | 1 -
 12 files changed, 14 deletions(-)

Comments

York Sun Oct. 26, 2017, 3:14 p.m. UTC | #1
On 10/26/2017 05:27 AM, Masahiro Yamada wrote:
> This macro is defined, but not referenced by anyone.
> 
> I did not touch config_whitelist.txt - the CONFIG will be dropped
> by the next re-sync.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
> 
>  include/configs/am335x_shc.h     | 1 -
>  include/configs/blanche.h        | 1 -
>  include/configs/cm_t43.h         | 1 -
>  include/configs/cyrus.h          | 1 -
>  include/configs/ls1012aqds.h     | 1 -
>  include/configs/ls1012ardb.h     | 1 -
>  include/configs/ls1043a_common.h | 1 -
>  include/configs/nsa310s.h        | 1 -
>  include/configs/pengwyn.h        | 3 ---
>  include/configs/salvator-x.h     | 1 -
>  include/configs/ulcb.h           | 1 -
>  include/configs/xilinx_zynqmp.h  | 1 -
>  12 files changed, 14 deletions(-)
> 

Reviewed-by: York Sun <york.sun@nxp.com>
Tom Rini Oct. 28, 2017, 1:58 a.m. UTC | #2
On Thu, Oct 26, 2017 at 09:24:29PM +0900, Masahiro Yamada wrote:

> This macro is defined, but not referenced by anyone.
> 
> I did not touch config_whitelist.txt - the CONFIG will be dropped
> by the next re-sync.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Reviewed-by: York Sun <york.sun@nxp.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 2eeb3d1..32439f5 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -266,7 +266,6 @@ 
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_NET_RETRY_COUNT         10
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_ADDR			0
 #define CONFIG_PHY_SMSC
 
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index 2b18033..ce7c716 100755
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -65,7 +65,6 @@ 
 #undef  CONFIG_CMD_SPI
 #endif
 
-#define CONFIG_NET_MULTI
 
 /* Board Clock */
 #define RMOBILE_XTAL_CLK	20000000u
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 7012a95..a222491 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -50,7 +50,6 @@ 
 #define CONFIG_BOOTP_DEFAULT
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_BOOTP_GATEWAY
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_ATHEROS
 #define CONFIG_SYS_RX_ETH_BUFFER	64
 
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 13e7c71..1b20d85 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -370,7 +370,6 @@ 
 
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_NET_MULTI
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #endif	/* CONFIG_PCI */
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index b3121d2..2899ff1 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -146,7 +146,6 @@ 
 
 #define CONFIG_PCIE1		/* PCIE controller 1 */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_SCAN_SHOW
 
 #define CONFIG_CMD_MEMINFO
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index e9edcd2..c720a8d 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -62,7 +62,6 @@ 
 
 #define CONFIG_PCIE1		/* PCIE controller 1 */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_SCAN_SHOW
 
 #define CONFIG_CMD_MEMINFO
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index a297134..a24d006 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -165,7 +165,6 @@ 
 #define CONFIG_PCIE3		/* PCIE controller 3 */
 
 #ifdef CONFIG_PCI
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_SCAN_SHOW
 #endif
 #endif
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 896c329..9c84acc 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -67,7 +67,6 @@ 
 /* Ethernet driver configuration */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_NETCONSOLE
-#define CONFIG_NET_MULTI
 #define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	1
 #define CONFIG_RESET_PHY_R
diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index 570c375..2fa280e 100644
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -182,9 +182,6 @@ 
 /* Disable CPSW SPL support so we fit within the 101KiB limit. */
 #endif
 
-/* CPSW ethernet */
-#define CONFIG_NET_MULTI
-
 /* Network */
 #define CONFIG_PHY_RESET	1
 #define CONFIG_PHY_NATSEMI
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 5bf5731..77a12de 100644
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -25,7 +25,6 @@ 
 /* use to RPC(SPI Multi I/O Bus Controller) */
 
 /* Ethernet RAVB */
-#define CONFIG_NET_MULTI
 #define CONFIG_BITBANGMII
 #define CONFIG_BITBANGMII_MULTI
 
diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index cce2456..b54e63c 100644
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -33,7 +33,6 @@ 
 /* use to RPC(SPI Multi I/O Bus Controller) */
 
 /* Ethernet RAVB */
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_MICREL
 #define CONFIG_BITBANGMII
 #define CONFIG_BITBANGMII_MULTI
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 1399dfd..8526ba0 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -131,7 +131,6 @@ 
 
 /* Ethernet driver */
 #if defined(CONFIG_ZYNQ_GEM)
-# define CONFIG_NET_MULTI
 # define CONFIG_MII
 # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
 # define CONFIG_PHY_MARVELL