This converts the following to Kconfig:
CONFIG_DW_ALTDESCRIPTOR
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
configs/galileo_defconfig | 1 +
configs/stm32746g-eval_defconfig | 1 +
configs/stm32746g-eval_spl_defconfig | 1 +
configs/stm32f746-disco_defconfig | 1 +
configs/stm32f746-disco_spl_defconfig | 1 +
configs/stm32f769-disco_defconfig | 1 +
configs/stm32f769-disco_spl_defconfig | 1 +
configs/stv0991_defconfig | 1 +
drivers/net/Kconfig | 5 +++++
include/configs/galileo.h | 3 ---
include/configs/socfpga_common.h | 7 -------
include/configs/socfpga_soc64_common.h | 5 -----
include/configs/stm32f746-disco.h | 1 -
include/configs/stv0991.h | 4 ----
14 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 104532bd05f3..5ae13d5a1e2b 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -49,6 +49,7 @@ CONFIG_TFTP_TSIZE=y
CONFIG_REGMAP=y
CONFIG_SYSCON=y
CONFIG_CPU=y
+CONFIG_DW_ALTDESCRIPTOR=y
CONFIG_SPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
diff --git a/configs/stm32746g-eval_defconfig b/configs/stm32746g-eval_defconfig
index 8ca8929f2a4f..64610658c7bd 100644
--- a/configs/stm32746g-eval_defconfig
+++ b/configs/stm32746g-eval_defconfig
@@ -48,6 +48,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHY_SMSC=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_DW_ALTDESCRIPTOR=y
CONFIG_MII=y
# CONFIG_PINCTRL_FULL is not set
CONFIG_SPI=y
diff --git a/configs/stm32746g-eval_spl_defconfig
b/configs/stm32746g-eval_spl_defconfig
index 55e44f863c1c..753a4b80cbbc 100644
--- a/configs/stm32746g-eval_spl_defconfig
+++ b/configs/stm32746g-eval_spl_defconfig
@@ -69,6 +69,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHY_SMSC=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_DW_ALTDESCRIPTOR=y
CONFIG_MII=y
# CONFIG_PINCTRL_FULL is not set
CONFIG_SPL_PINCTRL=y
diff --git a/configs/stm32f746-disco_defconfig
b/configs/stm32f746-disco_defconfig
index 22274f99b185..e3f80ab8e206 100644
--- a/configs/stm32f746-disco_defconfig
+++ b/configs/stm32f746-disco_defconfig
@@ -48,6 +48,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHY_SMSC=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_DW_ALTDESCRIPTOR=y
CONFIG_MII=y
# CONFIG_PINCTRL_FULL is not set
CONFIG_SPI=y
diff --git a/configs/stm32f746-disco_spl_defconfig
b/configs/stm32f746-disco_spl_defconfig
index c174984b939d..927d28dd9733 100644
--- a/configs/stm32f746-disco_spl_defconfig
+++ b/configs/stm32f746-disco_spl_defconfig
@@ -69,6 +69,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHY_SMSC=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_DW_ALTDESCRIPTOR=y
CONFIG_MII=y
# CONFIG_PINCTRL_FULL is not set
CONFIG_SPL_PINCTRL=y
diff --git a/configs/stm32f769-disco_defconfig
b/configs/stm32f769-disco_defconfig
index 9845eb0a10b2..b7e9ee92a7e1 100644
--- a/configs/stm32f769-disco_defconfig
+++ b/configs/stm32f769-disco_defconfig
@@ -47,6 +47,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHY_SMSC=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_DW_ALTDESCRIPTOR=y
CONFIG_MII=y
# CONFIG_PINCTRL_FULL is not set
CONFIG_SPI=y
diff --git a/configs/stm32f769-disco_spl_defconfig
b/configs/stm32f769-disco_spl_defconfig
index a5dc89c80273..bae28b4ec132 100644
--- a/configs/stm32f769-disco_spl_defconfig
+++ b/configs/stm32f769-disco_spl_defconfig
@@ -68,6 +68,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHY_SMSC=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_DW_ALTDESCRIPTOR=y
CONFIG_MII=y
# CONFIG_PINCTRL_FULL is not set
CONFIG_SPL_PINCTRL=y
diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
index d03d984871ab..2c143068b79e 100644
--- a/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@ -37,6 +37,7 @@ CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ8XXX=y
CONFIG_PHY_RESET_DELAY=10000
CONFIG_ETH_DESIGNWARE=y
+CONFIG_DW_ALTDESCRIPTOR=y
CONFIG_MII=y
CONFIG_CADENCE_QSPI=y
CONFIG_HAS_CQSPI_REF_CLK=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 56f9416a48db..40b5c8274e9e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -312,6 +312,7 @@ config ETH_DESIGNWARE_MESON8B
config ETH_DESIGNWARE_SOCFPGA
select REGMAP
select SYSCON
+ select DW_ALTDESCRIPTOR
bool "Altera SoCFPGA extras for Synopsys Designware Ethernet MAC"
depends on DM_ETH && ETH_DESIGNWARE
help
@@ -326,6 +327,10 @@ config ETH_DESIGNWARE_S700
This provides glue layer to use Synopsys Designware Ethernet MAC
present on Actions S700 SoC.
+config DW_ALTDESCRIPTOR
+ bool "Designware Ethernet MAC uses alternate (enhanced) descriptors"
+ depends on ETH_DESIGNWARE
+
config ETHOC
bool "OpenCores 10/100 Mbps Ethernet MAC"
help
diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index c50ecf27e44c..49f57dda58fb 100644
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -21,9 +21,6 @@
"stdout=serial\0" \
"stderr=serial\0"
-/* 10/100M Ethernet support */
-#define CONFIG_DW_ALTDESCRIPTOR
-
/* Environment configuration */
#endif /* __CONFIG_H */
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 10ba2d22ffa7..d1efba29fc40 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -51,13 +51,6 @@
#define CONFIG_SYS_L2_PL310
#define CONFIG_SYS_PL310_BASE SOCFPGA_MPUL2_ADDRESS
-/*
- * Ethernet on SoC (EMAC)
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_DW_ALTDESCRIPTOR
-#endif
-
/*
* L4 OSC1 Timer 0
*/
diff --git a/include/configs/socfpga_soc64_common.h
b/include/configs/socfpga_soc64_common.h
index c388ae9a816c..c1037ab595fa 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -89,11 +89,6 @@
* Flash configurations
*/
-/* Ethernet on SoC (EMAC) */
-#if defined(CONFIG_CMD_NET)
-#define CONFIG_DW_ALTDESCRIPTOR
-#endif /* CONFIG_CMD_NET */
-
/*
* L4 Watchdog
*/
diff --git a/include/configs/stm32f746-disco.h
b/include/configs/stm32f746-disco.h
index 05ac900f3c31..73376f16b4d6 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -21,7 +21,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 8
#define CONFIG_DW_GMAC_DEFAULT_DMA_PBL (8)
-#define CONFIG_DW_ALTDESCRIPTOR
#define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index c57b1ad8a062..567aa1ffe433 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -20,10 +20,6 @@
#define CONFIG_SYS_INIT_RAM_ADDR 0x00190000
/* U-Boot Load Address */
-/* GMAC related configs */
-
-#define CONFIG_DW_ALTDESCRIPTOR
-
/* Misc configuration */
#endif /* __CONFIG_H */
--
2.25.1
