Some restructing of the CC3000 build

configs/freedom-kl25z/README.txt

@@ -409,3 +409,28 @@ Where <subdir> is one of the following:
 
        There is probably enough free memroy to support 3 or 4 application
        threads in addition to NSH.
+
+    5. This configurations has support for NSH built-in applications.  However,
+       in the default configuration no built-in applications are enabled.
+
+    6. This configuration has been used to verify the TI CC3000 wireless
+       networking module.  In order to enable this module, you would need to
+       make the following changes to the default configuration files:
+
+       System Type -> Kinetis peripheral support
+         CONFIG_KL_SPI0=y                        : Enable SPI
+         CONFIG_KL_SPI1=y
+
+       Drivers -> SPI
+         CONFIG_SPI=y                            : Enable SPI
+         CONFIG_SPI_EXCHANGE=y
+
+       Drivers -> Wireless
+         CONFIG_WIRELESS=y                       : Enable wireless support
+         CONFIG_WL_CC3000=y                      : Build the CC3000 driver
+
+       Applications -> Examples
+         CONFIG_EXAMPLES_CC3000BASIC=y           : CC3000 test example
+
+       Applications -> NSH Library
+         CONFIG_NSH_ARCHINIT=y                   : Build in CC3000 initialization logic

configs/freedom-kl25z/nsh/defconfig

@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -84,6 +84,7 @@ CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
+# CONFIG_ARCH_CORTEXA8 is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="kl"
 CONFIG_ARCH_HAVE_CMNVECTOR=y
@@ -94,10 +95,10 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 #
 # ARMV6M Configuration Options
 #
-# CONFIG_ARMV6M_TOOLCHAIN_BUILDROOT is not set
+CONFIG_ARMV6M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV6M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYL is not set
-CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL=y
+# CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL is not set
 # CONFIG_GPIO_IRQ is not set
 
 #
@@ -116,8 +117,8 @@ CONFIG_KL_UART0=y
 # CONFIG_KL_UART2 is not set
 # CONFIG_KL_FLEXCAN0 is not set
 # CONFIG_KL_FLEXCAN1 is not set
-CONFIG_KL_SPI0=y
+# CONFIG_KL_SPI0 is not set
-CONFIG_KL_SPI1=y
+# CONFIG_KL_SPI1 is not set
 # CONFIG_KL_SPI2 is not set
 # CONFIG_KL_I2C0 is not set
 # CONFIG_KL_I2C1 is not set
@@ -281,11 +282,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_CAN is not set
 # CONFIG_PWM is not set
 # CONFIG_I2C is not set
-CONFIG_SPI=y
+# CONFIG_SPI is not set
-# CONFIG_SPI_OWNBUS is not set
-CONFIG_SPI_EXCHANGE=y
-# CONFIG_SPI_CMDDATA is not set
-# CONFIG_SPI_BITBANG is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
@@ -327,10 +324,7 @@ CONFIG_UART0_2STOP=0
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
-CONFIG_WIRELESS=y
+# CONFIG_WIRELESS is not set
-# CONFIG_WL_CC1101 is not set
-CONFIG_WL_CC3000=y
-# CONFIG_WL_NRF24L01 is not set
 
 #
 # System Logging Device Options
@@ -446,7 +440,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
-CONFIG_EXAMPLES_CC3000BASIC=y
+# CONFIG_EXAMPLES_CC3000BASIC is not set
 # CONFIG_EXAMPLES_COMPOSITE is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
@@ -601,7 +595,7 @@ CONFIG_NSH_CONSOLE=y
 # USB Trace Support
 #
 # CONFIG_NSH_CONDEV is not set
-CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_ARCHINIT is not set
 
 #
 # NxWidgets/NxWM

configs/freedom-kl25z/src/kl_wifi.c

@@ -49,7 +49,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
 
-#include <nuttx/cc3000/spi.h>
+#include <nuttx/wireless/cc3000/spi.h>
 
 #include "up_arch.h"
 #include "kl_gpio.h"

drivers/Makefile

@@ -67,7 +67,6 @@ include syslog$(DELIM)Make.defs
 include usbdev$(DELIM)Make.defs
 include usbhost$(DELIM)Make.defs
 include wireless$(DELIM)Make.defs
-include wireless$(DELIM)cc3000$(DELIM)Make.defs
 
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
   CSRCS += dev_null.c dev_zero.c loop.c

drivers/wireless/Kconfig

@@ -13,6 +13,10 @@ menuconfig WL_CC3000
 	default n
 	select SPI
 
+if WL_CC3000
+source drivers/wireless/cc3000/Kconfig
+endif
+
 config WL_NRF24L01
 	bool "nRF24l01+ transceiver support"
 	default n

drivers/wireless/Make.defs

@@ -45,6 +45,10 @@ ifeq ($(CONFIG_WL_NRF24L01),y)
 CSRCS += nrf24l01.c
 endif
 
+ifeq ($(CONFIG_WL_CC3000),y)
+include wireless$(DELIM)cc3000$(DELIM)Make.defs
+endif
+
 # Include wireless devices build support
 
 DEPPATH += --dep-path wireless

drivers/wireless/cc3000/cc3000_common.c

@@ -43,10 +43,10 @@
  * Include files
  *
  *****************************************************************************/
-#include <nuttx/cc3000/cc3000_common.h>
+#include <nuttx/wireless/cc3000/cc3000_common.h>
-#include <nuttx/cc3000/socket.h>
+#include <nuttx/wireless/cc3000/socket.h>
-#include <nuttx/cc3000/wlan.h>
+#include <nuttx/wireless/cc3000/wlan.h>
-#include <nuttx/cc3000/evnt_handler.h>
+#include <nuttx/wireless/cc3000/evnt_handler.h>
 
 //*****************************************************************************
 //

drivers/wireless/cc3000/evnt_handler.c

@@ -44,13 +44,13 @@
 //******************************************************************************
 
 #include <string.h>
-#include <nuttx/cc3000/cc3000_common.h>
+#include <nuttx/wireless/cc3000/cc3000_common.h>
-#include <nuttx/cc3000/hci.h>
+#include <nuttx/wireless/cc3000/hci.h>
-#include <nuttx/cc3000/evnt_handler.h>
+#include <nuttx/wireless/cc3000/evnt_handler.h>
-#include <nuttx/cc3000/wlan.h>
+#include <nuttx/wireless/cc3000/wlan.h>
-#include <nuttx/cc3000/socket.h>
+#include <nuttx/wireless/cc3000/socket.h>
-#include <nuttx/cc3000/netapp.h>
+#include <nuttx/wireless/cc3000/netapp.h>
-#include <nuttx/cc3000/spi.h>
+#include <nuttx/wireless/cc3000/spi.h>
 
  
 

drivers/wireless/cc3000/hci.c

@@ -41,11 +41,11 @@
 //*****************************************************************************
 
 #include <string.h>
-#include <nuttx/cc3000/cc3000_common.h>
+#include <nuttx/wireless/cc3000/cc3000_common.h>
-#include <nuttx/cc3000/hci.h>
+#include <nuttx/wireless/cc3000/hci.h>
-#include <nuttx/cc3000/spi.h>
+#include <nuttx/wireless/cc3000/spi.h>
-#include <nuttx/cc3000/evnt_handler.h>
+#include <nuttx/wireless/cc3000/evnt_handler.h>
-#include <nuttx/cc3000/wlan.h>
+#include <nuttx/wireless/cc3000/wlan.h>
 
 #define SL_PATCH_PORTION_SIZE		(1000)
 

drivers/wireless/cc3000/netapp.c

@@ -33,11 +33,11 @@
 *
 *****************************************************************************/
 #include <string.h>
-#include <nuttx/cc3000/netapp.h>
+#include <nuttx/wireless/cc3000/netapp.h>
-#include <nuttx/cc3000/hci.h>
+#include <nuttx/wireless/cc3000/hci.h>
-#include <nuttx/cc3000/socket.h>
+#include <nuttx/wireless/cc3000/socket.h>
-#include <nuttx/cc3000/evnt_handler.h>
+#include <nuttx/wireless/cc3000/evnt_handler.h>
-#include <nuttx/cc3000/nvmem.h>
+#include <nuttx/wireless/cc3000/nvmem.h>
 
 #define MIN_TIMER_VAL_SECONDS      20
 #define MIN_TIMER_SET(t)    if ((0 != t) && (t < MIN_TIMER_VAL_SECONDS)) \

drivers/wireless/cc3000/nvmem.c

@@ -42,10 +42,10 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <nuttx/cc3000/nvmem.h>
+#include <nuttx/wireless/cc3000/nvmem.h>
-#include <nuttx/cc3000/hci.h>
+#include <nuttx/wireless/cc3000/hci.h>
-#include <nuttx/cc3000/socket.h>
+#include <nuttx/wireless/cc3000/socket.h>
-#include <nuttx/cc3000/evnt_handler.h>
+#include <nuttx/wireless/cc3000/evnt_handler.h>
 
 //*****************************************************************************
 //

drivers/wireless/cc3000/security.c

@@ -40,7 +40,7 @@
 //
 //*****************************************************************************
 
-#include <nuttx/cc3000/security.h>
+#include <nuttx/wireless/cc3000/security.h>
 
 #ifndef CC3000_UNENCRYPTED_SMART_CONFIG
 // foreward sbox

drivers/wireless/cc3000/socket.c

@@ -43,10 +43,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <nuttx/cc3000/hci.h>
+#include <nuttx/wireless/cc3000/hci.h>
-#include <nuttx/cc3000/socket.h>
+#include <nuttx/wireless/cc3000/socket.h>
-#include <nuttx/cc3000/evnt_handler.h>
+#include <nuttx/wireless/cc3000/evnt_handler.h>
-#include <nuttx/cc3000/netapp.h>
+#include <nuttx/wireless/cc3000/netapp.h>
 
 
 

drivers/wireless/cc3000/wlan.c

@@ -40,13 +40,13 @@
 //
 //*****************************************************************************
 #include <string.h>
-#include <nuttx/cc3000/wlan.h>
+#include <nuttx/wireless/cc3000/wlan.h>
-#include <nuttx/cc3000/hci.h>
+#include <nuttx/wireless/cc3000/hci.h>
-#include <nuttx/cc3000/spi.h>
+#include <nuttx/wireless/cc3000/spi.h>
-#include <nuttx/cc3000/socket.h>
+#include <nuttx/wireless/cc3000/socket.h>
-#include <nuttx/cc3000/nvmem.h>
+#include <nuttx/wireless/cc3000/nvmem.h>
-#include <nuttx/cc3000/security.h>
+#include <nuttx/wireless/cc3000/security.h>
-#include <nuttx/cc3000/evnt_handler.h>
+#include <nuttx/wireless/cc3000/evnt_handler.h>
 
 
 volatile sSimplLinkInformation tSLInformation;

include/nuttx/wireless/cc3000/evnt_handler.h

@@ -34,8 +34,9 @@
 *****************************************************************************/
 #ifndef __EVENT_HANDLER_H__
 #define __EVENT_HANDLER_H__
-#include "hci.h"
+
-#include "socket.h"
+#include <nuttx/wireless/cc3000/hci.h>
+#include <nuttx/wireless/cc3000/socket.h>
 
 //*****************************************************************************
 //

include/nuttx/wireless/cc3000/hci.h

@@ -35,7 +35,7 @@
 #ifndef __HCI_H__
 #define __HCI_H__
 
-#include "cc3000_common.h"
+#include <nuttx/wireless/cc3000/cc3000_common.h>
 
 //*****************************************************************************
 //

include/nuttx/wireless/cc3000/nvmem.h

@@ -35,7 +35,7 @@
 #ifndef __NVRAM_H__
 #define __NVRAM_H__
 
-#include "cc3000_common.h"
+#include <nuttx/wireless/cc3000/cc3000_common.h>
 
 
 //*****************************************************************************

include/nuttx/wireless/cc3000/security.h

@@ -35,7 +35,7 @@
 #ifndef __SECURITY__
 #define __SECURITY__
 
-#include "nvmem.h"
+#include <nuttx/wireless/cc3000/nvmem.h>
 
 //*****************************************************************************
 //

include/nuttx/wireless/cc3000/wlan.h

@@ -35,7 +35,7 @@
 #ifndef __WLAN_H__
 #define	__WLAN_H__
 
-#include "cc3000_common.h"
+#include <nuttx/wireless/cc3000/cc3000_common.h>
 
 //*****************************************************************************
 //