* [U-Boot] [PATCH 1/2] net: mvgbe: remove CONFIG_DOVE
@ 2018-05-03 11:00 Chris Packham
2018-05-03 11:00 ` [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE Chris Packham
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Chris Packham @ 2018-05-03 11:00 UTC (permalink / raw)
To: u-boot
Nothing defines CONFIG_DOVE so remove the code that uses it.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
drivers/net/mvgbe.c | 2 --
drivers/net/mvgbe.h | 7 -------
2 files changed, 9 deletions(-)
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index f833efbe6779..47148e526008 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -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"
diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index 27a3f41e80cd..7a42d70831ed 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -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
--
2.17.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE
2018-05-03 11:00 [U-Boot] [PATCH 1/2] net: mvgbe: remove CONFIG_DOVE Chris Packham
@ 2018-05-03 11:00 ` Chris Packham
2018-05-03 11:17 ` Stefan Roese
` (2 more replies)
2018-05-03 11:22 ` [U-Boot] [PATCH 1/2] net: mvgbe: remove CONFIG_DOVE Stefan Roese
` (2 subsequent siblings)
3 siblings, 3 replies; 10+ messages in thread
From: Chris Packham @ 2018-05-03 11:00 UTC (permalink / raw)
To: u-boot
Add Kconfig for MVGBE and update boards to select this.
Signed-off-by: Chris Packham <judge.packham@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 ++
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/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index b346fa221aab..d4cfe70bc82a 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -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
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index c46e2b447463..f64038dfe0c2 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -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
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 88d6f596b27a..b7a65db37cfa 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -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
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index e633173f633c..a1fcbf2a802f 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -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
diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
index ec41ab7b4700..d6b4d530857e 100644
--- a/configs/ds109_defconfig
+++ b/configs/ds109_defconfig
@@ -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
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index d87d308ac097..3b3abd52c7f5 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -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
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index c4889910687f..5389cdd07e3c 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -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
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index 9a067e36cc00..cb629bbfb90a 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -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
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index 80b8ff999a55..bdd01d13873c 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -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
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 405786b15657..a821740d5d20 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -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
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index 5f378f74a8f3..b7efd70b9b70 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -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
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index ae20d245b17c..5143d2ea22f3 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -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
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 22bc6cd83f8b..51080258b28a 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -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
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 5c123a4ad801..bc64bf51e38a 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -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
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 4749eadb7487..c1c154b8948f 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -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
diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index de68d4157733..3eac4ac7aa4b 100644
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -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
diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index 892f212bfac5..d741cb8ca992 100644
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -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
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index 8176123f5731..343479526340 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -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
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index ee8d20af0f80..59c9430ae09f 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -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
diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index 89a83fdc8bb1..a4912b93785e 100644
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -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
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 75ea85bad4c6..0299e0a70744 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -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
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index a1132da9e0f1..bc6119d6e1b1 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -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
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 5337ee1fdd7f..7773a84a81c8 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -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
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 8e2a502496dc..e8f5ed6c29a4 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -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
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 1012beaef3f7..efde9b3a07e3 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -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
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index 238271e0406e..5d686eb1f929 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -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
diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index 2529687414fa..4e3921a671a5 100644
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@ -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
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index 75ebb22f2d3e..003fb172ed4d 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -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
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index 533a4032488f..fbc5b17b1333 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -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
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index db90072978f1..bba1bbeb7a4a 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -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
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index 8e01582b5565..6d1af7748d57 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -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
diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index 8a6d996f3de5..09efc6a2de9b 100644
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -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
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index d921666ae846..25a8e5340e07 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -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
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
+
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE
2018-05-03 11:00 ` [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE Chris Packham
@ 2018-05-03 11:17 ` Stefan Roese
2018-05-03 21:36 ` Joe Hershberger
2018-05-15 12:28 ` [U-Boot] [U-Boot,2/2] " Tom Rini
2 siblings, 0 replies; 10+ messages in thread
From: Stefan Roese @ 2018-05-03 11:17 UTC (permalink / raw)
To: u-boot
On 03.05.2018 13:00, Chris Packham wrote:
> Add Kconfig for MVGBE and update boards to select this.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 1/2] net: mvgbe: remove CONFIG_DOVE
2018-05-03 11:00 [U-Boot] [PATCH 1/2] net: mvgbe: remove CONFIG_DOVE Chris Packham
2018-05-03 11:00 ` [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE Chris Packham
@ 2018-05-03 11:22 ` Stefan Roese
2018-05-03 15:14 ` Joe Hershberger
2018-05-15 12:28 ` [U-Boot] [U-Boot,1/2] " Tom Rini
3 siblings, 0 replies; 10+ messages in thread
From: Stefan Roese @ 2018-05-03 11:22 UTC (permalink / raw)
To: u-boot
On 03.05.2018 13:00, Chris Packham wrote:
> Nothing defines CONFIG_DOVE so remove the code that uses it.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 1/2] net: mvgbe: remove CONFIG_DOVE
2018-05-03 11:00 [U-Boot] [PATCH 1/2] net: mvgbe: remove CONFIG_DOVE Chris Packham
2018-05-03 11:00 ` [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE Chris Packham
2018-05-03 11:22 ` [U-Boot] [PATCH 1/2] net: mvgbe: remove CONFIG_DOVE Stefan Roese
@ 2018-05-03 15:14 ` Joe Hershberger
2018-05-15 12:28 ` [U-Boot] [U-Boot,1/2] " Tom Rini
3 siblings, 0 replies; 10+ messages in thread
From: Joe Hershberger @ 2018-05-03 15:14 UTC (permalink / raw)
To: u-boot
On Thu, May 3, 2018 at 6:00 AM, Chris Packham <judge.packham@gmail.com> wrote:
> Nothing defines CONFIG_DOVE so remove the code that uses it.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE
2018-05-03 11:00 ` [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE Chris Packham
2018-05-03 11:17 ` Stefan Roese
@ 2018-05-03 21:36 ` Joe Hershberger
2018-05-03 23:03 ` Chris Packham
2018-05-15 12:28 ` [U-Boot] [U-Boot,2/2] " Tom Rini
2 siblings, 1 reply; 10+ messages in thread
From: Joe Hershberger @ 2018-05-03 21:36 UTC (permalink / raw)
To: u-boot
On Thu, May 3, 2018 at 6:00 AM, Chris Packham <judge.packham@gmail.com> wrote:
> Add Kconfig for MVGBE and update boards to select this.
>
> Signed-off-by: Chris Packham <judge.packham@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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE
2018-05-03 21:36 ` Joe Hershberger
@ 2018-05-03 23:03 ` Chris Packham
2018-05-04 18:47 ` Joe Hershberger
0 siblings, 1 reply; 10+ messages in thread
From: Chris Packham @ 2018-05-03 23:03 UTC (permalink / raw)
To: u-boot
On Fri, May 4, 2018 at 9:36 AM Joe Hershberger <joe.hershberger@ni.com>
wrote:
> On Thu, May 3, 2018 at 6:00 AM, Chris Packham <judge.packham@gmail.com>
wrote:
> > Add Kconfig for MVGBE and update boards to select this.
> >
> > Signed-off-by: Chris Packham <judge.packham@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.
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.
> 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.
> > 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
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.
> > +
> > 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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE
2018-05-03 23:03 ` Chris Packham
@ 2018-05-04 18:47 ` Joe Hershberger
0 siblings, 0 replies; 10+ messages in thread
From: Joe Hershberger @ 2018-05-04 18:47 UTC (permalink / raw)
To: u-boot
On Thu, May 3, 2018 at 6:03 PM, Chris Packham <judge.packham@gmail.com> wrote:
> On Fri, May 4, 2018 at 9:36 AM Joe Hershberger <joe.hershberger@ni.com>
> wrote:
>
>> On Thu, May 3, 2018 at 6:00 AM, Chris Packham <judge.packham@gmail.com>
> wrote:
>> > Add Kconfig for MVGBE and update boards to select this.
>> >
>> > Signed-off-by: Chris Packham <judge.packham@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.
>
> 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?
>> 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.
>
>> > 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
>
> 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.
>
>> > +
>> > 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
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [U-Boot,1/2] net: mvgbe: remove CONFIG_DOVE
2018-05-03 11:00 [U-Boot] [PATCH 1/2] net: mvgbe: remove CONFIG_DOVE Chris Packham
` (2 preceding siblings ...)
2018-05-03 15:14 ` Joe Hershberger
@ 2018-05-15 12:28 ` Tom Rini
3 siblings, 0 replies; 10+ messages in thread
From: Tom Rini @ 2018-05-15 12:28 UTC (permalink / raw)
To: u-boot
On Thu, May 03, 2018 at 11:00:34PM +1200, Chris Packham wrote:
> Nothing defines CONFIG_DOVE so remove the code that uses it.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> Reviewed-by: Stefan Roese <sr@denx.de>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Applied to u-boot/master, thanks!
--
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>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [U-Boot,2/2] net: add Kconfig for MVGBE
2018-05-03 11:00 ` [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE Chris Packham
2018-05-03 11:17 ` Stefan Roese
2018-05-03 21:36 ` Joe Hershberger
@ 2018-05-15 12:28 ` Tom Rini
2 siblings, 0 replies; 10+ messages in thread
From: Tom Rini @ 2018-05-15 12:28 UTC (permalink / raw)
To: u-boot
On Thu, May 03, 2018 at 11:00:35PM +1200, Chris Packham wrote:
> Add Kconfig for MVGBE and update boards to select this.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> Reviewed-by: Stefan Roese <sr@denx.de>
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.
--
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>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-05-15 12:28 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-03 11:00 [U-Boot] [PATCH 1/2] net: mvgbe: remove CONFIG_DOVE Chris Packham
2018-05-03 11:00 ` [U-Boot] [PATCH 2/2] net: add Kconfig for MVGBE Chris Packham
2018-05-03 11:17 ` Stefan Roese
2018-05-03 21:36 ` Joe Hershberger
2018-05-03 23:03 ` Chris Packham
2018-05-04 18:47 ` Joe Hershberger
2018-05-15 12:28 ` [U-Boot] [U-Boot,2/2] " Tom Rini
2018-05-03 11:22 ` [U-Boot] [PATCH 1/2] net: mvgbe: remove CONFIG_DOVE Stefan Roese
2018-05-03 15:14 ` Joe Hershberger
2018-05-15 12:28 ` [U-Boot] [U-Boot,1/2] " Tom Rini
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.