diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-10-23 11:48:57 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-10-23 11:48:57 -0600 |
| commit | b51e2e092ba44bba94627aac1595a846310b9143 (patch) | |
| tree | 58ad9dab4ffcc172595a72f468b0b767d05232a4 | |
| parent | 4d2c732d746cd8a3624886fbc83e0d31d5ca10f3 (diff) | |
| download | px4-nuttx-b51e2e092ba44bba94627aac1595a846310b9143.tar.gz px4-nuttx-b51e2e092ba44bba94627aac1595a846310b9143.tar.bz2 px4-nuttx-b51e2e092ba44bba94627aac1595a846310b9143.zip | |
Add logic to enable DEBUG_NET if NET=n but WL_CC3000=y
| -rw-r--r-- | nuttx/ChangeLog | 4 | ||||
| -rw-r--r-- | nuttx/Kconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/sama5d3x-ek/README.txt | 2 | ||||
| -rw-r--r-- | nuttx/drivers/wireless/cc3000/Kconfig | 1 | ||||
| -rw-r--r-- | nuttx/net/Kconfig | 12 |
5 files changed, 16 insertions, 5 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 1fcccfb3a..027d1639c 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -5850,4 +5850,8 @@ (2013-10-23). * include/nuttx/wireless/cc3000: More CC3000 driver updates from David Sidrane (2013-10-23). + * net/Kconfig, drivers/net/wireless/cc3000/Kconfig, and Kconfig: Add + ARCH_HAVE_NET that determines if a network is present or not. This + currently can happen if CONFIG_NET is set or if CONFIG_WL_CC3000 is + is set (23013-10-23). diff --git a/nuttx/Kconfig b/nuttx/Kconfig index 15a9788d0..06cddace3 100644 --- a/nuttx/Kconfig +++ b/nuttx/Kconfig @@ -352,7 +352,7 @@ config DEBUG_PAGING config DEBUG_NET bool "Network Debug Output" default n - depends on NET + depends on ARCH_HAVE_NET ---help--- Enable network debug SYSLOG output (disabled by default) diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt index 6199e2c5d..7d5cf8957 100644 --- a/nuttx/configs/sama5d3x-ek/README.txt +++ b/nuttx/configs/sama5d3x-ek/README.txt @@ -716,7 +716,7 @@ CAN Usage common. +----------+ RJ-11 DB-9 - | O | ----------- -------------- + | O | ----------- -------------- +------------+ | | Pin 1 3v3 Pin 1 N/C | +--+ | | o5 | Pin 2 5v Pin 2 CANL | | | | | o9 | Pin 3 N/C Pin 3 GND diff --git a/nuttx/drivers/wireless/cc3000/Kconfig b/nuttx/drivers/wireless/cc3000/Kconfig index 6e71a9af1..44b285728 100644 --- a/nuttx/drivers/wireless/cc3000/Kconfig +++ b/nuttx/drivers/wireless/cc3000/Kconfig @@ -7,6 +7,7 @@ config WL_CC3000 bool "CC3000 Wireless Module" default n select SPI + select ARCH_HAVE_NET ---help--- Enable support for the TI CC3000 Wifi Module diff --git a/nuttx/net/Kconfig b/nuttx/net/Kconfig index 719f837d0..1a1d1e8e6 100644 --- a/nuttx/net/Kconfig +++ b/nuttx/net/Kconfig @@ -3,15 +3,21 @@ # see misc/tools/kconfig-language.txt. # +config ARCH_HAVE_NET + bool + default n + +config ARCH_HAVE_PHY + bool + default n + config NET bool "Networking support" default n + select ARCH_HAVE_NET ---help--- Enable or disable all network features -config ARCH_HAVE_PHY - bool - if NET config NET_NOINTS |