summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-09-25 11:50:05 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-09-25 11:50:05 -0600
commit00500643fb9081a8683ca01d1685e497dc407ce8 (patch)
treeee6a0ba468ee948620d5930381af74da8990eacf
parentf05a0577270e64dbd1e90c1aa59d42f23c5b282f (diff)
downloadnuttx-00500643fb9081a8683ca01d1685e497dc407ce8.tar.gz
nuttx-00500643fb9081a8683ca01d1685e497dc407ce8.tar.bz2
nuttx-00500643fb9081a8683ca01d1685e497dc407ce8.zip
Move CONFIG_NET_DUMPPACKET from LPC17 and STM32 to commong network drivers. Automatically enabled CONFIG_NETDEVICES when any Ethernet driver is enabled
-rw-r--r--nuttx/ChangeLog2
-rw-r--r--nuttx/arch/arm/src/lm/Kconfig1
-rw-r--r--nuttx/arch/arm/src/lpc17xx/Kconfig9
-rw-r--r--nuttx/arch/arm/src/sama5/Kconfig2
-rw-r--r--nuttx/arch/mips/src/pic32mx/Kconfig9
-rw-r--r--nuttx/drivers/net/Kconfig11
6 files changed, 18 insertions, 16 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 6194be14c..f2c9fc831 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5625,4 +5625,6 @@
Holtzberg (2013-9-24).
* Standardized stack checking logic so the interfaces can be used
by common stack monitoring logic (2013-9-24).
+ * drivers/net/Kconfig: Move CONFIG_NET_DUMPPACKET out of LPC17
+ and STM32 Kconfigs into the common network driver Kconfig (2013-9-25).
diff --git a/nuttx/arch/arm/src/lm/Kconfig b/nuttx/arch/arm/src/lm/Kconfig
index c1266c473..84f326fd9 100644
--- a/nuttx/arch/arm/src/lm/Kconfig
+++ b/nuttx/arch/arm/src/lm/Kconfig
@@ -120,6 +120,7 @@ config SSI1_DISABLE
config LM_ETHERNET
bool "Stellaris Ethernet"
default n
+ select NETDEVICES
---help---
This must be set (along with NET) to build the Stellaris Ethernet driver.
diff --git a/nuttx/arch/arm/src/lpc17xx/Kconfig b/nuttx/arch/arm/src/lpc17xx/Kconfig
index 5097437ab..31fbc1a8a 100644
--- a/nuttx/arch/arm/src/lpc17xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc17xx/Kconfig
@@ -137,7 +137,7 @@ config LPC17_EMC
config LPC17_ETHERNET
bool "Ethernet"
- select NET
+ select NETDEVICES
select ARCH_HAVE_PHY
default n
@@ -684,13 +684,6 @@ config NET_REGDEBUG
---help---
Enable low level register debug. Also needs DEBUG.
-config NET_DUMPPACKET
- bool "Enable packet dumping"
- depends on DEBUG
- default n
- ---help---
- Dump all received and transmitted packets. Also needs DEBUG.
-
config NET_HASH
bool "Hashing"
default n
diff --git a/nuttx/arch/arm/src/sama5/Kconfig b/nuttx/arch/arm/src/sama5/Kconfig
index 0e048c23b..5cb96e01e 100644
--- a/nuttx/arch/arm/src/sama5/Kconfig
+++ b/nuttx/arch/arm/src/sama5/Kconfig
@@ -160,12 +160,14 @@ config SAMA5_GMAC
bool "Gigabit Ethernet MAC (GMAC)"
default n
depends on SAMA5_HAVE_GMAC
+ select NETDEVICES
select ARCH_HAVE_PHY
config SAMA5_EMAC
bool "10/100MBps Ethernet MAC (EMAC)"
default n
depends on SAMA5_HAVE_EMAC
+ select NETDEVICES
select ARCH_HAVE_PHY
config SAMA5_LCDC
diff --git a/nuttx/arch/mips/src/pic32mx/Kconfig b/nuttx/arch/mips/src/pic32mx/Kconfig
index 82a901809..1c04ad6f0 100644
--- a/nuttx/arch/mips/src/pic32mx/Kconfig
+++ b/nuttx/arch/mips/src/pic32mx/Kconfig
@@ -573,7 +573,7 @@ config PIC32MX_CAN2
config PIC32MX_ETHERNET
bool "Ethernet"
default n
- select NET
+ select NETDEVICES
select ARCH_HAVE_PHY
config PIC32MX_CTMU
@@ -981,13 +981,6 @@ config NET_WOL
---help---
Enable Wake-up on LAN (not fully implemented).
-config NET_DUMPPACKET
- bool "Dump packets"
- default n
- depends on PIC32MX_ETHERNET && DEBUG
- ---help---
- Dump all received and transmitted packets. Also needs DEBUG.
-
config NET_REGDEBUG
bool "Register level debug"
default n
diff --git a/nuttx/drivers/net/Kconfig b/nuttx/drivers/net/Kconfig
index 49957149d..c13848021 100644
--- a/nuttx/drivers/net/Kconfig
+++ b/nuttx/drivers/net/Kconfig
@@ -3,6 +3,8 @@
# see misc/tools/kconfig-language.txt.
#
+comment "General Ethernet MAC Driver Options"
+
config NETDEV_MULTINIC
bool "Multiple NIC support"
default n
@@ -10,6 +12,15 @@ config NETDEV_MULTINIC
Select this option if you board and/or MCU are capable of supporting
multiple Ethernet MAC drivers.
+config NET_DUMPPACKET
+ bool "Enable packet dumping"
+ depends on DEBUG
+ default n
+ ---help---
+ Some Ethernet MAC drivers supporting dumping of received and
+ transmitted packets as a debug option. This setting enables that
+ debug option. Also needs DEBUG.
+
comment "External Ethernet MAC Device Support"
config NET_DM90x0