[U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE

Joe Hershberger joe.hershberger at ni.com
Thu May 3 21:36:04 UTC 2018


On Thu, May 3, 2018 at 6:00 AM, Chris Packham <judge.packham at gmail.com> wrote:
> Add Kconfig for MVGBE and update boards to select this.
>
> Signed-off-by: Chris Packham <judge.packham at gmail.com>
> ---
>
>  arch/arm/mach-kirkwood/include/mach/config.h | 1 -
>  configs/d2net_v2_defconfig                   | 2 ++
>  configs/dns325_defconfig                     | 2 ++
>  configs/dockstar_defconfig                   | 2 ++
>  configs/dreamplug_defconfig                  | 2 ++
>  configs/ds109_defconfig                      | 2 ++
>  configs/goflexhome_defconfig                 | 2 ++
>  configs/guruplug_defconfig                   | 2 ++
>  configs/ib62x0_defconfig                     | 2 ++
>  configs/iconnect_defconfig                   | 2 ++
>  configs/inetspace_v2_defconfig               | 2 ++
>  configs/km_kirkwood_128m16_defconfig         | 2 ++
>  configs/km_kirkwood_defconfig                | 2 ++
>  configs/km_kirkwood_pci_defconfig            | 2 ++
>  configs/kmcoge5un_defconfig                  | 2 ++
>  configs/kmnusa_defconfig                     | 2 ++
>  configs/kmsugp1_defconfig                    | 2 ++
>  configs/kmsuv31_defconfig                    | 2 ++
>  configs/lschlv2_defconfig                    | 2 ++
>  configs/lsxhl_defconfig                      | 2 ++
>  configs/mgcoge3un_defconfig                  | 2 ++
>  configs/nas220_defconfig                     | 2 ++
>  configs/net2big_v2_defconfig                 | 2 ++
>  configs/netspace_lite_v2_defconfig           | 2 ++
>  configs/netspace_max_v2_defconfig            | 2 ++
>  configs/netspace_mini_v2_defconfig           | 2 ++
>  configs/netspace_v2_defconfig                | 2 ++
>  configs/nsa310s_defconfig                    | 2 ++
>  configs/openrd_base_defconfig                | 2 ++
>  configs/openrd_client_defconfig              | 2 ++
>  configs/openrd_ultimate_defconfig            | 2 ++
>  configs/pogo_e02_defconfig                   | 2 ++
>  configs/portl2_defconfig                     | 2 ++
>  configs/sheevaplug_defconfig                 | 2 ++

Would it be better to default y if KIRKWOOD || ORION5X? That's a fair
number of defconfigs. Maybe far fewer boards don't have it enabled?

>  drivers/net/Kconfig                          | 8 ++++++++
>  include/configs/edminiv2.h                   | 1 -
>  include/configs/km/km_arm.h                  | 1 -
>  37 files changed, 74 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
> index 9d6ad5387c7c..5772182babf2 100644
> --- a/arch/arm/mach-kirkwood/include/mach/config.h
> +++ b/arch/arm/mach-kirkwood/include/mach/config.h
> @@ -78,7 +78,6 @@
>  #ifdef CONFIG_CMD_NET
>  #define CONFIG_NETCONSOLE      /* include NetConsole support   */
>  #define CONFIG_MII             /* expose smi ove miiphy interface */
> -#define CONFIG_MVGBE           /* Enable Marvell Gbe Controller Driver */
>  #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using phy */
>  #define CONFIG_ENV_OVERWRITE   /* ethaddr can be reprogrammed */
>  #define CONFIG_RESET_PHY_R     /* use reset_phy() to init mv8831116 PHY */

[ ... ]

> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 3a374d887183..c962d7a72c0c 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -178,6 +178,14 @@ config FTMAC100
>         help
>           This MAC is present in Andestech SoCs.
>
> +config MVGBE
> +       bool "Marvell Orion5x/Kirkwood network interface support"
> +       depends on KIRKWOOD || ORION5X
> +       select PHYLIB
> +       help
> +         This driver supports the network interface units in the
> +         Marvell Orion5x and Kirkwood SoCs

Please remove CONFIG_MVGBE from scripts/config_whitelist.txt

> +
>  config MVNETA
>         bool "Marvell Armada XP/385/3700 network interface support"
>         depends on ARMADA_XP || ARMADA_38X || ARMADA_3700
> diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
> index 6a92e7fde816..ee63311b4759 100644
> --- a/include/configs/edminiv2.h
> +++ b/include/configs/edminiv2.h
> @@ -118,7 +118,6 @@
>   */
>
>  #ifdef CONFIG_CMD_NET
> -#define CONFIG_MVGBE                           /* Enable Marvell GbE Driver */
>  #define CONFIG_MVGBE_PORTS     {1}             /* enable port 0 only */
>  #define CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION    /* don't randomize MAC */
>  #define CONFIG_PHY_BASE_ADR    0x8
> diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
> index c6761921c76f..8813557a2ab0 100644
> --- a/include/configs/km/km_arm.h
> +++ b/include/configs/km/km_arm.h
> @@ -134,7 +134,6 @@
>   */
>  #define CONFIG_NETCONSOLE      /* include NetConsole support   */
>  #define CONFIG_MII             /* expose smi ove miiphy interface */
> -#define CONFIG_MVGBE           /* Enable Marvell Gbe Controller Driver */
>  #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using phy */
>  #define CONFIG_MVGBE_PORTS     {1, 0}  /* enable port 0 only */
>  #define CONFIG_PHY_BASE_ADR    0
> --
> 2.17.0
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot


More information about the U-Boot mailing list