Skip to contentSkip to conversation

net: mvgbe: remove CONFIG_DOVE

PATCH New Chris Packham 4 participants 10 messages May 3, 2018 – May 15, 2018

Subsystems (3)
Network drivers Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Chris Packham

author
#0 lore raw

PATCH 1/2 net: mvgbe: remove CONFIG_DOVE

Nothing defines CONFIG_DOVE so remove the code that uses it.

Signed-off-by Chris Packham <[email protected]>

---

 drivers/net/mvgbe.c | 2 --
 drivers/net/mvgbe.h | 7 -------
 2 files changed, 9 deletions(-)
drivers/net/mvgbe.c +0 -2
index f833efbe6779..47148e526008 100644
@@ -27,8 +27,6 @@
 #include <asm/arch/soc.h>
 #elif defined(CONFIG_ORION5X)
 #include <asm/arch/orion5x.h>
-#elif defined(CONFIG_DOVE)
-#include <asm/arch/dove.h>
 #endif
 
 #include "mvgbe.h"
drivers/net/mvgbe.h +0 -7
index 27a3f41e80cd..7a42d70831ed 100644
@@ -292,17 +292,10 @@
 #define EBAR_TARGET_GUNIT			0x00000007
 
 /* Window attrib */
-#if defined(CONFIG_DOVE)
-#define EBAR_DRAM_CS0				0x00000000
-#define EBAR_DRAM_CS1				0x00000000
-#define EBAR_DRAM_CS2				0x00000000
-#define EBAR_DRAM_CS3				0x00000000
-#else
 #define EBAR_DRAM_CS0				0x00000E00
 #define EBAR_DRAM_CS1				0x00000D00
 #define EBAR_DRAM_CS2				0x00000B00
 #define EBAR_DRAM_CS3				0x00000700
-#endif
 
 /* DRAM Target interface */
 #define EBAR_DRAM_NO_CACHE_COHERENCY		0x00000000
Signature · 1 line
2.17.0
author
#1 lore raw

PATCH 2/2 net: add Kconfig for MVGBE

Add Kconfig for MVGBE and update boards to select this.

Signed-off-by Chris Packham <[email protected]>

---

 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 ++
 drivers/net/Kconfig                          | 8 ++++++++
 include/configs/edminiv2.h                   | 1 -
 include/configs/km/km_arm.h                  | 1 -
 37 files changed, 74 insertions(+), 3 deletions(-)
arch/arm/mach-kirkwood/include/mach/config.h +0 -1
index 9d6ad5387c7c..5772182babf2 100644
@@ -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 */
configs/d2net_v2_defconfig +2 -0
index b346fa221aab..d4cfe70bc82a 100644
@@ -31,6 +31,8 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
configs/dns325_defconfig +2 -0
index c46e2b447463..f64038dfe0c2 100644
@@ -26,6 +26,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/dockstar_defconfig +2 -0
index 88d6f596b27a..b7a65db37cfa 100644
@@ -21,6 +21,8 @@ CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/dreamplug_defconfig +2 -0
index e633173f633c..a1fcbf2a802f 100644
@@ -24,6 +24,8 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
configs/ds109_defconfig +2 -0
index ec41ab7b4700..d6b4d530857e 100644
@@ -20,6 +20,8 @@ CONFIG_MVSATA_IDE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
configs/goflexhome_defconfig +2 -0
index d87d308ac097..3b3abd52c7f5 100644
@@ -27,6 +27,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/guruplug_defconfig +2 -0
index c4889910687f..5389cdd07e3c 100644
@@ -27,6 +27,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/ib62x0_defconfig +2 -0
index 9a067e36cc00..cb629bbfb90a 100644
@@ -25,6 +25,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/iconnect_defconfig +2 -0
index 80b8ff999a55..bdd01d13873c 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/inetspace_v2_defconfig +2 -0
index 405786b15657..a821740d5d20 100644
@@ -31,6 +31,8 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
configs/km_kirkwood_128m16_defconfig +2 -0
index 5f378f74a8f3..b7efd70b9b70 100644
@@ -31,6 +31,8 @@ CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
configs/km_kirkwood_defconfig +2 -0
index ae20d245b17c..5143d2ea22f3 100644
@@ -31,6 +31,8 @@ CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
configs/km_kirkwood_pci_defconfig +2 -0
index 22bc6cd83f8b..51080258b28a 100644
@@ -31,6 +31,8 @@ CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
configs/kmcoge5un_defconfig +2 -0
index 5c123a4ad801..bc64bf51e38a 100644
@@ -31,6 +31,8 @@ CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
configs/kmnusa_defconfig +2 -0
index 4749eadb7487..c1c154b8948f 100644
@@ -31,6 +31,8 @@ CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
configs/kmsugp1_defconfig +2 -0
index de68d4157733..3eac4ac7aa4b 100644
@@ -31,6 +31,8 @@ CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
configs/kmsuv31_defconfig +2 -0
index 892f212bfac5..d741cb8ca992 100644
@@ -31,6 +31,8 @@ CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
configs/lschlv2_defconfig +2 -0
index 8176123f5731..343479526340 100644
@@ -34,6 +34,8 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
configs/lsxhl_defconfig +2 -0
index ee8d20af0f80..59c9430ae09f 100644
@@ -25,6 +25,8 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
configs/mgcoge3un_defconfig +2 -0
index 89a83fdc8bb1..a4912b93785e 100644
@@ -31,6 +31,8 @@ CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
configs/nas220_defconfig +2 -0
index 75ea85bad4c6..0299e0a70744 100644
@@ -27,6 +27,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/net2big_v2_defconfig +2 -0
index a1132da9e0f1..bc6119d6e1b1 100644
@@ -31,6 +31,8 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
configs/netspace_lite_v2_defconfig +2 -0
index 5337ee1fdd7f..7773a84a81c8 100644
@@ -31,6 +31,8 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
configs/netspace_max_v2_defconfig +2 -0
index 8e2a502496dc..e8f5ed6c29a4 100644
@@ -31,6 +31,8 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
configs/netspace_mini_v2_defconfig +2 -0
index 1012beaef3f7..efde9b3a07e3 100644
@@ -29,6 +29,8 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_OF_LIBFDT=y
configs/netspace_v2_defconfig +2 -0
index 238271e0406e..5d686eb1f929 100644
@@ -31,6 +31,8 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
configs/nsa310s_defconfig +2 -0
index 2529687414fa..4e3921a671a5 100644
@@ -24,6 +24,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/openrd_base_defconfig +2 -0
index 75ebb22f2d3e..003fb172ed4d 100644
@@ -27,6 +27,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC_HW_PARTITIONING is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/openrd_client_defconfig +2 -0
index 533a4032488f..fbc5b17b1333 100644
@@ -27,6 +27,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC_HW_PARTITIONING is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/openrd_ultimate_defconfig +2 -0
index db90072978f1..bba1bbeb7a4a 100644
@@ -27,6 +27,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC_HW_PARTITIONING is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/pogo_e02_defconfig +2 -0
index 8e01582b5565..6d1af7748d57 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/portl2_defconfig +2 -0
index 8a6d996f3de5..09efc6a2de9b 100644
@@ -31,6 +31,8 @@ CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
configs/sheevaplug_defconfig +2 -0
index d921666ae846..25a8e5340e07 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
drivers/net/Kconfig +8 -0
index 3a374d887183..c962d7a72c0c 100644
@@ -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
+
 config MVNETA
 	bool "Marvell Armada XP/385/3700 network interface support"
 	depends on ARMADA_XP || ARMADA_38X || ARMADA_3700
include/configs/edminiv2.h +0 -1
index 6a92e7fde816..ee63311b4759 100644
@@ -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
include/configs/km/km_arm.h +0 -1
index c6761921c76f..8813557a2ab0 100644
@@ -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
Signature · 1 line
2.17.0
#3 lore raw

PATCH 2/2 net: add Kconfig for MVGBE

In reply to Chris Packham
Quoted 31 lines · Chris Packham

Add Kconfig for MVGBE and update boards to select this.

Signed-off-by Chris Packham <[email protected]>

---

 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 ++
Quoted 8 lines
 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?

Quoted 17 lines
 drivers/net/Kconfig                          | 8 ++++++++
 include/configs/edminiv2.h                   | 1 -
 include/configs/km/km_arm.h                  | 1 -
 37 files changed, 74 insertions(+), 3 deletions(-)
arch/arm/mach-kirkwood/include/mach/config.h +0 -1
index 9d6ad5387c7c..5772182babf2 100644
@@ -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 */

[ ... ]

Quoted 5 lines
drivers/net/Kconfig +0 -0
index 3a374d887183..c962d7a72c0c 100644

drivers/net/Kconfig config FTMAC100 · line 187

Quoted 10 lines
drivers/net/Kconfig +7 -0
@@ -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

Quoted 35 lines
drivers/net/Kconfig +1 -0
+
 config MVNETA
        bool "Marvell Armada XP/385/3700 network interface support"
        depends on ARMADA_XP || ARMADA_38X || ARMADA_3700
include/configs/edminiv2.h +0 -1
index 6a92e7fde816..ee63311b4759 100644
@@ -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
include/configs/km/km_arm.h +0 -2
index c6761921c76f..8813557a2ab0 100644
@@ -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

author
#4 lore raw

PATCH 2/2 net: add Kconfig for MVGBE

Quoted 1 line · Joe Hershberger

On Thu, May 3, 2018 at 6:00 AM, Chris Packham <[email protected]>

Quoted 40 lines · wrote:
Quoted 31 lines

Add Kconfig for MVGBE and update boards to select this.

Signed-off-by Chris Packham <[email protected]>

---

 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 ++
Quoted 8 lines
 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 ++
Quoted 2 lines

Would it be better to default y if KIRKWOOD || ORION5X? That's a fair number of defconfigs.

I thought about that. But we'd still need to set CONFIG_NETDEVICES=y so even if CONFIG_MVGBE defaulted to enabled we'd still need to touch them.

Quoted 1 line

Maybe far fewer boards don't have it enabled?

As far as I can tell "far fewer" == 0 because the old code automatically enabled it if CONFIG_CMD_NET was set. I'm not sure if any of these boards used other Ethernet devices (USB or PCI) instead of the built-in port(s) and it would be hard to find out without inspecting each one.

Quoted 6 lines

Review

Quoted 6 lines
 drivers/net/Kconfig                          | 8 ++++++++
 include/configs/edminiv2.h                   | 1 -
 include/configs/km/km_arm.h                  | 1 -
 37 files changed, 74 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-kirkwood/include/mach/config.h

Quoted 8 lines

arch/arm/mach-kirkwood/include/mach/config.h line 81

Quoted 8 lines

index 9d6ad5387c7c..5772182babf2 100644

arch/arm/mach-kirkwood/include/mach/config.h +0 -1
@@ -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

*/

Quoted 1 line

arch/arm/mach-kirkwood/include/mach/config.h line 81

Quoted 1 line
arch/arm/mach-kirkwood/include/mach/config.h +0 -0
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using

phy */

Quoted 2 lines

arch/arm/mach-kirkwood/include/mach/config.h line 83

Quoted 2 lines
arch/arm/mach-kirkwood/include/mach/config.h +0 -0
 #define CONFIG_ENV_OVERWRITE   /* ethaddr can be reprogrammed */
 #define CONFIG_RESET_PHY_R     /* use reset_phy() to init mv8831116

PHY */

Quoted 10 lines

[ ... ]

Quoted 8 lines
drivers/net/Kconfig +0 -0
index 3a374d887183..c962d7a72c0c 100644
@@ -178,6 +178,14 @@ config FTMAC100
        help
          This MAC is present in Andestech SoCs.
Quoted 9 lines

drivers/net/Kconfig config FTMAC100 · line 187

Quoted 7 lines
drivers/net/Kconfig +7 -0
+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

Yeah sorry keep forgetting. moveconfig.py failed me on this one because I needed to add CONFIG_NETDEVICES as well so I had to do a bit of a manual process. Will include in v2.

Quoted 11 lines
Quoted 11 lines
drivers/net/Kconfig +1 -0
+
 config MVNETA
        bool "Marvell Armada XP/385/3700 network interface support"
        depends on ARMADA_XP || ARMADA_38X || ARMADA_3700
include/configs/edminiv2.h +0 -0
index 6a92e7fde816..ee63311b4759 100644
@@ -118,7 +118,6 @@
  */
Quoted 2 lines

include/configs/edminiv2.h line 121

Quoted 2 lines
include/configs/edminiv2.h +0 -1
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE                           /* Enable Marvell GbE

Driver */

Quoted 2 lines

include/configs/edminiv2.h line 122

Quoted 2 lines
include/configs/edminiv2.h +0 -0
 #define CONFIG_MVGBE_PORTS     {1}             /* enable port 0 only */
 #define CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION    /* don't randomize MAC

*/

Quoted 10 lines

include/configs/km/km_arm.h line 137

Quoted 10 lines
include/configs/edminiv2.h +0 -0
 #define CONFIG_PHY_BASE_ADR    0x8
include/configs/km/km_arm.h +0 -1
index c6761921c76f..8813557a2ab0 100644
@@ -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

*/

Quoted 1 line

include/configs/km/km_arm.h line 137

Quoted 1 line
include/configs/km/km_arm.h +0 -0
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using

phy */

Quoted 9 lines
Quoted 9 lines
include/configs/km/km_arm.h +0 -1
 #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

#5 lore raw

PATCH 2/2 net: add Kconfig for MVGBE

Quoted 45 lines · Chris Packham
Quoted 1 line · Joe Hershberger

On Thu, May 3, 2018 at 6:00 AM, Chris Packham <[email protected]>

Quoted 39 lines · wrote:
Quoted 39 lines

Add Kconfig for MVGBE and update boards to select this.

Signed-off-by Chris Packham <[email protected]>

---

 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 ++
Quoted 5 lines
Quoted 2 lines

Would it be better to default y if KIRKWOOD || ORION5X? That's a fair number of defconfigs.

I thought about that. But we'd still need to set CONFIG_NETDEVICES=y so even if CONFIG_MVGBE defaulted to enabled we'd still need to touch them.

Could NET_DEVICES also default to y for these platforms?

Quoted 96 lines
Quoted 1 line

Maybe far fewer boards don't have it enabled?

As far as I can tell "far fewer" == 0 because the old code automatically enabled it if CONFIG_CMD_NET was set. I'm not sure if any of these boards used other Ethernet devices (USB or PCI) instead of the built-in port(s) and it would be hard to find out without inspecting each one.

Quoted 6 lines

Review

Quoted 6 lines
 drivers/net/Kconfig                          | 8 ++++++++
 include/configs/edminiv2.h                   | 1 -
 include/configs/km/km_arm.h                  | 1 -
 37 files changed, 74 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-kirkwood/include/mach/config.h

Quoted 8 lines

arch/arm/mach-kirkwood/include/mach/config.h line 81

Quoted 8 lines

index 9d6ad5387c7c..5772182babf2 100644

arch/arm/mach-kirkwood/include/mach/config.h +0 -1
@@ -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

*/

Quoted 1 line

arch/arm/mach-kirkwood/include/mach/config.h line 81

Quoted 1 line
arch/arm/mach-kirkwood/include/mach/config.h +0 -0
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using

phy */

Quoted 2 lines

arch/arm/mach-kirkwood/include/mach/config.h line 83

Quoted 2 lines
arch/arm/mach-kirkwood/include/mach/config.h +0 -0
 #define CONFIG_ENV_OVERWRITE   /* ethaddr can be reprogrammed */
 #define CONFIG_RESET_PHY_R     /* use reset_phy() to init mv8831116

PHY */

Quoted 10 lines

[ ... ]

Quoted 8 lines
drivers/net/Kconfig +0 -0
index 3a374d887183..c962d7a72c0c 100644
@@ -178,6 +178,14 @@ config FTMAC100
        help
          This MAC is present in Andestech SoCs.
Quoted 9 lines

drivers/net/Kconfig config FTMAC100 · line 187

Quoted 7 lines
drivers/net/Kconfig +7 -0
+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

Yeah sorry keep forgetting. moveconfig.py failed me on this one because I needed to add CONFIG_NETDEVICES as well so I had to do a bit of a manual process. Will include in v2.

Quoted 11 lines
Quoted 11 lines
drivers/net/Kconfig +1 -0
+
 config MVNETA
        bool "Marvell Armada XP/385/3700 network interface support"
        depends on ARMADA_XP || ARMADA_38X || ARMADA_3700
include/configs/edminiv2.h +0 -0
index 6a92e7fde816..ee63311b4759 100644
@@ -118,7 +118,6 @@
  */
Quoted 2 lines

include/configs/edminiv2.h line 121

Quoted 2 lines
include/configs/edminiv2.h +0 -1
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE                           /* Enable Marvell GbE

Driver */

Quoted 2 lines

include/configs/edminiv2.h line 122

Quoted 2 lines
include/configs/edminiv2.h +0 -0
 #define CONFIG_MVGBE_PORTS     {1}             /* enable port 0 only */
 #define CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION    /* don't randomize MAC

*/

Quoted 10 lines

include/configs/km/km_arm.h line 137

Quoted 10 lines
include/configs/edminiv2.h +0 -0
 #define CONFIG_PHY_BASE_ADR    0x8
include/configs/km/km_arm.h +0 -1
index c6761921c76f..8813557a2ab0 100644
@@ -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

*/

Quoted 1 line

include/configs/km/km_arm.h line 137

Quoted 1 line
include/configs/km/km_arm.h +0 -0
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using

phy */

Quoted 9 lines
Quoted 9 lines
include/configs/km/km_arm.h +0 -1
 #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

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot

#6 lore raw

PATCH 2/2 net: add Kconfig for MVGBE

In reply to Chris Packham
Quoted 4 lines · Chris Packham

Add Kconfig for MVGBE and update boards to select this.

Signed-off-by Chris Packham <[email protected]>
Reviewed-by Stefan Roese <[email protected]>

Applied to u-boot/master, thanks!

But please note that this seems to have disabled MVGBE on edminiv2 and I'm suspecting that it was a mistake to do so. Given all of the platforms you had re-enabled this on however I didn't want to NAK nor hand-fiddle myself.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180515/c6c55f64/attachment.sig>
#9 lore raw

PATCH 1/2 net: mvgbe: remove CONFIG_DOVE

In reply to Chris Packham
Quoted 5 lines · Chris Packham

Nothing defines CONFIG_DOVE so remove the code that uses it.

Signed-off-by Chris Packham <[email protected]>
Reviewed-by Stefan Roese <[email protected]>
Acked-by Joe Hershberger <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180515/cc706a49/attachment.sig>