ARM: mvebu: Convert CONFIG_MVNETA to Kconfig

PATCH New Chris Packham 3 participants 3 messages Aug 21, 2017 – Sep 26, 2017

Subsystems (4)

Network drivers Arm (32-bit) Arm sub-architectures Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support

lore

Share & tools

lore

Chris Packham

author

2017-08-21 08:17 UTC #0 lore raw

PATCH 1/1 ARM: mvebu: Convert CONFIG_MVNETA to Kconfig

This converts the following to Kconfig:
CONFIG_MVNETA

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

---

 arch/arm/mach-mvebu/include/mach/config.h | 3 ---
 configs/clearfog_defconfig                | 2 +-
 configs/controlcenterdc_defconfig         | 2 +-
 configs/db-88f6820-amc_defconfig          | 2 +-
 configs/db-88f6820-gp_defconfig           | 2 +-
 configs/db-mv784mp-gp_defconfig           | 2 +-
 configs/ds414_defconfig                   | 2 +-
 configs/maxbcm_defconfig                  | 2 +-
 configs/theadorable_debug_defconfig       | 2 +-
 configs/turris_omnia_defconfig            | 2 +-
 drivers/net/Kconfig                       | 8 ++++++++
 include/configs/mvebu_armada-37xx.h       | 1 -
 scripts/config_whitelist.txt              | 1 -
 13 files changed, 17 insertions(+), 14 deletions(-)

arch/arm/mach-mvebu/include/mach/config.h +0 -3

index 2dc9b1dea303..cfd095247055 100644
@@ -76,9 +76,6 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_MII		/* expose smi ove miiphy interface */
-#if !defined(CONFIG_ARMADA_375)
-#define CONFIG_MVNETA		/* Enable Marvell Gbe Controller Driver */
-#endif
 #define CONFIG_ENV_OVERWRITE	/* ethaddr can be reprogrammed */
 #define CONFIG_ARP_TIMEOUT	200
 #define CONFIG_NET_RETRY_COUNT	50

configs/clearfog_defconfig +1 -1

index b582c882297c..e397761edfc5 100644
@@ -35,8 +35,8 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
 CONFIG_SPI_FLASH=y
-CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
+CONFIG_MVNETA=y
 CONFIG_PCI=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000

configs/controlcenterdc_defconfig +1 -1

index fe74727e4e88..0b9e39b7f2ca 100644
@@ -46,8 +46,8 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_MV=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
+CONFIG_MVNETA=y
 CONFIG_SCSI=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000

configs/db-88f6820-amc_defconfig +1 -1

index 81fac43a3540..37d8f34195ac 100644
@@ -47,8 +47,8 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
+CONFIG_MVNETA=y
 CONFIG_PCI=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=200000000

configs/db-88f6820-gp_defconfig +1 -1

index 3cee2219ad51..6728cf2d9d33 100644
@@ -45,8 +45,8 @@ CONFIG_MMC_SDHCI_MV=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
+CONFIG_MVNETA=y
 CONFIG_PCI=y
 CONFIG_SCSI=y
 CONFIG_DEBUG_UART_BASE=0xd0012000

configs/db-mv784mp-gp_defconfig +1 -1

index 9458f8c43893..03035d1e3645 100644
@@ -44,8 +44,8 @@ CONFIG_NAND_PXA3XX=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
+CONFIG_MVNETA=y
 CONFIG_PCI=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000

configs/ds414_defconfig +1 -1

index 026dfa8338a2..08564dde8961 100644
@@ -38,8 +38,8 @@ CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
+CONFIG_MVNETA=y
 CONFIG_PCI=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000

configs/maxbcm_defconfig +1 -1

index 131d5e1d8eba..5efaff3b2866 100644
@@ -32,8 +32,8 @@ CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
+CONFIG_MVNETA=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2

configs/theadorable_debug_defconfig +1 -1

index a39497984ba6..0b4025c228f3 100644
@@ -51,8 +51,8 @@ CONFIG_DM_GPIO=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
+CONFIG_MVNETA=y
 CONFIG_PCI=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000

configs/turris_omnia_defconfig +1 -1

index f68a1a0d056e..1ef1ecc3d020 100644
@@ -33,8 +33,8 @@ CONFIG_MISC=y
 CONFIG_ATSHA204A=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_MV=y
-CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
+CONFIG_MVNETA=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2

drivers/net/Kconfig +8 -0

index 5ceea44c6053..d67927cd3b84 100644
@@ -159,6 +159,14 @@ config FTMAC100
 	help
 	  This MAC is present in Andestech SoCs.
 
+config MVNETA
+	bool "Marvell Armada 385 network interface support"
+	depends on ARMADA_XP || ARMADA_38X
+	select PHYLIB
+	help
+	  This driver supports the network interface units in the
+	  Marvell ARMADA XP and 38X SoCs
+
 config MVPP2
 	bool "Marvell Armada 375/7K/8K network interface support"
 	depends on ARMADA_375 || ARMADA_8K

include/configs/mvebu_armada-37xx.h +0 -1

index 71975ed54248..2571f2270725 100644
@@ -86,7 +86,6 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVNETA		/* Enable Marvell Gbe Controller Driver */
 #define CONFIG_ENV_OVERWRITE	/* ethaddr can be reprogrammed */
 #define CONFIG_ARP_TIMEOUT	200
 #define CONFIG_NET_RETRY_COUNT	50

scripts/config_whitelist.txt +0 -1

index 6c628c878ca2..060179eb5fbf 100644
@@ -1509,7 +1509,6 @@ CONFIG_MVEBU_MMC
 CONFIG_MVGBE
 CONFIG_MVGBE_PORTS
 CONFIG_MVMFP_V2
-CONFIG_MVNETA
 CONFIG_MVS
 CONFIG_MVSATA_IDE
 CONFIG_MVSATA_IDE_USE_PORT0

Signature · 1 line

2.14.1

Simon Glass

2017-08-26 23:13 UTC #1 lore raw

PATCH 1/1 ARM: mvebu: Convert CONFIG_MVNETA to Kconfig

Quoted 6 lines · Chris Packham

This converts the following to Kconfig:
CONFIG_MVNETA
Signed-off-by Chris Packham <[email protected]>
---

Quoted 14 lines

 arch/arm/mach-mvebu/include/mach/config.h | 3 ---
 configs/clearfog_defconfig                | 2 +-
 configs/controlcenterdc_defconfig         | 2 +-
 configs/db-88f6820-amc_defconfig          | 2 +-
 configs/db-88f6820-gp_defconfig           | 2 +-
 configs/db-mv784mp-gp_defconfig           | 2 +-
 configs/ds414_defconfig                   | 2 +-
 configs/maxbcm_defconfig                  | 2 +-
 configs/theadorable_debug_defconfig       | 2 +-
 configs/turris_omnia_defconfig            | 2 +-
 drivers/net/Kconfig                       | 8 ++++++++
 include/configs/mvebu_armada-37xx.h       | 1 -
 scripts/config_whitelist.txt              | 1 -
 13 files changed, 17 insertions(+), 14 deletions(-)

Reviewed-by Simon Glass <[email protected]>

Stefan Roese

2017-09-26 08:49 UTC #2 lore raw

PATCH 1/1 ARM: mvebu: Convert CONFIG_MVNETA to Kconfig

In reply to Chris Packham

Quoted 4 lines · Chris Packham

This converts the following to Kconfig:
CONFIG_MVNETA
Signed-off-by Chris Packham <[email protected]>

Applied to u-boot-marvell/master.

Thanks,
Stefan