From 9557eb70dbfea731febab01a5acb2c30811a423d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 17 Sep 2013 10:44:23 -0600 Subject: [PATCH] Add prefex ETH0 to all PHY configurations to support multiple NICs --- configs/cloudctrl/nsh/defconfig | 8 ++++---- configs/cloudctrl/src/cloudctrl-internal.h | 2 +- configs/cloudctrl/src/up_phyinit.c | 2 +- configs/lincoln60/README.txt | 2 +- configs/lincoln60/nsh/defconfig | 2 +- configs/lincoln60/ostest/defconfig | 2 +- configs/lpc4330-xplorer/README.txt | 2 +- configs/lpc4330-xplorer/nsh/defconfig | 2 +- configs/lpc4330-xplorer/ostest/defconfig | 2 +- configs/lpcxpresso-lpc1768/README.txt | 2 +- configs/lpcxpresso-lpc1768/dhcpd/defconfig | 6 +++--- configs/lpcxpresso-lpc1768/nsh/defconfig | 6 +++--- configs/lpcxpresso-lpc1768/nx/defconfig | 6 +++--- configs/lpcxpresso-lpc1768/ostest/defconfig | 6 +++--- configs/lpcxpresso-lpc1768/thttpd/defconfig | 6 +++--- configs/lpcxpresso-lpc1768/usbmsc/defconfig | 6 +++--- configs/mbed/README.txt | 2 +- configs/mbed/hidkbd/defconfig | 2 +- configs/mbed/nsh/defconfig | 2 +- configs/nucleus2g/README.txt | 2 +- configs/nucleus2g/nsh/defconfig | 2 +- configs/nucleus2g/ostest/defconfig | 2 +- configs/nucleus2g/usbmsc/defconfig | 2 +- configs/olimex-lpc1766stk/README.txt | 2 +- configs/olimex-lpc1766stk/ftpc/defconfig | 2 +- configs/olimex-lpc1766stk/nettest/defconfig | 8 ++++---- configs/olimex-lpc1766stk/nsh/defconfig | 8 ++++---- configs/olimex-lpc1766stk/nx/defconfig | 2 +- configs/olimex-lpc1766stk/ostest/defconfig | 2 +- configs/olimex-lpc1766stk/slip-httpd/defconfig | 2 +- configs/olimex-lpc1766stk/thttpd/defconfig | 2 +- configs/olimex-lpc1766stk/usbmsc/defconfig | 2 +- configs/olimex-lpc1766stk/zmodem/defconfig | 8 ++++---- configs/olimex-stm32-p107/nsh/defconfig | 8 ++++---- configs/pic32-starterkit/README.txt | 6 +++--- configs/pic32-starterkit/nsh/defconfig | 6 +++--- configs/pic32-starterkit/nsh2/defconfig | 6 +++--- configs/pic32-starterkit/ostest/defconfig | 6 +++--- configs/pic32mx7mmb/README.txt | 6 +++--- configs/pic32mx7mmb/nsh/defconfig | 6 +++--- configs/pic32mx7mmb/ostest/defconfig | 6 +++--- configs/shenzhou/nsh/defconfig | 8 ++++---- configs/shenzhou/nxwm/defconfig | 8 ++++---- configs/shenzhou/thttpd/defconfig | 8 ++++---- configs/stm3220g-eval/nxwm/defconfig | 8 ++++---- configs/stm3240g-eval/discover/defconfig | 8 ++++---- configs/stm3240g-eval/xmlrpc/defconfig | 8 ++++---- configs/zkit-arm-1769/README.txt | 2 +- configs/zkit-arm-1769/hello/defconfig | 8 ++++---- configs/zkit-arm-1769/nsh/defconfig | 8 ++++---- configs/zkit-arm-1769/nxhello/defconfig | 8 ++++---- configs/zkit-arm-1769/thttpd/defconfig | 8 ++++---- 52 files changed, 123 insertions(+), 123 deletions(-) diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig index 7011687a447..d8724bb498d 100644 --- a/configs/cloudctrl/nsh/defconfig +++ b/configs/cloudctrl/nsh/defconfig @@ -390,10 +390,10 @@ CONFIG_USART2_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -# CONFIG_PHY_KS8721 is not set -# CONFIG_PHY_DP83848C is not set -# CONFIG_PHY_LAN8720 is not set -CONFIG_PHY_DM9161=y +# CONFIG_ETH0_PHY_KS8721 is not set +# CONFIG_ETH0_PHY_DP83848C is not set +# CONFIG_ETH0_PHY_LAN8720 is not set +CONFIG_ETH0_PHY_DM9161=y # CONFIG_NET_NOINTS is not set CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_IPv6 is not set diff --git a/configs/cloudctrl/src/cloudctrl-internal.h b/configs/cloudctrl/src/cloudctrl-internal.h index 7fbbb76bbfe..f731a455ed2 100644 --- a/configs/cloudctrl/src/cloudctrl-internal.h +++ b/configs/cloudctrl/src/cloudctrl-internal.h @@ -96,7 +96,7 @@ /* Use MCU Pin Reset DM9161 PHY Chip */ -#ifdef CONFIG_PHY_DM9161 +#ifdef CONFIG_ETH0_PHY_DM9161 # define GPIO_DM9161_RET (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_SET|\ GPIO_PORTB|GPIO_PIN15) #endif diff --git a/configs/cloudctrl/src/up_phyinit.c b/configs/cloudctrl/src/up_phyinit.c index 114c9f07bfd..9fe89f3194f 100644 --- a/configs/cloudctrl/src/up_phyinit.c +++ b/configs/cloudctrl/src/up_phyinit.c @@ -58,7 +58,7 @@ * Public Functions ************************************************************************************/ -#if defined(CONFIG_PHY_DM9161) && defined(CONFIG_STM32_PHYINIT) +#if defined(CONFIG_ETH0_PHY_DM9161) && defined(CONFIG_STM32_PHYINIT) int stm32_phy_boardinitialize(int intf) { /* Configure the DM9161 PHY reset pin and take it out of reset */ diff --git a/configs/lincoln60/README.txt b/configs/lincoln60/README.txt index 9d856a7c256..d94c4c1ded7 100644 --- a/configs/lincoln60/README.txt +++ b/configs/lincoln60/README.txt @@ -380,7 +380,7 @@ Lincoln 60 Configuration Options LPC17xx specific PHY/Ethernet device driver settings. These setting also require CONFIG_NET and CONFIG_LPC17_ETHERNET. - CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY + CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY CONFIG_PHY_AUTONEG - Enable auto-negotion CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig index 9222944d484..4a613a17977 100644 --- a/configs/lincoln60/nsh/defconfig +++ b/configs/lincoln60/nsh/defconfig @@ -137,7 +137,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/lincoln60/ostest/defconfig b/configs/lincoln60/ostest/defconfig index d657b8fc4aa..667329376f4 100644 --- a/configs/lincoln60/ostest/defconfig +++ b/configs/lincoln60/ostest/defconfig @@ -143,7 +143,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/lpc4330-xplorer/README.txt b/configs/lpc4330-xplorer/README.txt index 8ea443f7998..dd917d61e4a 100644 --- a/configs/lpc4330-xplorer/README.txt +++ b/configs/lpc4330-xplorer/README.txt @@ -835,7 +835,7 @@ LPC4330-Xplorer Configuration Options LPC43xx specific PHY/Ethernet device driver settings. These setting also require CONFIG_NET and CONFIG_LPC43_ETHERNET. - CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY + CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY CONFIG_PHY_AUTONEG - Enable auto-negotion CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig index 0c981ff0c65..1f30698fa54 100644 --- a/configs/lpc4330-xplorer/nsh/defconfig +++ b/configs/lpc4330-xplorer/nsh/defconfig @@ -171,7 +171,7 @@ CONFIG_USART3_RS485MODE=n # # LPC43xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/lpc4330-xplorer/ostest/defconfig b/configs/lpc4330-xplorer/ostest/defconfig index 15f0167597a..fec0c623651 100644 --- a/configs/lpc4330-xplorer/ostest/defconfig +++ b/configs/lpc4330-xplorer/ostest/defconfig @@ -169,7 +169,7 @@ CONFIG_USART3_RS485MODE=n # # LPC43xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/lpcxpresso-lpc1768/README.txt b/configs/lpcxpresso-lpc1768/README.txt index 3e269e97903..9e4c224cb2a 100644 --- a/configs/lpcxpresso-lpc1768/README.txt +++ b/configs/lpcxpresso-lpc1768/README.txt @@ -676,7 +676,7 @@ LPCXpresso Configuration Options LPC17xx specific PHY/Ethernet device driver settings. These setting also require CONFIG_NET and CONFIG_LPC17_ETHERNET. - CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY + CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY CONFIG_PHY_AUTONEG - Enable auto-negotion CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig index 1a4069e6493..71e5ea5317d 100755 --- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig +++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig @@ -139,9 +139,9 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=n -CONFIG_PHY_DP83848C=n -CONFIG_PHY_LAN8720=y +CONFIG_ETH0_PHY_KS8721=n +CONFIG_ETH0_PHY_DP83848C=n +CONFIG_ETH0_PHY_LAN8720=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig index 836ba54bf18..ecc3cefe3ef 100755 --- a/configs/lpcxpresso-lpc1768/nsh/defconfig +++ b/configs/lpcxpresso-lpc1768/nsh/defconfig @@ -139,9 +139,9 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=n -CONFIG_PHY_DP83848C=n -CONFIG_PHY_LAN8720=y +CONFIG_ETH0_PHY_KS8721=n +CONFIG_ETH0_PHY_DP83848C=n +CONFIG_ETH0_PHY_LAN8720=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig index a1a2849ed50..1b6da6bb2d5 100755 --- a/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/configs/lpcxpresso-lpc1768/nx/defconfig @@ -139,9 +139,9 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=n -CONFIG_PHY_DP83848C=n -CONFIG_PHY_LAN8720=y +CONFIG_ETH0_PHY_KS8721=n +CONFIG_ETH0_PHY_DP83848C=n +CONFIG_ETH0_PHY_LAN8720=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/lpcxpresso-lpc1768/ostest/defconfig b/configs/lpcxpresso-lpc1768/ostest/defconfig index 8aee698f45e..4f9fde0f058 100755 --- a/configs/lpcxpresso-lpc1768/ostest/defconfig +++ b/configs/lpcxpresso-lpc1768/ostest/defconfig @@ -139,9 +139,9 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=n -CONFIG_PHY_DP83848C=n -CONFIG_PHY_LAN8720=y +CONFIG_ETH0_PHY_KS8721=n +CONFIG_ETH0_PHY_DP83848C=n +CONFIG_ETH0_PHY_LAN8720=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig index 899502bd077..25a67c5fb1d 100755 --- a/configs/lpcxpresso-lpc1768/thttpd/defconfig +++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig @@ -139,9 +139,9 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=n -CONFIG_PHY_DP83848C=n -CONFIG_PHY_LAN8720=y +CONFIG_ETH0_PHY_KS8721=n +CONFIG_ETH0_PHY_DP83848C=n +CONFIG_ETH0_PHY_LAN8720=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig index 791bd7e0954..57ad1c52ef9 100755 --- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig +++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig @@ -139,9 +139,9 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=n -CONFIG_PHY_DP83848C=n -CONFIG_PHY_LAN8720=y +CONFIG_ETH0_PHY_KS8721=n +CONFIG_ETH0_PHY_DP83848C=n +CONFIG_ETH0_PHY_LAN8720=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/mbed/README.txt b/configs/mbed/README.txt index 592487a451c..7ef2c7cc7df 100644 --- a/configs/mbed/README.txt +++ b/configs/mbed/README.txt @@ -350,7 +350,7 @@ mbed Configuration Options LPC17xx specific PHY/Ethernet device driver settings. These setting also require CONFIG_NET and CONFIG_LPC17_ETHERNET. - CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY + CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY CONFIG_PHY_AUTONEG - Enable auto-negotion CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig index 19a855ea2aa..ecf5a94610b 100644 --- a/configs/mbed/hidkbd/defconfig +++ b/configs/mbed/hidkbd/defconfig @@ -137,7 +137,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig index 9b32ac29aa3..3eea05325d9 100755 --- a/configs/mbed/nsh/defconfig +++ b/configs/mbed/nsh/defconfig @@ -137,7 +137,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/nucleus2g/README.txt b/configs/nucleus2g/README.txt index 1980ae6fdfa..153d7fa4f7c 100644 --- a/configs/nucleus2g/README.txt +++ b/configs/nucleus2g/README.txt @@ -462,7 +462,7 @@ Nucleus 2G Configuration Options LPC17xx specific PHY/Ethernet device driver settings. These setting also require CONFIG_NET and CONFIG_LPC17_ETHERNET. - CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY + CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY CONFIG_PHY_AUTONEG - Enable auto-negotion CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig index 0c326c2b1a3..eae5a6de2f3 100755 --- a/configs/nucleus2g/nsh/defconfig +++ b/configs/nucleus2g/nsh/defconfig @@ -137,7 +137,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/nucleus2g/ostest/defconfig b/configs/nucleus2g/ostest/defconfig index 7067d58a071..1c58bd78411 100755 --- a/configs/nucleus2g/ostest/defconfig +++ b/configs/nucleus2g/ostest/defconfig @@ -137,7 +137,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/nucleus2g/usbmsc/defconfig b/configs/nucleus2g/usbmsc/defconfig index a024d705762..f4797b80930 100755 --- a/configs/nucleus2g/usbmsc/defconfig +++ b/configs/nucleus2g/usbmsc/defconfig @@ -137,7 +137,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/olimex-lpc1766stk/README.txt b/configs/olimex-lpc1766stk/README.txt index 9f594868776..9bf1ef52aa8 100644 --- a/configs/olimex-lpc1766stk/README.txt +++ b/configs/olimex-lpc1766stk/README.txt @@ -777,7 +777,7 @@ Olimex LPC1766-STK Configuration Options LPC17xx specific PHY/Ethernet device driver settings. These setting also require CONFIG_NET and CONFIG_LPC17_ETHERNET. - CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY + CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY CONFIG_PHY_AUTONEG - Enable auto-negotion CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig index 39b1467ad3e..44cd8fc4fd1 100755 --- a/configs/olimex-lpc1766stk/ftpc/defconfig +++ b/configs/olimex-lpc1766stk/ftpc/defconfig @@ -143,7 +143,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig index f092c52b855..f5cfa1e5425 100755 --- a/configs/olimex-lpc1766stk/nettest/defconfig +++ b/configs/olimex-lpc1766stk/nettest/defconfig @@ -373,10 +373,10 @@ CONFIG_UART0_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -CONFIG_PHY_KS8721=y -# CONFIG_PHY_DP83848C is not set -# CONFIG_PHY_LAN8720 is not set -# CONFIG_PHY_DM9161 is not set +CONFIG_ETH0_PHY_KS8721=y +# CONFIG_ETH0_PHY_DP83848C is not set +# CONFIG_ETH0_PHY_LAN8720 is not set +# CONFIG_ETH0_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set # CONFIG_NET_MULTIBUFFER is not set # CONFIG_NET_IPv6 is not set diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig index b1bfd1be691..f84acf5f361 100644 --- a/configs/olimex-lpc1766stk/nsh/defconfig +++ b/configs/olimex-lpc1766stk/nsh/defconfig @@ -382,10 +382,10 @@ CONFIG_UART0_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -CONFIG_PHY_KS8721=y -# CONFIG_PHY_DP83848C is not set -# CONFIG_PHY_LAN8720 is not set -# CONFIG_PHY_DM9161 is not set +CONFIG_ETH0_PHY_KS8721=y +# CONFIG_ETH0_PHY_DP83848C is not set +# CONFIG_ETH0_PHY_LAN8720 is not set +# CONFIG_ETH0_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set # CONFIG_NET_MULTIBUFFER is not set # CONFIG_NET_PROMISCUOUS is not set diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig index 4fe4687d56b..5c1729b2ec1 100755 --- a/configs/olimex-lpc1766stk/nx/defconfig +++ b/configs/olimex-lpc1766stk/nx/defconfig @@ -143,7 +143,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/olimex-lpc1766stk/ostest/defconfig b/configs/olimex-lpc1766stk/ostest/defconfig index 2a9f3ce4b48..7bb1d6d8f4a 100755 --- a/configs/olimex-lpc1766stk/ostest/defconfig +++ b/configs/olimex-lpc1766stk/ostest/defconfig @@ -143,7 +143,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig index cd5e8d31485..19325bf8770 100755 --- a/configs/olimex-lpc1766stk/slip-httpd/defconfig +++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig @@ -145,7 +145,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/olimex-lpc1766stk/thttpd/defconfig b/configs/olimex-lpc1766stk/thttpd/defconfig index e7b1419aa44..ad033197990 100755 --- a/configs/olimex-lpc1766stk/thttpd/defconfig +++ b/configs/olimex-lpc1766stk/thttpd/defconfig @@ -143,7 +143,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig index 3a5ad422c53..af75039fcfb 100755 --- a/configs/olimex-lpc1766stk/usbmsc/defconfig +++ b/configs/olimex-lpc1766stk/usbmsc/defconfig @@ -143,7 +143,7 @@ CONFIG_UART3_2STOP=0 # # LPC17xx specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=y +CONFIG_ETH0_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig index 4b9cb132ddc..2946498b202 100644 --- a/configs/olimex-lpc1766stk/zmodem/defconfig +++ b/configs/olimex-lpc1766stk/zmodem/defconfig @@ -397,10 +397,10 @@ CONFIG_UART1_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -CONFIG_PHY_KS8721=y -# CONFIG_PHY_DP83848C is not set -# CONFIG_PHY_LAN8720 is not set -# CONFIG_PHY_DM9161 is not set +CONFIG_ETH0_PHY_KS8721=y +# CONFIG_ETH0_PHY_DP83848C is not set +# CONFIG_ETH0_PHY_LAN8720 is not set +# CONFIG_ETH0_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set # CONFIG_NET_MULTIBUFFER is not set # CONFIG_NET_PROMISCUOUS is not set diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig index 9bc901dbefd..de8d8ce51ab 100644 --- a/configs/olimex-stm32-p107/nsh/defconfig +++ b/configs/olimex-stm32-p107/nsh/defconfig @@ -493,10 +493,10 @@ CONFIG_USART2_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -CONFIG_PHY_KS8721=y -# CONFIG_PHY_DP83848C is not set -# CONFIG_PHY_LAN8720 is not set -# CONFIG_PHY_DM9161 is not set +CONFIG_ETH0_PHY_KS8721=y +# CONFIG_ETH0_PHY_DP83848C is not set +# CONFIG_ETH0_PHY_LAN8720 is not set +# CONFIG_ETH0_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_PROMISCUOUS is not set diff --git a/configs/pic32-starterkit/README.txt b/configs/pic32-starterkit/README.txt index c65ee953c14..0dd49c44412 100644 --- a/configs/pic32-starterkit/README.txt +++ b/configs/pic32-starterkit/README.txt @@ -987,9 +987,9 @@ PIC32MX Configuration Options PIC32MX specific PHY/Ethernet device driver settings - CONFIG_PHY_KS8721 - Selects the Micrel KS8721 PHY - CONFIG_PHY_DP83848C - Selects the National Semiconduction DP83848C PHY - CONFIG_PHY_LAN8720 - Selects the SMSC LAN8720 PHY + CONFIG_ETH0_PHY_KS8721 - Selects the Micrel KS8721 PHY + CONFIG_ETH0_PHY_DP83848C - Selects the National Semiconduction DP83848C PHY + CONFIG_ETH0_PHY_LAN8720 - Selects the SMSC LAN8720 PHY CONFIG_PHY_AUTONEG - Enable auto-negotion CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex diff --git a/configs/pic32-starterkit/nsh/defconfig b/configs/pic32-starterkit/nsh/defconfig index d9909c09aa7..ac762efcdc6 100644 --- a/configs/pic32-starterkit/nsh/defconfig +++ b/configs/pic32-starterkit/nsh/defconfig @@ -182,9 +182,9 @@ CONFIG_UART6_2STOP=0 # # PIC32MX specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=n -CONFIG_PHY_DP83848C=y -CONFIG_PHY_LAN8720=n +CONFIG_ETH0_PHY_KS8721=n +CONFIG_ETH0_PHY_DP83848C=y +CONFIG_ETH0_PHY_LAN8720=n CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/pic32-starterkit/nsh2/defconfig b/configs/pic32-starterkit/nsh2/defconfig index 3b227b79095..32bcbc36e83 100644 --- a/configs/pic32-starterkit/nsh2/defconfig +++ b/configs/pic32-starterkit/nsh2/defconfig @@ -182,9 +182,9 @@ CONFIG_UART6_2STOP=0 # # PIC32MX specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=n -CONFIG_PHY_DP83848C=y -CONFIG_PHY_LAN8720=n +CONFIG_ETH0_PHY_KS8721=n +CONFIG_ETH0_PHY_DP83848C=y +CONFIG_ETH0_PHY_LAN8720=n CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/pic32-starterkit/ostest/defconfig b/configs/pic32-starterkit/ostest/defconfig index 3ab94f51382..b5f1ade09fd 100644 --- a/configs/pic32-starterkit/ostest/defconfig +++ b/configs/pic32-starterkit/ostest/defconfig @@ -182,9 +182,9 @@ CONFIG_UART6_2STOP=0 # # PIC32MX specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=n -CONFIG_PHY_DP83848C=y -CONFIG_PHY_LAN8720=n +CONFIG_ETH0_PHY_KS8721=n +CONFIG_ETH0_PHY_DP83848C=y +CONFIG_ETH0_PHY_LAN8720=n CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/pic32mx7mmb/README.txt b/configs/pic32mx7mmb/README.txt index 36ff444f4b7..73b50945bb5 100644 --- a/configs/pic32mx7mmb/README.txt +++ b/configs/pic32mx7mmb/README.txt @@ -565,9 +565,9 @@ PIC32MX Configuration Options PIC32MX specific PHY/Ethernet device driver settings - CONFIG_PHY_KS8721 - Selects the Micrel KS8721 PHY - CONFIG_PHY_DP83848C - Selects the National Semiconduction DP83848C PHY - CONFIG_PHY_LAN8720 - Selects the SMSC LAN8720 PHY + CONFIG_ETH0_PHY_KS8721 - Selects the Micrel KS8721 PHY + CONFIG_ETH0_PHY_DP83848C - Selects the National Semiconduction DP83848C PHY + CONFIG_ETH0_PHY_LAN8720 - Selects the SMSC LAN8720 PHY CONFIG_PHY_AUTONEG - Enable auto-negotion CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig index acb34b36ee1..96f9ef9ae01 100644 --- a/configs/pic32mx7mmb/nsh/defconfig +++ b/configs/pic32mx7mmb/nsh/defconfig @@ -182,9 +182,9 @@ CONFIG_UART6_2STOP=0 # # PIC32MX specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=n -CONFIG_PHY_DP83848C=n -CONFIG_PHY_LAN8720=y +CONFIG_ETH0_PHY_KS8721=n +CONFIG_ETH0_PHY_DP83848C=n +CONFIG_ETH0_PHY_LAN8720=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/pic32mx7mmb/ostest/defconfig b/configs/pic32mx7mmb/ostest/defconfig index 7df3171ebbf..7b836a5a32d 100644 --- a/configs/pic32mx7mmb/ostest/defconfig +++ b/configs/pic32mx7mmb/ostest/defconfig @@ -182,9 +182,9 @@ CONFIG_UART6_2STOP=0 # # PIC32MX specific PHY/Ethernet device driver settings # -CONFIG_PHY_KS8721=n -CONFIG_PHY_DP83848C=n -CONFIG_PHY_LAN8720=y +CONFIG_ETH0_PHY_KS8721=n +CONFIG_ETH0_PHY_DP83848C=n +CONFIG_ETH0_PHY_LAN8720=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig index 450915e2f7d..8a8f168b2bb 100644 --- a/configs/shenzhou/nsh/defconfig +++ b/configs/shenzhou/nsh/defconfig @@ -390,10 +390,10 @@ CONFIG_USART2_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -# CONFIG_PHY_KS8721 is not set -# CONFIG_PHY_DP83848C is not set -# CONFIG_PHY_LAN8720 is not set -CONFIG_PHY_DM9161=y +# CONFIG_ETH0_PHY_KS8721 is not set +# CONFIG_ETH0_PHY_DP83848C is not set +# CONFIG_ETH0_PHY_LAN8720 is not set +CONFIG_ETH0_PHY_DM9161=y # CONFIG_NET_NOINTS is not set CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_IPv6 is not set diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig index 22c23c1b7ff..f3be8c30545 100644 --- a/configs/shenzhou/nxwm/defconfig +++ b/configs/shenzhou/nxwm/defconfig @@ -439,10 +439,10 @@ CONFIG_USART2_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -# CONFIG_PHY_KS8721 is not set -# CONFIG_PHY_DP83848C is not set -# CONFIG_PHY_LAN8720 is not set -CONFIG_PHY_DM9161=y +# CONFIG_ETH0_PHY_KS8721 is not set +# CONFIG_ETH0_PHY_DP83848C is not set +# CONFIG_ETH0_PHY_LAN8720 is not set +CONFIG_ETH0_PHY_DM9161=y # CONFIG_NET_NOINTS is not set CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_IPv6 is not set diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig index 04340560c4c..7fb0cb383dc 100644 --- a/configs/shenzhou/thttpd/defconfig +++ b/configs/shenzhou/thttpd/defconfig @@ -377,10 +377,10 @@ CONFIG_USART2_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -# CONFIG_PHY_KS8721 is not set -# CONFIG_PHY_DP83848C is not set -# CONFIG_PHY_LAN8720 is not set -CONFIG_PHY_DM9161=y +# CONFIG_ETH0_PHY_KS8721 is not set +# CONFIG_ETH0_PHY_DP83848C is not set +# CONFIG_ETH0_PHY_LAN8720 is not set +CONFIG_ETH0_PHY_DM9161=y # CONFIG_NET_NOINTS is not set CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_IPv6 is not set diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig index 7bc64709ce9..b81d29076bc 100644 --- a/configs/stm3220g-eval/nxwm/defconfig +++ b/configs/stm3220g-eval/nxwm/defconfig @@ -463,10 +463,10 @@ CONFIG_USART3_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -CONFIG_PHY_KS8721=y -# CONFIG_PHY_DP83848C is not set -# CONFIG_PHY_LAN8720 is not set -# CONFIG_PHY_DM9161 is not set +CONFIG_ETH0_PHY_KS8721=y +# CONFIG_ETH0_PHY_DP83848C is not set +# CONFIG_ETH0_PHY_LAN8720 is not set +# CONFIG_ETH0_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_IPv6 is not set diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig index d255c748b4c..d188b3e2cc3 100644 --- a/configs/stm3240g-eval/discover/defconfig +++ b/configs/stm3240g-eval/discover/defconfig @@ -397,10 +397,10 @@ CONFIG_USART3_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -# CONFIG_PHY_KS8721 is not set -CONFIG_PHY_DP83848C=y -# CONFIG_PHY_LAN8720 is not set -# CONFIG_PHY_DM9161 is not set +# CONFIG_ETH0_PHY_KS8721 is not set +CONFIG_ETH0_PHY_DP83848C=y +# CONFIG_ETH0_PHY_LAN8720 is not set +# CONFIG_ETH0_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_IPv6 is not set diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig index 6917ab0fd78..8962777e4e9 100644 --- a/configs/stm3240g-eval/xmlrpc/defconfig +++ b/configs/stm3240g-eval/xmlrpc/defconfig @@ -390,10 +390,10 @@ CONFIG_USART3_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -# CONFIG_PHY_KS8721 is not set -CONFIG_PHY_DP83848C=y -# CONFIG_PHY_LAN8720 is not set -# CONFIG_PHY_DM9161 is not set +# CONFIG_ETH0_PHY_KS8721 is not set +CONFIG_ETH0_PHY_DP83848C=y +# CONFIG_ETH0_PHY_LAN8720 is not set +# CONFIG_ETH0_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_IPv6 is not set diff --git a/configs/zkit-arm-1769/README.txt b/configs/zkit-arm-1769/README.txt index 10699cfab63..37e1e5f6467 100644 --- a/configs/zkit-arm-1769/README.txt +++ b/configs/zkit-arm-1769/README.txt @@ -476,7 +476,7 @@ ZKit-ARM Configuration Options LPC17xx specific PHY/Ethernet device driver settings. These setting also require CONFIG_NET and CONFIG_LPC17_ETHERNET. - CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY + CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY CONFIG_PHY_AUTONEG - Enable auto-negotion CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig index 192dd89da70..634aef8c76b 100644 --- a/configs/zkit-arm-1769/hello/defconfig +++ b/configs/zkit-arm-1769/hello/defconfig @@ -376,10 +376,10 @@ CONFIG_UART0_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -# CONFIG_PHY_KS8721 is not set -CONFIG_PHY_DP83848C=y -# CONFIG_PHY_LAN8720 is not set -# CONFIG_PHY_DM9161 is not set +# CONFIG_ETH0_PHY_KS8721 is not set +CONFIG_ETH0_PHY_DP83848C=y +# CONFIG_ETH0_PHY_LAN8720 is not set +# CONFIG_ETH0_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set # CONFIG_NET_MULTIBUFFER is not set # CONFIG_NET_IPv6 is not set diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig index 6a5d659fb21..3c9289a5415 100644 --- a/configs/zkit-arm-1769/nsh/defconfig +++ b/configs/zkit-arm-1769/nsh/defconfig @@ -392,10 +392,10 @@ CONFIG_UART0_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -# CONFIG_PHY_KS8721 is not set -CONFIG_PHY_DP83848C=y -# CONFIG_PHY_LAN8720 is not set -# CONFIG_PHY_DM9161 is not set +# CONFIG_ETH0_PHY_KS8721 is not set +CONFIG_ETH0_PHY_DP83848C=y +# CONFIG_ETH0_PHY_LAN8720 is not set +# CONFIG_ETH0_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set # CONFIG_NET_MULTIBUFFER is not set # CONFIG_NET_IPv6 is not set diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig index e4eabfd372f..43829762c72 100644 --- a/configs/zkit-arm-1769/nxhello/defconfig +++ b/configs/zkit-arm-1769/nxhello/defconfig @@ -411,10 +411,10 @@ CONFIG_UART0_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -# CONFIG_PHY_KS8721 is not set -CONFIG_PHY_DP83848C=y -# CONFIG_PHY_LAN8720 is not set -# CONFIG_PHY_DM9161 is not set +# CONFIG_ETH0_PHY_KS8721 is not set +CONFIG_ETH0_PHY_DP83848C=y +# CONFIG_ETH0_PHY_LAN8720 is not set +# CONFIG_ETH0_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set # CONFIG_NET_MULTIBUFFER is not set # CONFIG_NET_IPv6 is not set diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig index 61d2b343bfb..7e40eccdb3e 100644 --- a/configs/zkit-arm-1769/thttpd/defconfig +++ b/configs/zkit-arm-1769/thttpd/defconfig @@ -376,10 +376,10 @@ CONFIG_UART0_2STOP=0 # CONFIG_NET=y CONFIG_ARCH_HAVE_PHY=y -# CONFIG_PHY_KS8721 is not set -CONFIG_PHY_DP83848C=y -# CONFIG_PHY_LAN8720 is not set -# CONFIG_PHY_DM9161 is not set +# CONFIG_ETH0_PHY_KS8721 is not set +CONFIG_ETH0_PHY_DP83848C=y +# CONFIG_ETH0_PHY_LAN8720 is not set +# CONFIG_ETH0_PHY_DM9161 is not set # CONFIG_NET_NOINTS is not set # CONFIG_NET_MULTIBUFFER is not set # CONFIG_NET_IPv6 is not set