From b8475e6aca2f8ae3831bc195a89377fd737e221a Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 7 Nov 2021 22:59:48 -0500 Subject: [PATCH] Convert CONFIG_MACB to Kconfig This converts the following to Kconfig: CONFIG_MACB Signed-off-by: Tom Rini --- configs/axm_defconfig | 2 +- configs/corvus_defconfig | 2 +- configs/ethernut5_defconfig | 2 ++ configs/gurnard_defconfig | 2 +- configs/meesc_dataflash_defconfig | 1 + configs/meesc_defconfig | 1 + configs/smartweb_defconfig | 2 +- configs/snapper9260_defconfig | 2 ++ configs/snapper9g20_defconfig | 2 ++ configs/taurus_defconfig | 2 +- configs/usb_a9263_dataflash_defconfig | 1 + configs/vinco_defconfig | 1 + drivers/net/Kconfig | 1 - include/configs/corvus.h | 1 - include/configs/ethernut5.h | 1 - include/configs/meesc.h | 1 - include/configs/smartweb.h | 1 - include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/taurus.h | 1 - include/configs/usb_a9263.h | 1 - include/configs/vinco.h | 1 - 22 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 78449a59db..518e6d44c0 100644 --- 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 a3f144da30..2f3803a058 100644 --- 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 0faeb63a58..1cf38b8d77 100644 --- 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 35a2d2ea60..7c7974c123 100644 --- 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 e36be6eebb..6fda013ab1 100644 --- 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 887f481c07..cc7697bb2d 100644 --- 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 712e517a47..af6e9257ac 100644 --- 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 4a2527c08e..4b3267e504 100644 --- 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 a905359eb8..3674c8f2c6 100644 --- 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 1720e1de42..eaede092f8 100644 --- 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 5bf0e75353..f1385147ed 100644 --- 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 e90e362a40..053702b206 100644 --- 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 3f12b758be..c1a49173c2 100644 --- 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 f0e5bcefe3..882cb48eca 100644 --- 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 80108fc899..c0bdfd3f8f 100644 --- 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 3457c59885..55f64b559c 100644 --- 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 f43304d844..7ce3aeafe3 100644 --- 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 32abeb03fb..10f8fde8d5 100644 --- 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 b13584da51..de918e7680 100644 --- 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 1dd7823894..e4609b5c89 100644 --- 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 c12e53690d..49895e7ab3 100644 --- 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 7397d3e8b3..b353c372ef 100644 --- 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