From: Bin Meng <bmeng.cn@gmail.com>
Date: Mon, 21 Mar 2016 13:47:41 +0000 (-0700)
Subject: net: Move CONFIG_RTL8139 to Kconfig
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=86e9dc86b1a2;p=u-boot.git

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 9790d8a787..8937682a88 100644
--- 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 98298b7ee8..cfe26eaf93 100644
--- 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 2e0254fe60..b745f8b98c 100644
--- 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 cca0156449..ddb184b9a6 100644
--- 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 bc2f51d958..3ac6b66d48 100644
--- 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 9298c3080c..980cb992a2 100644
--- 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 494c46ff50..2372d5f2a5 100644
--- 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 cfcd5b9bd0..95f59e05b1 100644
--- 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 bd0a3f5716..1f4ed2a536 100644
--- 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 2d1e56aeb8..82e7a896cb 100644
--- 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 */