From 0764f24ae6bc937e358990c357f7452b4d5351e3 Mon Sep 17 00:00:00 2001 From: Bin Meng <bmeng.cn@gmail.com> Date: Mon, 21 Mar 2016 06:47:42 -0700 Subject: [PATCH] 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> --- configs/beaver_defconfig | 1 + configs/cardhu_defconfig | 1 + configs/chromebox_panther_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/p2371-2180_defconfig | 1 + configs/trimslice_defconfig | 1 + drivers/net/Kconfig | 6 ++++++ include/configs/beaver.h | 3 --- include/configs/cardhu.h | 3 --- include/configs/chromebox_panther.h | 2 -- include/configs/jetson-tk1.h | 3 --- include/configs/minnowmax.h | 1 - include/configs/p2371-2180.h | 3 --- include/configs/r7780mp.h | 3 --- include/configs/sh7785lcr.h | 3 --- include/configs/trimslice.h | 3 --- 17 files changed, 13 insertions(+), 24 deletions(-) diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index fcfbf6542c..9e6a5c32ed 100644 --- 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 808e0e2f65..eba46e78cb 100644 --- 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 7a27154256..3d79502014 100644 --- 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 c07b278916..d964f1ca50 100644 --- 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 ea39e6af42..efb9c1ef31 100644 --- 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 392c5397dc..a8b1247b3a 100644 --- 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 a0b3a3efcb..2d8579b4aa 100644 --- 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 3ac6b66d48..2a229b8999 100644 --- 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 c672a8e40c..f68d8eea1e 100644 --- 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 fc2dc5a67d..acfe96895f 100644 --- 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 d5b33902cc..05266e8ab3 100644 --- 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 763d2ec71e..59dbb208cd 100644 --- 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 10ca05fdda..e0006d88ba 100644 --- 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 01fd743d82..c55f07ede2 100644 --- 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 82a056c690..e2da2448e5 100644 --- 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 2ba0c58586..e85256dd37 100644 --- 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 92ebb6aa4c..ca188bec24 100644 --- 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 -- 2.39.5