On Fri, Mar 3, 2017 at 7:06 PM, Steve Rae <steve....@raedomain.com> wrote: > From: Suji Velupillai <suji.velupil...@broadcom.com> > > move to Kconfig: > CONFIG_BCM_SF2_ETH > CONFIG_BCM_SF2_ETH_GMAC > > Also modified defconfigs of all platforms that use these configs. > > Signed-off-by: Suji Velupillai <suji.velupil...@broadcom.com> > Tested-by: Suji Velupillai <suji.velupil...@broadcom.com> > Reviewed-by: JD Zheng <jiandong.zh...@broadcom.com> > Reviewed-by: Scott Branden <scott.bran...@broadcom.com> > Signed-off-by: Steve Rae <steve....@raedomain.com> > --- > > arch/arm/include/asm/arch-bcmcygnus/configs.h | 6 +----- > configs/bcm28155_w1d_defconfig | 5 +++-- > configs/bcm911360_entphn-ns_defconfig | 3 +++ > configs/bcm911360_entphn_defconfig | 3 +++ > configs/bcm911360k_defconfig | 3 +++ > configs/bcm958300k-ns_defconfig | 3 +++ > configs/bcm958300k_defconfig | 3 +++ > configs/bcm958305k_defconfig | 3 +++ > drivers/net/Kconfig | 15 +++++++++++++++ > scripts/config_whitelist.txt | 2 -- > 10 files changed, 37 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h > b/arch/arm/include/asm/arch-bcmcygnus/configs.h > index af7f3bf..92b1c5e 100644 > --- a/arch/arm/include/asm/arch-bcmcygnus/configs.h > +++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h > @@ -1,5 +1,5 @@ > /* > - * Copyright 2014 Broadcom Corporation. > + * Copyright 2014-2017 Broadcom. > * > * SPDX-License-Identifier: GPL-2.0+ > */ > @@ -23,10 +23,6 @@ > #define CONFIG_SYS_NS16550_COM3 0x18023000 > > /* Ethernet */ > -#define CONFIG_BCM_SF2_ETH > -#define CONFIG_BCM_SF2_ETH_GMAC > - > -#define CONFIG_PHYLIB > #define CONFIG_PHY_BROADCOM > #define CONFIG_PHY_RESET_DELAY 10000 /* PHY reset delay in us*/ > > diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig > index aa5216e..4adbce6 100644 > --- a/configs/bcm28155_w1d_defconfig > +++ b/configs/bcm28155_w1d_defconfig > @@ -1,7 +1,6 @@ > CONFIG_ARM=y > CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y > CONFIG_TARGET_BCM28155_AP=y > -CONFIG_SYS_EXTRA_OPTIONS="BCM_SF2_ETH,BCM_SF2_ETH_GMAC" > CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_CPUINFO is not set > # CONFIG_DISPLAY_BOARDINFO is not set > @@ -15,7 +14,6 @@ CONFIG_CMD_MMC=y > CONFIG_CMD_I2C=y > CONFIG_CMD_GPIO=y > # CONFIG_CMD_SETEXPR is not set > -# CONFIG_CMD_NET is not set > # CONFIG_CMD_NFS is not set > CONFIG_CMD_CACHE=y > CONFIG_CMD_FAT=y > @@ -33,3 +31,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation" > CONFIG_G_DNL_VENDOR_NUM=0x18d1 > CONFIG_G_DNL_PRODUCT_NUM=0x0d02 > +CONFIG_NETDEVICES=y > +CONFIG_BCM_SF2_ETH=y > +CONFIG_BCM_SF2_ETH_GMAC=y > diff --git a/configs/bcm911360_entphn-ns_defconfig > b/configs/bcm911360_entphn-ns_defconfig > index adcc152..f1df78a 100644 > --- a/configs/bcm911360_entphn-ns_defconfig > +++ b/configs/bcm911360_entphn-ns_defconfig > @@ -19,3 +19,6 @@ CONFIG_CMD_TIME=y > CONFIG_CMD_FAT=y > CONFIG_SYS_NS16550=y > CONFIG_OF_LIBFDT=y > +CONFIG_NETDEVICES=y > +CONFIG_BCM_SF2_ETH=y > +CONFIG_BCM_SF2_ETH_GMAC=y > diff --git a/configs/bcm911360_entphn_defconfig > b/configs/bcm911360_entphn_defconfig > index e49071d..22da69e 100644 > --- a/configs/bcm911360_entphn_defconfig > +++ b/configs/bcm911360_entphn_defconfig > @@ -19,3 +19,6 @@ CONFIG_CMD_TIME=y > CONFIG_CMD_FAT=y > CONFIG_SYS_NS16550=y > CONFIG_OF_LIBFDT=y > +CONFIG_NETDEVICES=y > +CONFIG_BCM_SF2_ETH=y > +CONFIG_BCM_SF2_ETH_GMAC=y > diff --git a/configs/bcm911360k_defconfig b/configs/bcm911360k_defconfig > index 8077c4a..0281fc8 100644 > --- a/configs/bcm911360k_defconfig > +++ b/configs/bcm911360k_defconfig > @@ -19,3 +19,6 @@ CONFIG_CMD_TIME=y > CONFIG_CMD_FAT=y > CONFIG_SYS_NS16550=y > CONFIG_OF_LIBFDT=y > +CONFIG_NETDEVICES=y > +CONFIG_BCM_SF2_ETH=y > +CONFIG_BCM_SF2_ETH_GMAC=y > diff --git a/configs/bcm958300k-ns_defconfig b/configs/bcm958300k-ns_defconfig > index 26d0b0b..c837721 100644 > --- a/configs/bcm958300k-ns_defconfig > +++ b/configs/bcm958300k-ns_defconfig > @@ -19,3 +19,6 @@ CONFIG_CMD_TIME=y > CONFIG_CMD_FAT=y > CONFIG_SYS_NS16550=y > CONFIG_OF_LIBFDT=y > +CONFIG_NETDEVICES=y > +CONFIG_BCM_SF2_ETH=y > +CONFIG_BCM_SF2_ETH_GMAC=y > diff --git a/configs/bcm958300k_defconfig b/configs/bcm958300k_defconfig > index 8077c4a..0281fc8 100644 > --- a/configs/bcm958300k_defconfig > +++ b/configs/bcm958300k_defconfig > @@ -19,3 +19,6 @@ CONFIG_CMD_TIME=y > CONFIG_CMD_FAT=y > CONFIG_SYS_NS16550=y > CONFIG_OF_LIBFDT=y > +CONFIG_NETDEVICES=y > +CONFIG_BCM_SF2_ETH=y > +CONFIG_BCM_SF2_ETH_GMAC=y > diff --git a/configs/bcm958305k_defconfig b/configs/bcm958305k_defconfig > index 8077c4a..0281fc8 100644 > --- a/configs/bcm958305k_defconfig > +++ b/configs/bcm958305k_defconfig > @@ -19,3 +19,6 @@ CONFIG_CMD_TIME=y > CONFIG_CMD_FAT=y > CONFIG_SYS_NS16550=y > CONFIG_OF_LIBFDT=y > +CONFIG_NETDEVICES=y > +CONFIG_BCM_SF2_ETH=y > +CONFIG_BCM_SF2_ETH_GMAC=y > diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig > index 70e3661..34c4f23 100644 > --- a/drivers/net/Kconfig > +++ b/drivers/net/Kconfig > @@ -40,6 +40,21 @@ config ALTERA_TSE > Please find details on the "Triple-Speed Ethernet MegaCore Function > Resource Center" of Altera. > > +config BCM_SF2_ETH > + bool "Broadcom SF2 (Starfighter2) Ethernet support" > + select PHYLIB > + help > + This driver provides a MAC and DMA abstraction framework to > + support multiple Broadcom SoCs. > + > +config BCM_SF2_ETH_GMAC > + bool "Broadcom SF2 (Starfighter2) GMAC Ethernet support" > + depends on BCM_SF2_ETH > + help > + This driver provides support to ethernet for bcmcygnus specific
Odd that the config doesn't include "cygnus" in it if that's what it applies to. > + based platforms only and it is based on the framework provided > + by the Starfighter2 driver. > + > config DWC_ETH_QOS > bool "Synopsys DWC Ethernet QOS device support" > depends on DM_ETH > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index f6c9101..21ece38 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -250,9 +250,7 @@ CONFIG_BCH_CONST_PARAMS > CONFIG_BCH_CONST_T > CONFIG_BCM2835_GPIO > CONFIG_BCM283X_MU_SERIAL > -CONFIG_BCM_SF2_ETH > CONFIG_BCM_SF2_ETH_DEFAULT_PORT Any reason not to move this along with the driver enable? > -CONFIG_BCM_SF2_ETH_GMAC > CONFIG_BD_NUM_CPUS > CONFIG_BF506_UART0_PORTF > CONFIG_BF506_UART1_PORTG > -- > 2.7.4 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/listinfo/u-boot _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
