* [U-Boot] [PATCH 1/2] net: Move CONFIG_RTL8139 to Kconfig
@ 2016-02-24 5:09 Bin Meng
2016-02-24 5:09 ` [U-Boot] [PATCH 2/2] net: Move CONFIG_RTL8169 " Bin Meng
0 siblings, 1 reply; 4+ messages in thread
From: Bin Meng @ 2016-02-24 5:09 UTC (permalink / raw)
To: u-boot
Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig
to use that.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---
configs/MPC8544DS_defconfig | 1 +
drivers/net/Kconfig | 6 ++++++
include/configs/MPC8536DS.h | 1 -
include/configs/MPC8544DS.h | 1 -
include/configs/MPC8572DS.h | 1 -
include/configs/MPC8641HPCN.h | 1 -
include/configs/r2dplus.h | 1 -
7 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
index e4e2f9c..22ad4bb 100644
--- a/configs/MPC8544DS_defconfig
+++ b/configs/MPC8544DS_defconfig
@@ -3,4 +3,5 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8544DS=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
+CONFIG_RTL8139=y
CONFIG_SYS_NS16550=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index bc2f51d..3ac6b66 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 294be3b..22d204b 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -534,7 +534,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 0fa5fd3..2cfae77 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -303,7 +303,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 b34a033..2a7ccda 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -501,7 +501,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 a84db51..987e614 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -369,7 +369,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 2d1e56a..3610a2e 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -113,6 +113,5 @@
/*
* Network device (RTL8139) support
*/
-#define CONFIG_RTL8139
#endif /* __CONFIG_H */
--
1.8.2.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/2] net: Move CONFIG_RTL8169 to Kconfig
2016-02-24 5:09 [U-Boot] [PATCH 1/2] net: Move CONFIG_RTL8139 to Kconfig Bin Meng
@ 2016-02-24 5:09 ` Bin Meng
2016-02-24 16:48 ` Stephen Warren
0 siblings, 1 reply; 4+ messages in thread
From: Bin Meng @ 2016-02-24 5:09 UTC (permalink / raw)
To: u-boot
Introduce CONFIG_RTL8169 in Kconfig and move over boards' defconfig
to use that.
Signed-off-by: Bin Meng <bmeng.cn@gmail.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 | 1 -
include/configs/cardhu.h | 1 -
include/configs/chromebox_panther.h | 1 -
include/configs/jetson-tk1.h | 1 -
include/configs/minnowmax.h | 1 -
include/configs/p2371-2180.h | 1 -
include/configs/r7780mp.h | 1 -
include/configs/sh7785lcr.h | 1 -
include/configs/trimslice.h | 1 -
17 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 8add08d..3804d4d 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_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_TEGRA20_SLINK=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index c9f565a..ac37326 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_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_TEGRA20_SLINK=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 86014c5..37448eb 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -26,6 +26,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 efc4aee..b2ae53f 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_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/minnowmax_defconfig b/configs/minnowmax_defconfig
index 5d5579a..ff9e44c 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -25,6 +25,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 5e5139b..ddd7320 100644
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -13,6 +13,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 e34faa3..c6a10f0 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_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_TEGRA20_SFLASH=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3ac6b66..2a229b8 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 c672a8e..21ee954 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -64,7 +64,6 @@
#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 fc2dc5a..12cc394 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -67,7 +67,6 @@
#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 d5b3390..46bbe4c 100644
--- a/include/configs/chromebox_panther.h
+++ b/include/configs/chromebox_panther.h
@@ -10,6 +10,5 @@
#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 763d2ec..1586b87 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -61,7 +61,6 @@
#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 1cb135b..7c49921 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 01fd743..c0861b9 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -57,7 +57,6 @@
#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 82a056c..243c803 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -125,7 +125,6 @@
#if defined(CONFIG_CMD_NET)
/*
-#define CONFIG_RTL8169
*/
/* AX88796L Support(NE2000 base chip) */
#define CONFIG_DRIVER_AX88796L
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 2ba0c58..851eaec 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -149,7 +149,6 @@
#define CONFIG_PCI_SYS_SIZE CONFIG_SYS_SDRAM_SIZE
/* Network device (RTL8169) support */
-#define CONFIG_RTL8169
/* ENV setting */
#define CONFIG_ENV_IS_IN_FLASH
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 92ebb6a..7a3c7dc 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -59,7 +59,6 @@
#define CONFIG_CMD_PCI
/* PCI networking support */
-#define CONFIG_RTL8169
/* General networking support */
#define CONFIG_CMD_DHCP
--
1.8.2.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/2] net: Move CONFIG_RTL8169 to Kconfig
2016-02-24 5:09 ` [U-Boot] [PATCH 2/2] net: Move CONFIG_RTL8169 " Bin Meng
@ 2016-02-24 16:48 ` Stephen Warren
2016-02-25 7:26 ` Bin Meng
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Warren @ 2016-02-24 16:48 UTC (permalink / raw)
To: u-boot
On 02/23/2016 10:09 PM, Bin Meng wrote:
> Introduce CONFIG_RTL8169 in Kconfig and move over boards' defconfig
> to use that.
You didn't Cc any maintainers of these files... I only accidentally
noticed this patch.
> 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 | 1 -
> include/configs/cardhu.h | 1 -
> include/configs/chromebox_panther.h | 1 -
> include/configs/jetson-tk1.h | 1 -
> include/configs/minnowmax.h | 1 -
> include/configs/p2371-2180.h | 1 -
> include/configs/r7780mp.h | 1 -
> include/configs/sh7785lcr.h | 1 -
> include/configs/trimslice.h | 1 -
I don't see any file in configs/ that was updated to account for the
removals from r7780mp.h and sh7785lcr.h. Is that intentional?
> diff --git a/include/configs/beaver.h b/include/configs/beaver.h
> index c672a8e..21ee954 100644
> --- a/include/configs/beaver.h
> +++ b/include/configs/beaver.h
> @@ -64,7 +64,6 @@
> #define CONFIG_CMD_PCI
>
> /* PCI networking support */
> -#define CONFIG_RTL8169
>
> /* General networking support */
> #define CONFIG_CMD_DHCP
The comment "PCI networking support" and the blank line before it should
be removed too. This comment applies to a number of the other files too.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/2] net: Move CONFIG_RTL8169 to Kconfig
2016-02-24 16:48 ` Stephen Warren
@ 2016-02-25 7:26 ` Bin Meng
0 siblings, 0 replies; 4+ messages in thread
From: Bin Meng @ 2016-02-25 7:26 UTC (permalink / raw)
To: u-boot
Hi Stephen,
On Thu, Feb 25, 2016 at 12:48 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 02/23/2016 10:09 PM, Bin Meng wrote:
>>
>> Introduce CONFIG_RTL8169 in Kconfig and move over boards' defconfig
>> to use that.
>
>
> You didn't Cc any maintainers of these files... I only accidentally noticed
> this patch.
>
Sorry about that. Will do next time.
>> 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 | 1 -
>> include/configs/cardhu.h | 1 -
>> include/configs/chromebox_panther.h | 1 -
>> include/configs/jetson-tk1.h | 1 -
>> include/configs/minnowmax.h | 1 -
>> include/configs/p2371-2180.h | 1 -
>> include/configs/r7780mp.h | 1 -
>> include/configs/sh7785lcr.h | 1 -
>> include/configs/trimslice.h | 1 -
>
>
> I don't see any file in configs/ that was updated to account for the
> removals from r7780mp.h and sh7785lcr.h. Is that intentional?
>
This was done by moveconfig tool automatically. I may double check this.
>> diff --git a/include/configs/beaver.h b/include/configs/beaver.h
>> index c672a8e..21ee954 100644
>> --- a/include/configs/beaver.h
>> +++ b/include/configs/beaver.h
>> @@ -64,7 +64,6 @@
>> #define CONFIG_CMD_PCI
>>
>> /* PCI networking support */
>> -#define CONFIG_RTL8169
>>
>> /* General networking support */
>> #define CONFIG_CMD_DHCP
>
>
> The comment "PCI networking support" and the blank line before it should be
> removed too. This comment applies to a number of the other files too.
Will remove that in v2.
Regards,
Bin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-02-25 7:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-24 5:09 [U-Boot] [PATCH 1/2] net: Move CONFIG_RTL8139 to Kconfig Bin Meng
2016-02-24 5:09 ` [U-Boot] [PATCH 2/2] net: Move CONFIG_RTL8169 " Bin Meng
2016-02-24 16:48 ` Stephen Warren
2016-02-25 7:26 ` Bin Meng
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.