Merge branch '2022-03-25-Kconfig-migrations' into next

- Merge a number of Kconfig migration patches

5 files changed, 41 insertions, 4 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 71e0cbafb41..a6171a7c7ff 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -423,6 +423,11 @@ config KSZ9477
 	  This driver implements a DSA switch driver for the KSZ9477 family
 	  of GbE switches using the I2C interface.
 
+config LPC32XX_ETH
+	bool "LPC32xx Ethernet MAC interface driver"
+	depends on ARCH_LPC32XX
+	default y
+
 config MVGBE
 	bool "Marvell Orion5x/Kirkwood network interface support"
 	depends on ARCH_KIRKWOOD || ARCH_ORION5X
@@ -535,6 +540,11 @@ config MII
 	help
 	  Enable support of the Media-Independent Interface (MII)
 
+config RMII
+	bool "Enable RMII"
+	help
+	  Enable support of the Reduced Media-Independent Interface (MII)
+
 config PCNET
 	bool "AMD PCnet series Ethernet controller driver"
 	help
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index ca06b35316d..e2c8f41876e 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -200,9 +200,7 @@ int mii_discover_phy(fec_info_t *info)
 }
 #endif				/* CONFIG_SYS_DISCOVER_PHY */
 
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
+__weak void mii_init(void)
 {
 #ifdef CONFIG_DM_ETH
 	struct udevice *dev;
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 74339a25ca5..eed6eb18669 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -330,3 +330,11 @@ config PHY_NCSI
 	depends on DM_ETH
 
 endif #PHYLIB
+
+config PHY_RESET_DELAY
+	int "Extra delay after reset before MII register access"
+	default 0
+	help
+	  Some PHYs need extra delay after reset before any MII register access
+	  is possible.  For such PHY, set this option to the usec delay
+	  required.
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index fffa10f68b3..92fff5b72c0 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -872,7 +872,7 @@ int phy_reset(struct phy_device *phydev)
 		return -1;
 	}
 
-#ifdef CONFIG_PHY_RESET_DELAY
+#if CONFIG_PHY_RESET_DELAY > 0
 	udelay(CONFIG_PHY_RESET_DELAY);	/* Intel LXT971A needs this */
 #endif
 	/*
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 646fec70262..1bf7f4a8084 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -421,6 +421,15 @@ config VIDEO_LCD_ANX9804
 	from a parallel LCD interface and translate it on the fy into a DP
 	interface for driving eDP TFT displays. It uses I2C for configuration.
 
+config ATMEL_LCD
+	bool "Atmel LCD panel support"
+	depends on LCD && ARCH_AT91
+
+config ATMEL_LCD_BGR555
+	bool "Display in BGR555 mode"
+	help
+	  Use the BGR555 output mode.  Otherwise RGB565 is used.
+
 config VIDEO_LCD_ORISETECH_OTM8009A
 	bool "OTM8009A DSI LCD panel support"
 	depends on DM_VIDEO
@@ -819,6 +828,18 @@ config LCD
 	  CONFIG option. See the README for details. Drives which have been
 	  converted to driver model will instead used CONFIG_DM_VIDEO.
 
+config LCD_INFO
+	bool "Show LCD info on-screen"
+	depends on LCD
+
+config LCD_LOGO
+	bool "Show a logo on screen"
+	depends on LCD
+
+config LCD_INFO_BELOW_LOGO
+	bool "Show LCD info below the on-screen logo"
+	depends on LCD_INFO && LCD_LOGO
+
 config VIDEO_DW_HDMI
 	bool
 	help