Convert CONFIG_MII_INIT to Kconfig

This converts the following to Kconfig:
   CONFIG_MII_INIT

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2022-03-18 08:38:27 -04:00
parent 16199a8b96
commit cc386f161c
28 changed files with 18 additions and 16 deletions

View File

@@ -1658,6 +1658,10 @@ config CMD_MII
to management parameters and services. to management parameters and services.
The interface is referred to as the MII management interface. The interface is referred to as the MII management interface.
config MII_INIT
bool "Call mii_init() in the mii command"
depends on CMD_MII && (MPC8XX_FEC || FSLDMAFE || MCFFEC)
config CMD_MDIO config CMD_MDIO
bool "mdio" bool "mdio"
depends on PHYLIB depends on PHYLIB

View File

@@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="-> "
CONFIG_CMD_IMLS=y CONFIG_CMD_IMLS=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_IS_IN_FLASH=y

View File

@@ -20,6 +20,7 @@ CONFIG_CMD_PCI=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_BOOTP_BOOTFILESIZE=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_IS_IN_FLASH=y

View File

@@ -20,6 +20,7 @@ CONFIG_CMD_PCI=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_BOOTP_BOOTFILESIZE=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_IS_IN_FLASH=y

View File

@@ -17,6 +17,7 @@ CONFIG_CMD_IMLS=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_BOOTP_BOOTFILESIZE=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_ENV_ADDR=0xFFE04000 CONFIG_ENV_ADDR=0xFFE04000

View File

@@ -21,6 +21,7 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_BOOTP_BOOTFILESIZE=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_ENV_ADDR=0xFFE04000 CONFIG_ENV_ADDR=0xFFE04000

View File

@@ -17,6 +17,7 @@ CONFIG_CMD_IMLS=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_BOOTP_BOOTFILESIZE=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_ENV_ADDR=0xFFE04000 CONFIG_ENV_ADDR=0xFFE04000

View File

@@ -16,6 +16,7 @@ CONFIG_SYS_PROMPT="-> "
CONFIG_CMD_IMLS=y CONFIG_CMD_IMLS=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_DATE=y CONFIG_CMD_DATE=y

View File

@@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_DATE=y CONFIG_CMD_DATE=y

View File

@@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_DATE=y CONFIG_CMD_DATE=y

View File

@@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_DATE=y CONFIG_CMD_DATE=y

View File

@@ -42,6 +42,7 @@ CONFIG_CMD_NAND=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
# CONFIG_CMD_SLEEP is not set # CONFIG_CMD_SLEEP is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y

View File

@@ -23,6 +23,7 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_BOOTP_BOOTFILESIZE=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_DATE=y CONFIG_CMD_DATE=y
CONFIG_ENV_ADDR=0xFF040000 CONFIG_ENV_ADDR=0xFF040000
CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y

View File

@@ -22,6 +22,7 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_BOOTP_BOOTFILESIZE=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
CONFIG_CMD_DATE=y CONFIG_CMD_DATE=y
CONFIG_ENV_ADDR=0xFF040000 CONFIG_ENV_ADDR=0xFF040000
CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y

View File

@@ -200,9 +200,7 @@ int mii_discover_phy(fec_info_t *info)
} }
#endif /* CONFIG_SYS_DISCOVER_PHY */ #endif /* CONFIG_SYS_DISCOVER_PHY */
void mii_init(void) __attribute__((weak,alias("__mii_init"))); __weak void mii_init(void)
void __mii_init(void)
{ {
#ifdef CONFIG_DM_ETH #ifdef CONFIG_DM_ETH
struct udevice *dev; struct udevice *dev;

View File

@@ -18,7 +18,6 @@
#define CONFIG_WATCHDOG_TIMEOUT 5000 #define CONFIG_WATCHDOG_TIMEOUT 5000
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY # define CONFIG_SYS_DISCOVER_PHY
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
# ifndef CONFIG_SYS_DISCOVER_PHY # ifndef CONFIG_SYS_DISCOVER_PHY

View File

@@ -23,7 +23,6 @@
#define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY # define CONFIG_SYS_DISCOVER_PHY
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
# ifndef CONFIG_SYS_DISCOVER_PHY # ifndef CONFIG_SYS_DISCOVER_PHY

View File

@@ -33,7 +33,6 @@
env/embedded.o(.text); env/embedded.o(.text);
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY # define CONFIG_SYS_DISCOVER_PHY
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
# ifndef CONFIG_SYS_DISCOVER_PHY # ifndef CONFIG_SYS_DISCOVER_PHY

View File

@@ -36,7 +36,6 @@
/* Available command configuration */ /* Available command configuration */
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
#define CONFIG_MII_INIT 1
#define CONFIG_SYS_DISCOVER_PHY #define CONFIG_SYS_DISCOVER_PHY
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
#ifndef CONFIG_SYS_DISCOVER_PHY #ifndef CONFIG_SYS_DISCOVER_PHY

View File

@@ -31,7 +31,6 @@
env/embedded.o(.text*); env/embedded.o(.text*);
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY # define CONFIG_SYS_DISCOVER_PHY
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
# ifndef CONFIG_SYS_DISCOVER_PHY # ifndef CONFIG_SYS_DISCOVER_PHY

View File

@@ -25,7 +25,6 @@
#define CONFIG_SYS_UNIFY_CACHE #define CONFIG_SYS_UNIFY_CACHE
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY # define CONFIG_SYS_DISCOVER_PHY
# define CONFIG_SYS_TX_ETH_BUFFER 8 # define CONFIG_SYS_TX_ETH_BUFFER 8
# define CONFIG_SYS_FEC_BUF_USE_SRAM # define CONFIG_SYS_FEC_BUF_USE_SRAM

View File

@@ -25,7 +25,6 @@
#define CONFIG_SYS_UNIFY_CACHE #define CONFIG_SYS_UNIFY_CACHE
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY # define CONFIG_SYS_DISCOVER_PHY
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
# ifndef CONFIG_SYS_DISCOVER_PHY # ifndef CONFIG_SYS_DISCOVER_PHY

View File

@@ -27,7 +27,6 @@
#define CONFIG_SYS_UNIFY_CACHE #define CONFIG_SYS_UNIFY_CACHE
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY # define CONFIG_SYS_DISCOVER_PHY
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
# ifndef CONFIG_SYS_DISCOVER_PHY # ifndef CONFIG_SYS_DISCOVER_PHY

View File

@@ -88,7 +88,6 @@
/* Ethernet configuration part */ /* Ethernet configuration part */
#define CONFIG_SYS_DISCOVER_PHY 1 #define CONFIG_SYS_DISCOVER_PHY 1
#define CONFIG_MII_INIT 1
/* NAND configuration part */ /* NAND configuration part */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1

View File

@@ -89,7 +89,6 @@
env/embedded.o(.text); env/embedded.o(.text);
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY # define CONFIG_SYS_DISCOVER_PHY
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
# ifndef CONFIG_SYS_DISCOVER_PHY # ifndef CONFIG_SYS_DISCOVER_PHY

View File

@@ -52,7 +52,6 @@
*----------------------------------------------------------------------*/ *----------------------------------------------------------------------*/
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
#define CONFIG_MII_INIT 1
#define CONFIG_SYS_DISCOVER_PHY #define CONFIG_SYS_DISCOVER_PHY
#define CONFIG_OVERWRITE_ETHADDR_ONCE #define CONFIG_OVERWRITE_ETHADDR_ONCE
#endif #endif

View File

@@ -132,7 +132,6 @@
CONFIG_SYS_INIT_RAM_SIZE - 12) CONFIG_SYS_INIT_RAM_SIZE - 12)
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
#define CONFIG_MII_INIT 1
#define CONFIG_SYS_DISCOVER_PHY #define CONFIG_SYS_DISCOVER_PHY
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
#ifndef CONFIG_SYS_DISCOVER_PHY #ifndef CONFIG_SYS_DISCOVER_PHY

View File

@@ -499,7 +499,6 @@ CONFIG_MEM_INIT_VALUE
CONFIG_MEM_REMAP CONFIG_MEM_REMAP
CONFIG_MFG_ENV_SETTINGS CONFIG_MFG_ENV_SETTINGS
CONFIG_MII_DEFAULT_TSEC CONFIG_MII_DEFAULT_TSEC
CONFIG_MII_INIT
CONFIG_MISC_COMMON CONFIG_MISC_COMMON
CONFIG_MIU_2BIT_21_7_INTERLEAVED CONFIG_MIU_2BIT_21_7_INTERLEAVED
CONFIG_MIU_2BIT_INTERLEAVED CONFIG_MIU_2BIT_INTERLEAVED