Convert CONFIG_MACB to Kconfig

This converts the following to Kconfig:
   CONFIG_MACB

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

diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index 78449a59db14e9adc5bc7db19adbee3911f7ff54..518e6d44c08d1477d3526093ac83fc5720a49897 100644 (file)
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -81,7 +81,7 @@ CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PHYLIB=y
+CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y

diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index a3f144da3078ea9f02a64a3332f221fcb1cb24b4..2f3803a05828025bfde374863202184386a2ab9e 100644 (file)
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -67,7 +67,7 @@ CONFIG_SYS_NAND_PAGE_SIZE=0x800
 CONFIG_SYS_NAND_OOBSIZE=0x40
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000
-CONFIG_PHYLIB=y
+CONFIG_MACB=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y

diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index 0faeb63a583a777518845e38d699dac9d9ca60f8..1cf38b8d77b1e8622fa0a8acbf0ebcbc38aabfa1 100644 (file)
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -34,6 +34,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_RARP=y
 CONFIG_CMD_MII=y
+# CONFIG_CMD_MDIO is not set
 CONFIG_CMD_PING=y
 CONFIG_CMD_CDP=y
 CONFIG_CMD_SNTP=y
@@ -69,6 +70,7 @@ CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_DATAFLASH=y
+CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_RTC_PCF8563=y

diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig
index 35a2d2ea60528f9e2e4c90138ecf73afb367f2c4..7c7974c123c13c3074b6425dbb0e30d53238be22 100644 (file)
--- a/configs/gurnard_defconfig
+++ b/configs/gurnard_defconfig
@@ -43,7 +43,7 @@ CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set
 CONFIG_NAND_ATMEL=y
 CONFIG_ATMEL_NAND_HWECC=y
-CONFIG_PHYLIB=y
+CONFIG_MACB=y
 CONFIG_ATMEL_USART=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y

diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig
index e36be6eebbad56aabe0d94c2360e8bdaa3ad2c3f..6fda013ab12fb5ef0d1f43db8f1f89b35173d8af 100644 (file)
--- a/configs/meesc_dataflash_defconfig
+++ b/configs/meesc_dataflash_defconfig
@@ -40,6 +40,7 @@ CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_DATAFLASH=y
+CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_DM_SERIAL=y

diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig
index 887f481c07e37e0adc45372b5e2973156452d31c..cc7697bb2dda5d4534166d94a7927c66436be64f 100644 (file)
--- a/configs/meesc_defconfig
+++ b/configs/meesc_defconfig
@@ -40,6 +40,7 @@ CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_DATAFLASH=y
+CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_DM_SERIAL=y

diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index 712e517a47170f59947f0ae97b315ed7c735c044..af6e9257acb6095fbd5e68491723c381784b889a 100644 (file)
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -69,7 +69,7 @@ CONFIG_SYS_NAND_PAGE_SIZE=0x800
 CONFIG_SYS_NAND_OOBSIZE=0x40
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000
-CONFIG_PHYLIB=y
+CONFIG_MACB=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y

diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index 4a2527c08e4fb7c56a5dcb2e1fa5b4cf5556fb1b..4b3267e504caa515fd9b551038e4b9c70b4ffaa9 100644 (file)
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
+# CONFIG_CMD_MDIO is not set
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_OVERWRITE=y
@@ -44,4 +45,5 @@ CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set
 CONFIG_NAND_ATMEL=y
+CONFIG_MACB=y
 CONFIG_ATMEL_USART=y

diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig
index a905359eb8ca742382c12ee72e608aae632cd119..3674c8f2c6f71311b26edb572e6ce8aafdb1d9bd 100644 (file)
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
+# CONFIG_CMD_MDIO is not set
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_OVERWRITE=y
@@ -43,4 +44,5 @@ CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set
 CONFIG_NAND_ATMEL=y
+CONFIG_MACB=y
 CONFIG_ATMEL_USART=y

diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index 1720e1de427042a1c5e894628a6c3809b568d73b..eaede092f853f21fd006a315a35afe8951cc6844 100644 (file)
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -87,7 +87,7 @@ CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PHYLIB=y
+CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y

diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig
index 5bf0e7535380cfa3f66ad55d19e6f7c17fcc5bd7..f1385147ed9458e83c9300d85d1b22f8ff7de92e 100644 (file)
--- a/configs/usb_a9263_dataflash_defconfig
+++ b/configs/usb_a9263_dataflash_defconfig
@@ -47,6 +47,7 @@ CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_DATAFLASH=y
+CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_DM_SERIAL=y

diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig
index e90e362a40996dddaeeeca59aaacb839de8b6765..053702b206e87d3f7b3c0d5edc3dcfa43c71a92d 100644 (file)
--- a/configs/vinco_defconfig
+++ b/configs/vinco_defconfig
@@ -36,6 +36,7 @@ CONFIG_AT91_GPIO=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=50000000
+CONFIG_MACB=y
 CONFIG_PHY_SMSC=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_ATMEL_USART=y

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3f12b758be3a6a6f537854bdc8e1aa86c5637f5d..c1a49173c28358b22b5a4e9acda06c90fb254d02 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -450,7 +450,6 @@ config MVPP2
 
 config MACB
        bool "Cadence MACB/GEM Ethernet Interface"
-       depends on DM_ETH
        select PHYLIB
        help
          The Cadence MACB ethernet interface is found on many Atmel

diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index f0e5bcefe39e377664a76156949d2ef7e6cd3d06..882cb48ecaab4fdb09787dba4fa9535e54173948 100644 (file)
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -70,7 +70,6 @@
 #endif
 
 /* Ethernet */
-#define CONFIG_MACB
 #define CONFIG_RMII
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_AT91_WANTS_COMMON_PHY

diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 80108fc89957cd1b065409e1b02509ae90c7323b..c0bdfd3f8f1438bbb01e342b052d1eff07b80d3c 100644 (file)
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -60,7 +60,6 @@
 
 /* Ethernet */
 #define CONFIG_NET_RETRY_COUNT         20
-#define CONFIG_MACB
 #define CONFIG_RMII
 #define CONFIG_PHY_ID                  0
 #define CONFIG_MACB_SEARCH_PHY

diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 3457c598857d6d59de6fe9e0742fa4a9a2a45b02..55f64b559c75d340d2f910554d247f73e4527153 100644 (file)
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -72,7 +72,6 @@
 #endif
 
 /* Ethernet */
-#define CONFIG_MACB
 #define CONFIG_RMII
 #define CONFIG_NET_RETRY_COUNT                 20
 #undef CONFIG_RESET_PHY_R

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index f43304d8448b351e175f7878cbcece7e21aa4c2f..7ce3aeafe3c176cebe6d0f3de40a5d23bb902d33 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -85,7 +85,6 @@
  * Ethernet configuration
  *
  */
-#define CONFIG_MACB
 #define CONFIG_RMII                    /* use reduced MII inteface */
 #define CONFIG_NET_RETRY_COUNT 20      /* # of DHCP/BOOTP retries */
 #define CONFIG_AT91_WANTS_COMMON_PHY

diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 32abeb03fb4916d577482f702e2f4e912aba5699..10f8fde8d58350d28eaa1b43d40c68a96eec3fd9 100644 (file)
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_NAND_READY_PIN      AT91_PIN_PC13
 
 /* Ethernet */
-#define CONFIG_MACB
 #define CONFIG_RMII
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_RESET_PHY_R

diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index b13584da51c8493bdbc81f80befae9d8960c61f4..de918e768033b92d627f53148826151930f3fab2 100644 (file)
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -39,7 +39,6 @@
 #define CONFIG_SYS_NAND_READY_PIN      AT91_PIN_PC8
 
 /* Ethernet */
-#define CONFIG_MACB
 #define CONFIG_RMII
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_RESET_PHY_R

diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 1dd78238947fe8dfa5e59f8946efd984ba008d1a..e4609b5c8971c0fe5d68744af79aaf2bf53e639d 100644 (file)
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -68,7 +68,6 @@
 #endif
 
 /* Ethernet */
-#define CONFIG_MACB
 #define CONFIG_RMII
 #define CONFIG_AT91_WANTS_COMMON_PHY
 

diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index c12e53690d0fa3ec603f6e357347b04b3a37f744..49895e7ab30e8cf5fa5fc0057b36e3956bb1ee8e 100644 (file)
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -48,7 +48,6 @@
 #endif
 
 /* Ethernet */
-#define CONFIG_MACB
 #define CONFIG_RMII
 #define CONFIG_NET_RETRY_COUNT                 20
 #define CONFIG_AT91_WANTS_COMMON_PHY

diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 7397d3e8b3e723709b7b1e9ebd5fee1a6a95bbd4..b353c372efe99bd55b2ec2357425040ee8f26f55 100644 (file)
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -51,7 +51,6 @@
 /* USB device */
 
 /* Ethernet Hardware */
-#define CONFIG_MACB
 #define CONFIG_RMII
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_MACB_SEARCH_PHY