From 5a606a4c977dda5d3079502dca12800c62a68465 Mon Sep 17 00:00:00 2001 From: Tom Rini <trini@konsulko.com> Date: Fri, 18 Mar 2022 08:38:19 -0400 Subject: [PATCH] Convert CONFIG_AT91_WANTS_COMMON_PHY to Kconfig This converts the following to Kconfig: CONFIG_AT91_WANTS_COMMON_PHY Cc: Eugen Hristev <eugen.hristev@microchip.com> Signed-off-by: Tom Rini <trini@konsulko.com> --- arch/arm/mach-at91/Kconfig | 9 +++++++++ include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/corvus.h | 1 - include/configs/pm9g45.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 - 10 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index fc193b935e..145c4b276b 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -81,6 +81,7 @@ config TARGET_ETHERNUT5 config TARGET_SNAPPER9260 bool "Support snapper9260" select AT91SAM9260 + select AT91_WANTS_COMMON_PHY select DM select DM_GPIO select DM_SERIAL @@ -89,6 +90,7 @@ config TARGET_SNAPPER9260 config TARGET_GURNARD bool "Support gurnard" select AT91SAM9G45 + select AT91_WANTS_COMMON_PHY select BOARD_LATE_INIT select DM select DM_ETH @@ -115,6 +117,7 @@ config TARGET_AT91SAM9263EK config TARGET_USB_A9263 bool "Caloa USB A9260 board" select AT91SAM9263 + select AT91_WANTS_COMMON_PHY config TARGET_PM9263 bool "Ronetix pm9263 board" @@ -250,6 +253,7 @@ config TARGET_MEESC config TARGET_CORVUS bool "Support corvus" select AT91SAM9M10G45 + select AT91_WANTS_COMMON_PHY select DM select DM_ETH select DM_GPIO @@ -267,6 +271,7 @@ config TARGET_SAMA7G5EK config TARGET_TAURUS bool "Support taurus" select AT91SAM9G20 + select AT91_WANTS_COMMON_PHY select DM select DM_ETH select DM_GPIO @@ -279,6 +284,7 @@ config TARGET_TAURUS config TARGET_SMARTWEB bool "Support smartweb" select AT91SAM9260 + select AT91_WANTS_COMMON_PHY select DM select DM_ETH select DM_GPIO @@ -318,6 +324,9 @@ config AT91_GPIO_PULLUP config ATMEL_LEGACY bool "Legacy GPIO support" +config AT91_WANTS_COMMON_PHY + bool + source "board/atmel/at91sam9260ek/Kconfig" source "board/atmel/at91sam9261ek/Kconfig" source "board/atmel/at91sam9263ek/Kconfig" diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index b084f96afd..0fe4217d23 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -186,7 +186,6 @@ /* Ethernet */ #define CONFIG_RESET_PHY_R 1 -#define CONFIG_AT91_WANTS_COMMON_PHY /* USB */ #define CONFIG_USB_ATMEL diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 0f5d991022..a664297364 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -48,7 +48,6 @@ /* Ethernet */ #define CONFIG_RESET_PHY_R -#define CONFIG_AT91_WANTS_COMMON_PHY #ifdef CONFIG_NAND_BOOT /* bootstrap + u-boot + env in nandflash */ diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 2aabd4bbe2..66eb8e9302 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -57,7 +57,6 @@ /* Ethernet */ #define CONFIG_RMII -#define CONFIG_AT91_WANTS_COMMON_PHY /* DFU class support */ #define DFU_MANIFEST_POLL_TIMEOUT 25000 diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 61a7c6255f..1572071984 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -41,7 +41,6 @@ /* Ethernet */ #define CONFIG_RESET_PHY_R -#define CONFIG_AT91_WANTS_COMMON_PHY #ifdef CONFIG_NAND_BOOT /* bootstrap + u-boot + env in nandflash */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 259c05df55..7b6395581b 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -81,7 +81,6 @@ * */ #define CONFIG_RMII /* use reduced MII inteface */ -#define CONFIG_AT91_WANTS_COMMON_PHY /* BOOTP and DHCP options */ diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 028c6234a0..ffa2102069 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -40,7 +40,6 @@ /* Ethernet */ #define CONFIG_RMII #define CONFIG_RESET_PHY_R -#define CONFIG_AT91_WANTS_COMMON_PHY #define CONFIG_TFTP_PORT /* USB */ diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 55e51b4b46..beb21d84fd 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -41,7 +41,6 @@ /* Ethernet */ #define CONFIG_RMII #define CONFIG_RESET_PHY_R -#define CONFIG_AT91_WANTS_COMMON_PHY #define CONFIG_TFTP_PORT /* LCD */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 4ea3607116..6fd60e5dde 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -65,7 +65,6 @@ /* Ethernet */ #define CONFIG_RMII -#define CONFIG_AT91_WANTS_COMMON_PHY /* USB */ #if defined(CONFIG_BOARD_TAURUS) diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 128be9262a..f6a4a4cbe0 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -45,7 +45,6 @@ /* Ethernet */ #define CONFIG_RMII -#define CONFIG_AT91_WANTS_COMMON_PHY /* USB */ #ifdef CONFIG_CMD_USB -- 2.39.5