net: Move CONFIG_RTL8139 to Kconfig

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

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
[trini: Fixup MPC8641HPCN* and r2dplus configs]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
index 9790d8a787b612a449e5fbda6feb888f3f415fc8..8937682a88bc62217e94d81d0e57cf564c9e2b78 100644 (file)
--- a/configs/MPC8544DS_defconfig
+++ b/configs/MPC8544DS_defconfig
@@ -5,5 +5,6 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_RTL8139=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig
index 98298b7ee8378e7ac52218d9505b03cff34107f8..cfe26eaf93e3dde323207f8af618d4b522a04e64 100644 (file)
--- a/configs/MPC8641HPCN_36BIT_defconfig
+++ b/configs/MPC8641HPCN_36BIT_defconfig
@@ -5,5 +5,6 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PHYS_64BIT"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_RTL8139=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig
index 2e0254fe607b095004558bdfa80ccb2160be7ddb..b745f8b98cc76fc093199ccafe675138f17c1fc9 100644 (file)
--- a/configs/MPC8641HPCN_defconfig
+++ b/configs/MPC8641HPCN_defconfig
@@ -4,5 +4,6 @@ CONFIG_TARGET_MPC8641HPCN=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_RTL8139=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index cca01564496adce6c420c8956e779b3cbaae0a6b..ddb184b9a6d2bae8123c56f34f089459c92ffbf6 100644 (file)
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SH=y
 CONFIG_TARGET_R2DPLUS=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_RTL8139=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index bc2f51d95884320eb2e5d652a835c37b1ac7517a..3ac6b66d4864d4b69b94c03b292a6bdd95a8315d 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -102,6 +102,12 @@ config PCH_GBE
          This MAC is present in Intel Platform Controller Hub EG20T. It
          supports 10/100/1000 Mbps operation.
 
+config RTL8139
+       bool "Realtek 8139 series Ethernet controller driver"
+       help
+         This driver supports Realtek 8139 series fast ethernet family of
+         PCI chipsets/adapters.
+
 config XILINX_AXIEMAC
        depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
        select PHYLIB

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 9298c3080cb3dd06f5a6ca66164d0a23362f8617..980cb992a2a31ddd505610921f818048e4868bd1 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -527,7 +527,6 @@
 
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
-#undef CONFIG_RTL8139
 
 #ifndef CONFIG_PCI_PNP
        #define PCI_ENET0_IOADDR        CONFIG_SYS_PCI1_IO_BUS

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 494c46ff50d01934ae357fd960c5cb416999f4b2..2372d5f2a57dadd31e3c0f93a07a05f3ca3ccbf0 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -298,7 +298,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
-#define CONFIG_RTL8139
 
 #ifndef CONFIG_PCI_PNP
        #define PCI_ENET0_IOADDR        CONFIG_SYS_PCI1_IO_BUS

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index cfcd5b9bd0b9bb6a2eab9dd7dffba7741d3907a5..95f59e05b1838f1f1fad1c4f7872c442abcccd3d 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -490,7 +490,6 @@
 
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
-#undef CONFIG_RTL8139
 
 #ifndef CONFIG_PCI_PNP
        #define PCI_ENET0_IOADDR        CONFIG_SYS_PCIE3_IO_BUS

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index bd0a3f571622d9deebb0536bc0c3095add507ca6..1f4ed2a53640da366de42552eea37fb2de8d093e 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -362,7 +362,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
-#define CONFIG_RTL8139
 
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 2d1e56aeb8d4d75f60a3055bd34f2ae8f4ec4c3c..82e7a896cb0e4a3b86dba2e6f70461804a8c4f7b 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -110,9 +110,4 @@
 #define CONFIG_PCI_SYS_PHYS    (CONFIG_SYS_SDRAM_BASE & 0x1fffffff)
 #define CONFIG_PCI_SYS_SIZE    CONFIG_SYS_SDRAM_SIZE
 
-/*
- * Network device (RTL8139) support
- */
-#define CONFIG_RTL8139
-
 #endif /* __CONFIG_H */