* [U-Boot] [ PATCH v3] net: move Broadcom SF2 driver to Kconfig
@ 2017-07-10 21:05 Steve Rae
2017-07-11 12:37 ` Tom Rini
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Steve Rae @ 2017-07-10 21:05 UTC (permalink / raw)
To: u-boot
From: Suji Velupillai <suji.velupillai@broadcom.com>
move to Kconfig:
CONFIG_BCM_SF2_ETH
CONFIG_BCM_SF2_ETH_DEFAULT_PORT
CONFIG_BCM_SF2_ETH_GMAC
Also modified defconfigs of all platforms that use these configs.
Signed-off-by: Suji Velupillai <suji.velupillai@broadcom.com>
Tested-by: Suji Velupillai <suji.velupillai@broadcom.com>
Reviewed-by: JD Zheng <jiandong.zheng@broadcom.com>
Reviewed-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Steve Rae <steve.rae@raedomain.com>
---
Changes in v3:
- use Kconfig "imply" method for BCMCYGNUS boards
Changes in v2:
- update Kconfig help text
- move CONFIG_BCM_SF2_ETH_DEFAULT_PORT to Kconfig
arch/arm/Kconfig | 3 +++
arch/arm/include/asm/arch-bcmcygnus/configs.h | 6 +-----
configs/bcm28155_w1d_defconfig | 5 +++--
drivers/net/Kconfig | 24 ++++++++++++++++++++++++
drivers/net/bcm-sf2-eth.h | 2 --
scripts/config_whitelist.txt | 3 ---
6 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3c3f5f7..d3ba5c3 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -522,6 +522,9 @@ config TARGET_BCMCYGNUS
imply CMD_HASH
imply FAT_WRITE
imply HASH_VERIFY
+ imply NETDEVICES
+ imply BCM_SF2_ETH
+ imply BCM_SF2_ETH_GMAC
config TARGET_BCMNSP
bool "Support bcmnsp"
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/drivers/net/Kconfig b/drivers/net/Kconfig
index 736aab2..5ceea44 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -47,6 +47,30 @@ 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 is an abstract framework which provides a generic interface
+ to MAC and DMA management for multiple Broadcom SoCs such as
+ Cygnus, NSP and bcm28155_ap platforms.
+
+config BCM_SF2_ETH_DEFAULT_PORT
+ int "Broadcom SF2 (Starfighter2) Ethernet default port number"
+ depends on BCM_SF2_ETH
+ default 0
+ help
+ Default port number for the Starfighter2 ethernet driver.
+
+config BCM_SF2_ETH_GMAC
+ bool "Broadcom SF2 (Starfighter2) GMAC Ethernet support"
+ depends on BCM_SF2_ETH
+ help
+ This flag enables the ethernet support for Broadcom platforms with
+ GMAC such as Cygnus. This driver is based on the framework provided
+ by the BCM_SF2_ETH driver.
+ Say Y to any bcmcygnus based platforms.
+
config DWC_ETH_QOS
bool "Synopsys DWC Ethernet QOS device support"
depends on DM_ETH
diff --git a/drivers/net/bcm-sf2-eth.h b/drivers/net/bcm-sf2-eth.h
index c4e2e01..efeff15 100644
--- a/drivers/net/bcm-sf2-eth.h
+++ b/drivers/net/bcm-sf2-eth.h
@@ -20,8 +20,6 @@
/* Support 2 Ethernet ports now */
#define BCM_ETH_MAX_PORT_NUM 2
-#define CONFIG_BCM_SF2_ETH_DEFAULT_PORT 0
-
enum {
MAC_DMA_TX = 1,
MAC_DMA_RX = 2
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 54eee53..75602a9 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -157,9 +157,6 @@ 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
-CONFIG_BCM_SF2_ETH_GMAC
CONFIG_BIOSEMU
CONFIG_BITBANGMII_MULTI
CONFIG_BL1_OFFSET
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [ PATCH v3] net: move Broadcom SF2 driver to Kconfig
2017-07-10 21:05 [U-Boot] [ PATCH v3] net: move Broadcom SF2 driver to Kconfig Steve Rae
@ 2017-07-11 12:37 ` Tom Rini
2017-07-27 21:48 ` Joe Hershberger
2017-08-07 20:32 ` [U-Boot] " Joe Hershberger
2 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2017-07-11 12:37 UTC (permalink / raw)
To: u-boot
On Mon, Jul 10, 2017 at 02:05:41PM -0700, Steve Rae wrote:
> From: Suji Velupillai <suji.velupillai@broadcom.com>
>
> move to Kconfig:
> CONFIG_BCM_SF2_ETH
> CONFIG_BCM_SF2_ETH_DEFAULT_PORT
> CONFIG_BCM_SF2_ETH_GMAC
>
> Also modified defconfigs of all platforms that use these configs.
>
> Signed-off-by: Suji Velupillai <suji.velupillai@broadcom.com>
> Tested-by: Suji Velupillai <suji.velupillai@broadcom.com>
> Reviewed-by: JD Zheng <jiandong.zheng@broadcom.com>
> Reviewed-by: Scott Branden <scott.branden@broadcom.com>
> Signed-off-by: Steve Rae <steve.rae@raedomain.com>
>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170711/a65d60a4/attachment.sig>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [ PATCH v3] net: move Broadcom SF2 driver to Kconfig
2017-07-10 21:05 [U-Boot] [ PATCH v3] net: move Broadcom SF2 driver to Kconfig Steve Rae
2017-07-11 12:37 ` Tom Rini
@ 2017-07-27 21:48 ` Joe Hershberger
2017-08-07 20:32 ` [U-Boot] " Joe Hershberger
2 siblings, 0 replies; 4+ messages in thread
From: Joe Hershberger @ 2017-07-27 21:48 UTC (permalink / raw)
To: u-boot
On Mon, Jul 10, 2017 at 4:05 PM, Steve Rae <steve.rae@raedomain.com> wrote:
> From: Suji Velupillai <suji.velupillai@broadcom.com>
>
> move to Kconfig:
> CONFIG_BCM_SF2_ETH
> CONFIG_BCM_SF2_ETH_DEFAULT_PORT
> CONFIG_BCM_SF2_ETH_GMAC
>
> Also modified defconfigs of all platforms that use these configs.
>
> Signed-off-by: Suji Velupillai <suji.velupillai@broadcom.com>
> Tested-by: Suji Velupillai <suji.velupillai@broadcom.com>
> Reviewed-by: JD Zheng <jiandong.zheng@broadcom.com>
> Reviewed-by: Scott Branden <scott.branden@broadcom.com>
> Signed-off-by: Steve Rae <steve.rae@raedomain.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] net: move Broadcom SF2 driver to Kconfig
2017-07-10 21:05 [U-Boot] [ PATCH v3] net: move Broadcom SF2 driver to Kconfig Steve Rae
2017-07-11 12:37 ` Tom Rini
2017-07-27 21:48 ` Joe Hershberger
@ 2017-08-07 20:32 ` Joe Hershberger
2 siblings, 0 replies; 4+ messages in thread
From: Joe Hershberger @ 2017-08-07 20:32 UTC (permalink / raw)
To: u-boot
Hi Steve,
https://patchwork.ozlabs.org/patch/786395/ was applied to u-boot-net.git.
Thanks!
-Joe
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-08-07 20:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-10 21:05 [U-Boot] [ PATCH v3] net: move Broadcom SF2 driver to Kconfig Steve Rae
2017-07-11 12:37 ` Tom Rini
2017-07-27 21:48 ` Joe Hershberger
2017-08-07 20:32 ` [U-Boot] " Joe Hershberger
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.