Convert CONFIG_MII_INIT to Kconfig

This converts the following to Kconfig:
   CONFIG_MII_INIT

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

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 564daa7bbc8d15649432ea2589ac6f7fcf674e34..25c9fde4a7b3b95ba207f2d46ad26252486a7708 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1658,6 +1658,10 @@ config CMD_MII
          to management parameters and services.
          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
        bool "mdio"
        depends on PHYLIB

diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
index 62b284b97bacc324d2293dc593688120ee4ca91b..6d533d6bee82489a2ddc909c156359effdfef94a 100644 (file)
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="-> "
 CONFIG_CMD_IMLS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_FLASH=y

diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig
index a3762bb3d7680261ec3347290d285c57c44aa80b..7552741395a0a759265cef11ebc2a0d10ab0434c 100644 (file)
--- a/configs/M5235EVB_Flash32_defconfig
+++ b/configs/M5235EVB_Flash32_defconfig
@@ -20,6 +20,7 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_FLASH=y

diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
index d4f32e45156fb18355787fa5b2e5c779851eb1df..1bdb63ad1c6c4c013ad32e925ba2a603a392cfd9 100644 (file)
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -20,6 +20,7 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_FLASH=y

diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
index c30b949872826dae829e1a4d4a356032d4f8f267..f0a6aac761253200fb49107b023e14be6044b8e6 100644 (file)
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_IMLS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_ADDR=0xFFE04000

diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig
index 53ff8ee4aeca6c1d2ffa734ab8ad1b87c1b17ae2..809bda0c068714d4df23f9bdc2615ab322fda087 100644 (file)
--- a/configs/M5275EVB_defconfig
+++ b/configs/M5275EVB_defconfig
@@ -21,6 +21,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_ADDR=0xFFE04000

diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig
index 84363fbd924e8df7bdb9cb584eb436cdada465ce..69db87c0da286ca2450eb14c55bbb8844c93eb6f 100644 (file)
--- a/configs/M5282EVB_defconfig
+++ b/configs/M5282EVB_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_IMLS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_ADDR=0xFFE04000

diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index b43478731c1bc059709b8b2e03be59b78b241443..8283b52e626aa5e531f9580a7c9c444b502da37d 100644 (file)
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -16,6 +16,7 @@ CONFIG_SYS_PROMPT="-> "
 CONFIG_CMD_IMLS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y

diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index b8900f295f494b7213593d2eb4b2129aebf86f17..1092a1de51eb13f808d88bd9b6843b5ca5ddb6f3 100644 (file)
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y

diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index 47e6cb0ca2e7a12c7930728b70183ffe507ede7e..66347d5f0962370176f97fe9dcd0f83e54db48aa 100644 (file)
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y

diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index c59ba94f2c2290905218612e894aad7edef16c55..38d20023d555da2255ea0856accd4fea1df0d102 100644 (file)
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y

diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig
index 04fe75651337dba9282e01fd4139e365604033b4..f174865806c4a0cdf69c950a85b362c2e5948dad 100644 (file)
--- a/configs/MCR3000_defconfig
+++ b/configs/MCR3000_defconfig
@@ -42,6 +42,7 @@ CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_OF_CONTROL=y

diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index a1aee405e97c9cc7d27cfad7fa4ba83ab276ec98..ae1329c78a01e8b80ad913f51ec6a2899d1288d5 100644 (file)
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_ADDR=0xFF040000
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y

diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index 4adc0569762885fe8aaca16f48176deddd51be28..02a9bb4646e8658e519de1cce5614cae92693879 100644 (file)
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_MII=y
+CONFIG_MII_INIT=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_ADDR=0xFF040000
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y

diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index ca06b35316d33f92e976522cb2cd563202909b25..e2c8f41876e75b6e883a6666529ac2d15c4868ce 100644 (file)
--- 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/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index e30f1ebc35c0d248c2a417ec9674c2ec6c8ea86f..e73c656c384235a71c6ca8ef072a7b17fb0c6325 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -18,7 +18,6 @@
 #define CONFIG_WATCHDOG_TIMEOUT                5000
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index bc0e00cadd9ad670e27ce07d5d83afc0d1f8c2e0..bbe12d10db6f87dad541b12cbffb10b76faa3b31 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -23,7 +23,6 @@
 #define CONFIG_WATCHDOG_TIMEOUT        5000    /* timeout in milliseconds, max timeout is 6.71sec */
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index dec1e41936d21e863f16bf3e7d44b8b9d10c419e..c4ee8c933d99c7db253f395315e2cf0d64fa8869 100644 (file)
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -33,7 +33,6 @@
        env/embedded.o(.text);
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index dab512c70f02912b5aa5a5f69ddbc5135cdaf10d..5db85ad18429257534e3a89e0f83bd24f77ad518 100644 (file)
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -36,7 +36,6 @@
 /* Available command configuration */
 
 #ifdef CONFIG_MCFFEC
-#define CONFIG_MII_INIT                1
 #define CONFIG_SYS_DISCOVER_PHY
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #ifndef CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 974cfc343d4234b9a255e38f2535aa95f1ca2c92..cc64893b9af965f16112556956963f3fcaf4f53c 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -31,7 +31,6 @@
        env/embedded.o(.text*);
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 80ca016d2be2df2a4bbb74f1e7012523d52a747f..431fa7406c617d472458f33d311f0e01564465a2 100644 (file)
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -25,7 +25,6 @@
 #define CONFIG_SYS_UNIFY_CACHE
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY
 #      define CONFIG_SYS_TX_ETH_BUFFER 8
 #      define CONFIG_SYS_FEC_BUF_USE_SRAM

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index e4b887f02e2622218514fff1b7dbb7099084e333..d155f2cba047950ba4c2a4b171a42a050266595a 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -25,7 +25,6 @@
 #define CONFIG_SYS_UNIFY_CACHE
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 9ad09e827e99c6269d151022a7141dbecf9a9dca..b0b0e2e13bf58b794fbd99ee53c31ba92da759c3 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_UNIFY_CACHE
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 4a26ae8f7f17233f1ce40a0c98132f1d5fa00840..e26b70a08232d0f2cec3aeaf98938d31ebafec82 100644 (file)
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -88,7 +88,6 @@
 
 /* Ethernet configuration part */
 #define CONFIG_SYS_DISCOVER_PHY                1
-#define CONFIG_MII_INIT                        1
 
 /* NAND configuration part */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1

diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 607e76c349e13e6ccfe5393ae881287de442726a..577936b5af9536546c4cda9c85c5f2a0385e64bb 100644 (file)
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -89,7 +89,6 @@
        env/embedded.o(.text);
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 99d8e9e4e671a7c4661dcc7efe8bdf599872685f..4d88657ca61ba3778f126c17a69d648473a6d44f 100644 (file)
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -52,7 +52,6 @@
  *----------------------------------------------------------------------*/
 
 #ifdef CONFIG_MCFFEC
-#define CONFIG_MII_INIT                        1
 #define CONFIG_SYS_DISCOVER_PHY
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
 #endif

diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index 9bfb8ca9b74ebf69e8fd4bdfc41a591375a5e8d9..781dba542bdefa5d922f74228ca1353193ca7e9d 100644 (file)
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -132,7 +132,6 @@
                                        CONFIG_SYS_INIT_RAM_SIZE - 12)
 
 #ifdef CONFIG_MCFFEC
-#define CONFIG_MII_INIT                        1
 #define CONFIG_SYS_DISCOVER_PHY
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #ifndef CONFIG_SYS_DISCOVER_PHY

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8cbab7e20e8dbfffedff91b379814119de7f777b..bb8d310b79d3de1e11a931c183c83343e18f380a 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -499,7 +499,6 @@ CONFIG_MEM_INIT_VALUE
 CONFIG_MEM_REMAP
 CONFIG_MFG_ENV_SETTINGS
 CONFIG_MII_DEFAULT_TSEC
-CONFIG_MII_INIT
 CONFIG_MISC_COMMON
 CONFIG_MIU_2BIT_21_7_INTERLEAVED
 CONFIG_MIU_2BIT_INTERLEAVED