diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-09-17 10:44:23 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-09-17 10:44:23 -0600 |
commit | 568c665531bfdf512612136a6fe6e7c9c89f9058 (patch) | |
tree | 246e4a8300b41a7ab1ec7fa4e5a31591786926f3 | |
parent | bc49d73b00c70fc2e03a3e1151e96f6785c57ee4 (diff) | |
download | nuttx-568c665531bfdf512612136a6fe6e7c9c89f9058.tar.gz nuttx-568c665531bfdf512612136a6fe6e7c9c89f9058.tar.bz2 nuttx-568c665531bfdf512612136a6fe6e7c9c89f9058.zip |
Add prefex ETH0 to all PHY configurations to support multiple NICs
52 files changed, 123 insertions, 123 deletions
diff --git a/nuttx/configs/cloudctrl/nsh/defconfig b/nuttx/configs/cloudctrl/nsh/defconfig index 7011687a4..d8724bb49 100644 --- a/nuttx/configs/cloudctrl/nsh/defconfig +++ b/nuttx/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/nuttx/configs/cloudctrl/src/cloudctrl-internal.h b/nuttx/configs/cloudctrl/src/cloudctrl-internal.h index 7fbbb76bb..f731a455e 100644 --- a/nuttx/configs/cloudctrl/src/cloudctrl-internal.h +++ b/nuttx/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/nuttx/configs/cloudctrl/src/up_phyinit.c b/nuttx/configs/cloudctrl/src/up_phyinit.c index 114c9f07b..9fe89f319 100644 --- a/nuttx/configs/cloudctrl/src/up_phyinit.c +++ b/nuttx/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/nuttx/configs/lincoln60/README.txt b/nuttx/configs/lincoln60/README.txt index 9d856a7c2..d94c4c1de 100644 --- a/nuttx/configs/lincoln60/README.txt +++ b/nuttx/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/nuttx/configs/lincoln60/nsh/defconfig b/nuttx/configs/lincoln60/nsh/defconfig index 9222944d4..4a613a179 100644 --- a/nuttx/configs/lincoln60/nsh/defconfig +++ b/nuttx/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/nuttx/configs/lincoln60/ostest/defconfig b/nuttx/configs/lincoln60/ostest/defconfig index d657b8fc4..667329376 100644 --- a/nuttx/configs/lincoln60/ostest/defconfig +++ b/nuttx/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/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt index 8ea443f79..dd917d61e 100644 --- a/nuttx/configs/lpc4330-xplorer/README.txt +++ b/nuttx/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/nuttx/configs/lpc4330-xplorer/nsh/defconfig b/nuttx/configs/lpc4330-xplorer/nsh/defconfig index 0c981ff0c..1f30698fa 100644 --- a/nuttx/configs/lpc4330-xplorer/nsh/defconfig +++ b/nuttx/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/nuttx/configs/lpc4330-xplorer/ostest/defconfig b/nuttx/configs/lpc4330-xplorer/ostest/defconfig index 15f016759..fec0c6236 100644 --- a/nuttx/configs/lpc4330-xplorer/ostest/defconfig +++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/README.txt b/nuttx/configs/lpcxpresso-lpc1768/README.txt index 3e269e979..9e4c224cb 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/README.txt +++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig index 1a4069e64..71e5ea531 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig +++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig index 836ba54bf..ecc3cefe3 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig +++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig index a1a2849ed..1b6da6bb2 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig index 8aee698f4..4f9fde0f0 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig +++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig index 899502bd0..25a67c5fb 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig +++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/nuttx/configs/lpcxpresso-lpc1768/usbmsc/defconfig index 791bd7e09..57ad1c52e 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/usbmsc/defconfig +++ b/nuttx/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/nuttx/configs/mbed/README.txt b/nuttx/configs/mbed/README.txt index 592487a45..7ef2c7cc7 100644 --- a/nuttx/configs/mbed/README.txt +++ b/nuttx/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/nuttx/configs/mbed/hidkbd/defconfig b/nuttx/configs/mbed/hidkbd/defconfig index 19a855ea2..ecf5a9461 100644 --- a/nuttx/configs/mbed/hidkbd/defconfig +++ b/nuttx/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/nuttx/configs/mbed/nsh/defconfig b/nuttx/configs/mbed/nsh/defconfig index 9b32ac29a..3eea05325 100755 --- a/nuttx/configs/mbed/nsh/defconfig +++ b/nuttx/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/nuttx/configs/nucleus2g/README.txt b/nuttx/configs/nucleus2g/README.txt index 1980ae6fd..153d7fa4f 100644 --- a/nuttx/configs/nucleus2g/README.txt +++ b/nuttx/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/nuttx/configs/nucleus2g/nsh/defconfig b/nuttx/configs/nucleus2g/nsh/defconfig index 0c326c2b1..eae5a6de2 100755 --- a/nuttx/configs/nucleus2g/nsh/defconfig +++ b/nuttx/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/nuttx/configs/nucleus2g/ostest/defconfig b/nuttx/configs/nucleus2g/ostest/defconfig index 7067d58a0..1c58bd784 100755 --- a/nuttx/configs/nucleus2g/ostest/defconfig +++ b/nuttx/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/nuttx/configs/nucleus2g/usbmsc/defconfig b/nuttx/configs/nucleus2g/usbmsc/defconfig index a024d7057..f4797b809 100755 --- a/nuttx/configs/nucleus2g/usbmsc/defconfig +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt index 9f5948687..9bf1ef52a 100644 --- a/nuttx/configs/olimex-lpc1766stk/README.txt +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig index 39b1467ad..44cd8fc4f 100755 --- a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig index f092c52b8..f5cfa1e54 100755 --- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig index b1bfd1be6..f84acf5f3 100644 --- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig index 4fe4687d5..5c1729b2e 100755 --- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig index 2a9f3ce4b..7bb1d6d8f 100755 --- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig index cd5e8d314..19325bf87 100755 --- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig index e7b1419aa..ad0331979 100755 --- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/usbmsc/defconfig b/nuttx/configs/olimex-lpc1766stk/usbmsc/defconfig index 3a5ad422c..af75039fc 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbmsc/defconfig +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/zmodem/defconfig b/nuttx/configs/olimex-lpc1766stk/zmodem/defconfig index 4b9cb132d..2946498b2 100644 --- a/nuttx/configs/olimex-lpc1766stk/zmodem/defconfig +++ b/nuttx/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/nuttx/configs/olimex-stm32-p107/nsh/defconfig b/nuttx/configs/olimex-stm32-p107/nsh/defconfig index 9bc901dbe..de8d8ce51 100644 --- a/nuttx/configs/olimex-stm32-p107/nsh/defconfig +++ b/nuttx/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/nuttx/configs/pic32-starterkit/README.txt b/nuttx/configs/pic32-starterkit/README.txt index c65ee953c..0dd49c444 100644 --- a/nuttx/configs/pic32-starterkit/README.txt +++ b/nuttx/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/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig index d9909c09a..ac762efcd 100644 --- a/nuttx/configs/pic32-starterkit/nsh/defconfig +++ b/nuttx/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/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig index 3b227b790..32bcbc36e 100644 --- a/nuttx/configs/pic32-starterkit/nsh2/defconfig +++ b/nuttx/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/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig index 3ab94f513..b5f1ade09 100644 --- a/nuttx/configs/pic32-starterkit/ostest/defconfig +++ b/nuttx/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/nuttx/configs/pic32mx7mmb/README.txt b/nuttx/configs/pic32mx7mmb/README.txt index 36ff444f4..73b50945b 100644 --- a/nuttx/configs/pic32mx7mmb/README.txt +++ b/nuttx/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/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig index acb34b36e..96f9ef9ae 100644 --- a/nuttx/configs/pic32mx7mmb/nsh/defconfig +++ b/nuttx/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/nuttx/configs/pic32mx7mmb/ostest/defconfig b/nuttx/configs/pic32mx7mmb/ostest/defconfig index 7df3171eb..7b836a5a3 100644 --- a/nuttx/configs/pic32mx7mmb/ostest/defconfig +++ b/nuttx/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/nuttx/configs/shenzhou/nsh/defconfig b/nuttx/configs/shenzhou/nsh/defconfig index 450915e2f..8a8f168b2 100644 --- a/nuttx/configs/shenzhou/nsh/defconfig +++ b/nuttx/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/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig index 22c23c1b7..f3be8c305 100644 --- a/nuttx/configs/shenzhou/nxwm/defconfig +++ b/nuttx/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/nuttx/configs/shenzhou/thttpd/defconfig b/nuttx/configs/shenzhou/thttpd/defconfig index 04340560c..7fb0cb383 100644 --- a/nuttx/configs/shenzhou/thttpd/defconfig +++ b/nuttx/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/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig index 7bc64709c..b81d29076 100644 --- a/nuttx/configs/stm3220g-eval/nxwm/defconfig +++ b/nuttx/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/nuttx/configs/stm3240g-eval/discover/defconfig b/nuttx/configs/stm3240g-eval/discover/defconfig index d255c748b..d188b3e2c 100644 --- a/nuttx/configs/stm3240g-eval/discover/defconfig +++ b/nuttx/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/nuttx/configs/stm3240g-eval/xmlrpc/defconfig b/nuttx/configs/stm3240g-eval/xmlrpc/defconfig index 6917ab0fd..8962777e4 100644 --- a/nuttx/configs/stm3240g-eval/xmlrpc/defconfig +++ b/nuttx/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/nuttx/configs/zkit-arm-1769/README.txt b/nuttx/configs/zkit-arm-1769/README.txt index 10699cfab..37e1e5f64 100644 --- a/nuttx/configs/zkit-arm-1769/README.txt +++ b/nuttx/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/nuttx/configs/zkit-arm-1769/hello/defconfig b/nuttx/configs/zkit-arm-1769/hello/defconfig index 192dd89da..634aef8c7 100644 --- a/nuttx/configs/zkit-arm-1769/hello/defconfig +++ b/nuttx/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/nuttx/configs/zkit-arm-1769/nsh/defconfig b/nuttx/configs/zkit-arm-1769/nsh/defconfig index 6a5d659fb..3c9289a54 100644 --- a/nuttx/configs/zkit-arm-1769/nsh/defconfig +++ b/nuttx/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/nuttx/configs/zkit-arm-1769/nxhello/defconfig b/nuttx/configs/zkit-arm-1769/nxhello/defconfig index e4eabfd37..43829762c 100644 --- a/nuttx/configs/zkit-arm-1769/nxhello/defconfig +++ b/nuttx/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/nuttx/configs/zkit-arm-1769/thttpd/defconfig b/nuttx/configs/zkit-arm-1769/thttpd/defconfig index 61d2b343b..7e40eccdb 100644 --- a/nuttx/configs/zkit-arm-1769/thttpd/defconfig +++ b/nuttx/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 |