net: Move CONFIG_RTL8169 to Kconfig

Introduce CONFIG_RTL8169 in Kconfig and move over boards' defconfig
to use that.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Stephen Warren <swaren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index fcfbf6542c97beeb41d95ecc899b42ea21421692..9e6a5c32ed7f857e3d4e9d8cd53df2d1862afbc9 100644 (file)
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_RTL8169=y
 CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y

diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 808e0e2f652c9bcb9e9ab11fc57bed1b753fb824..eba46e78cb867521dbfd9b8ddc96c853dc018842 100644 (file)
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_RTL8169=y
 CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y

diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 7a27154256195b63900a4812cb8830951c1589c0..3d7950201411ce1f6c021adf91c6bff3a47e40f4 100644 (file)
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -27,6 +27,7 @@ CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
+CONFIG_RTL8169=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y

diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index c07b27891600306c211dd4a38413d65a25a09fca..d964f1ca501c6879f7da4223283595db61700c80 100644 (file)
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_RTL8169=y
 CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y

diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index ea39e6af425e8b684fa8be870ec163638eb0bc2a..efb9c1ef3146742284b61885b384487b32b56535 100644 (file)
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -29,6 +29,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
+CONFIG_RTL8169=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART=y

diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 392c5397dc78e41c98cc4da3e7ae766fa4d59ce2..a8b1247b3a2201763ca67fc63e483fc00ab0f78a 100644 (file)
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -14,6 +14,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_RTL8169=y
 CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y

diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index a0b3a3efcb7facfeaed9fc3289a681c89f930fc8..2d8579b4aa32f80792af1471c97d90f1b918bb4d 100644 (file)
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_RTL8169=y
 CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SFLASH=y

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3ac6b66d4864d4b69b94c03b292a6bdd95a8315d..2a229b89996ddae48ddb0560d40afaba656469d9 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -108,6 +108,12 @@ config RTL8139
          This driver supports Realtek 8139 series fast ethernet family of
          PCI chipsets/adapters.
 
+config RTL8169
+       bool "Realtek 8169 series Ethernet controller driver"
+       help
+         This driver supports Realtek 8169 series gigabit ethernet family of
+         PCI/PCIe chipsets/adapters.
+
 config XILINX_AXIEMAC
        depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
        select PHYLIB

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index c672a8e40cec1e51163b92aac8dfda19900cd842..f68d8eea1e2e6ae24e637e6952d59c5f1f268c26 100644 (file)
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -63,9 +63,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
-/* PCI networking support */
-#define CONFIG_RTL8169
-
 /* General networking support */
 #define CONFIG_CMD_DHCP
 

diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index fc2dc5a67d3dadaa0cd4624329b5964edb96ecb7..acfe96895fbbc501bbcf2a8fdd87caf23266857e 100644 (file)
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -66,9 +66,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
-/* PCI networking support */
-#define CONFIG_RTL8169
-
 /* General networking support */
 #define CONFIG_CMD_DHCP
 

diff --git a/include/configs/chromebox_panther.h b/include/configs/chromebox_panther.h
index d5b33902cc20f5aebc6f60a4c0e93eca4ae7540a..05266e8ab339a6dab2c84af1f2b439c6412d91e8 100644 (file)
--- a/include/configs/chromebox_panther.h
+++ b/include/configs/chromebox_panther.h
@@ -10,6 +10,4 @@
 #include <configs/x86-common.h>
 #include <configs/x86-chromebook.h>
 
-#define CONFIG_RTL8169
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 763d2ec71eee2870e81d81d40aac53ee7a3ac818..59dbb208cdd8a07c94a730005fc19189cc864635 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -60,9 +60,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
-/* PCI networking support */
-#define CONFIG_RTL8169
-
 /* General networking support */
 #define CONFIG_CMD_DHCP
 

diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 10ca05fdda1a9376e496a20e905193871c46e91c..e0006d88bab2b775e6daad57cb4de775123c4886 100644 (file)
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -20,7 +20,6 @@
 #define CONFIG_SMSC_LPC47M
 
 #define CONFIG_PCI_PNP
-#define CONFIG_RTL8169
 #define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
                                        "stdout=vga,serial\0" \
                                        "stderr=vga,serial\0"

diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 01fd743d823b0a8778c8ebeeda7909efb9d66783..c55f07ede2778d6ce6cb0e5bd8c7ed063cc3aacb 100644 (file)
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -56,9 +56,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
-/* PCI networking support */
-#define CONFIG_RTL8169
-
 /* General networking support */
 #define CONFIG_CMD_DHCP
 

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 82a056c6903a8adfa5842c642a1d0644d7e64fda..e2da2448e5a2233b51efb01ed137b5eeb105daa7 100644 (file)
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -124,9 +124,6 @@
 #endif /* CONFIG_CMD_PCI */
 
 #if defined(CONFIG_CMD_NET)
-/*
-#define CONFIG_RTL8169
-*/
 /* AX88796L Support(NE2000 base chip) */
 #define CONFIG_DRIVER_AX88796L
 #define CONFIG_DRIVER_NE2000_BASE      0xA4100000

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 2ba0c58586521ceb33e81bf9bcf5305d80f397b8..e85256dd3758ce42ef9499ada18b94fa898d0446 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -148,9 +148,6 @@
 #define CONFIG_PCI_SYS_BUS     CONFIG_SYS_SDRAM_BASE
 #define CONFIG_PCI_SYS_SIZE    CONFIG_SYS_SDRAM_SIZE
 
-/* Network device (RTL8169) support */
-#define CONFIG_RTL8169
-
 /* ENV setting */
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 92ebb6aa4cd714b64a7b384b7d0f4379ec8c3eb2..ca188bec24c17a2ee25da5ab25d0543bc2a88d2f 100644 (file)
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -58,9 +58,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
-/* PCI networking support */
-#define CONFIG_RTL8169
-
 /* General networking support */
 #define CONFIG_CMD_DHCP