| Message ID | 1458568062-3965-2-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, Mar 21, 2016 at 8:47 AM, Bin Meng <bmeng.cn@gmail.com> wrote: > 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>
On 03/21/2016 08:44 AM, Bin Meng wrote: > Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig > to use that. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > Changes in v2: None > > 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 | 5 ----- > 7 files changed, 7 insertions(+), 9 deletions(-) What about the defconfig for MPC8641HPCN and r2dplus? -Scott
On Tue, Mar 22, 2016 at 1:01 AM, Scott Wood <scott.wood@nxp.com> wrote: > On 03/21/2016 08:44 AM, Bin Meng wrote: >> Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig >> to use that. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- >> >> Changes in v2: None >> >> 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 | 5 ----- >> 7 files changed, 7 insertions(+), 9 deletions(-) > > What about the defconfig for MPC8641HPCN and r2dplus? > Looks they should be added automatically by moveconfig, but somehow they were not. Hi Joe, Masahiro, Do you know why moveconfig fails to handle these two board files? Regards, Bin
Hi Bin, On Mon, Mar 21, 2016 at 9:14 PM, Bin Meng <bmeng.cn@gmail.com> wrote: > On Tue, Mar 22, 2016 at 1:01 AM, Scott Wood <scott.wood@nxp.com> wrote: >> On 03/21/2016 08:44 AM, Bin Meng wrote: >>> Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig >>> to use that. >>> >>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >>> --- >>> >>> Changes in v2: None >>> >>> 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 | 5 ----- >>> 7 files changed, 7 insertions(+), 9 deletions(-) >> >> What about the defconfig for MPC8641HPCN and r2dplus? >> > > Looks they should be added automatically by moveconfig, but somehow > they were not. > > Hi Joe, Masahiro, > > Do you know why moveconfig fails to handle these two board files? I've seen it miss moves for several reasons. Maybe your build env failed to create the intermediate files for those targets? -Joe
On Tue, Mar 22, 2016 at 05:25:04PM -0500, Joe Hershberger wrote: > Hi Bin, > > On Mon, Mar 21, 2016 at 9:14 PM, Bin Meng <bmeng.cn@gmail.com> wrote: > > On Tue, Mar 22, 2016 at 1:01 AM, Scott Wood <scott.wood@nxp.com> wrote: > >> On 03/21/2016 08:44 AM, Bin Meng wrote: > >>> Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig > >>> to use that. > >>> > >>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > >>> --- > >>> > >>> Changes in v2: None > >>> > >>> 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 | 5 ----- > >>> 7 files changed, 7 insertions(+), 9 deletions(-) > >> > >> What about the defconfig for MPC8641HPCN and r2dplus? > >> > > > > Looks they should be added automatically by moveconfig, but somehow > > they were not. > > > > Hi Joe, Masahiro, > > > > Do you know why moveconfig fails to handle these two board files? > > I've seen it miss moves for several reasons. Maybe your build env > failed to create the intermediate files for those targets? Please note that I've fixed this up locally and will be pushing shortly, so no need for a v3.
On Wed, Mar 23, 2016 at 6:50 AM, Tom Rini <trini@konsulko.com> wrote: > On Tue, Mar 22, 2016 at 05:25:04PM -0500, Joe Hershberger wrote: >> Hi Bin, >> >> On Mon, Mar 21, 2016 at 9:14 PM, Bin Meng <bmeng.cn@gmail.com> wrote: >> > On Tue, Mar 22, 2016 at 1:01 AM, Scott Wood <scott.wood@nxp.com> wrote: >> >> On 03/21/2016 08:44 AM, Bin Meng wrote: >> >>> Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig >> >>> to use that. >> >>> >> >>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> >>> --- >> >>> >> >>> Changes in v2: None >> >>> >> >>> 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 | 5 ----- >> >>> 7 files changed, 7 insertions(+), 9 deletions(-) >> >> >> >> What about the defconfig for MPC8641HPCN and r2dplus? >> >> >> > >> > Looks they should be added automatically by moveconfig, but somehow >> > they were not. >> > >> > Hi Joe, Masahiro, >> > >> > Do you know why moveconfig fails to handle these two board files? >> >> I've seen it miss moves for several reasons. Maybe your build env >> failed to create the intermediate files for those targets? > > Please note that I've fixed this up locally and will be pushing shortly, > so no need for a v3. Thanks Tom! Regards, Bin
On Mon, Mar 21, 2016 at 06:47:41AM -0700, Bin Meng wrote: > 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> Manually fixed up the boards Scott noted and then, applied to u-boot/master, thanks!
diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig index 9790d8a..8937682 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/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 9298c30..980cb99 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 494c46f..2372d5f 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 cfcd5b9..95f59e0 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 bd0a3f5..1f4ed2a 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 2d1e56a..82e7a89 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 */
Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig to use that. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- Changes in v2: None 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 | 5 ----- 7 files changed, 7 insertions(+), 9 deletions(-)