Convert CONFIG_DW_ALTDESCRIPTOR to Kconfig

This converts the following to Kconfig:
   CONFIG_DW_ALTDESCRIPTOR

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 104532bd05f3b5346362b6e63e8c6a61f1e377cd..5ae13d5a1e2bb9ad5f9eca057c1795d906d59515 100644 (file)
--- 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 8ca8929f2a4f09e5de49e6ad492fc1d9089411f9..64610658c7bda953cfbbe4b0b584ad1eaeecd29e 100644 (file)
--- 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 55e44f863c1cf6e0fbf3b936536ab5f6182b6574..753a4b80cbbc12d29656e4b474f2fa24ca07b3cf 100644 (file)
--- 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 22274f99b1857d5e1a7a5ac88767ce9d9a56a2f4..e3f80ab8e2069ea605e936f5c28408e4e787cb6a 100644 (file)
--- 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 c174984b939daff45940724d2959b98801b85ac7..927d28dd9733b99d5507a17ff0a6293107373626 100644 (file)
--- 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 9845eb0a10b280fee9ba20370a178a13c571aa1e..b7e9ee92a7e1ba44643188a1b18f87816c0e7619 100644 (file)
--- 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 a5dc89c80273941e629a0b152451fc2f472364b5..bae28b4ec132efb4a234725e31f5065ded96e1dd 100644 (file)
--- 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 d03d984871ab6fece1f1fece16abcb0fad3f8845..2c143068b79ee8cd9da5e56f2cb1bcf736b5617c 100644 (file)
--- 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 56f9416a48db1924590a6bfb916c70e1902498b2..40b5c8274e9e9a5fffa98079552cbac605290db9 100644 (file)
--- 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 c50ecf27e44c27e389e0378ebbfefd28d23a8621..49f57dda58fb8a2168bb0c0eee1471f031a1cf28 100644 (file)
--- 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 10ba2d22ffa74c2f27098d1db670c03ca5c36ad2..d1efba29fc409006657c22ad5c85b2b85ac2711d 100644 (file)
--- 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 c388ae9a816ccb51a740e12ca9eafa7f16ca584e..c1037ab595fafee0b5a539a277085ce738965c9e 100644 (file)
--- 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 05ac900f3c3195e152f2f00c0840525a6687b9b2..73376f16b4d67b6dcaf286fdf64388328162c193 100644 (file)
--- 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 c57b1ad8a06232e75cc01305b86dbad3bfe28ccd..567aa1ffe4331bb97d37d4d7b6d778dae047db35 100644 (file)
--- 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 */