diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-10-24 13:59:53 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-10-24 13:59:53 -0600 |
| commit | e2ad1144b26f2c7181ec039d7feed3742008068b (patch) | |
| tree | c277b12a6816a944c7e06eced3dc61728bb02604 | |
| parent | 2cb869c6a09605d7413269f41a867265944e3e85 (diff) | |
| download | px4-nuttx-e2ad1144b26f2c7181ec039d7feed3742008068b.tar.gz px4-nuttx-e2ad1144b26f2c7181ec039d7feed3742008068b.tar.bz2 px4-nuttx-e2ad1144b26f2c7181ec039d7feed3742008068b.zip | |
KL25: Update build for compatibility with recent CC3000 changes
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/configs/freedom-kl25z/src/Makefile | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index dfe62d637..9646fc40d 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -5874,3 +5874,6 @@ * arch/arm/src/sama5/sam_adc.c, sam_tc.c and sam_tc.h: Hook in the timer/counter logic so that it can driver periodic ADC sampling (2013-10-24). + * configs/freedom-kl25z/src/Makefile: Only build kl_wifi.c if + CONFIG_WL_CC3000 is selected. From Alan Carvalho de Assis + (2013-10-24). diff --git a/nuttx/configs/freedom-kl25z/src/Makefile b/nuttx/configs/freedom-kl25z/src/Makefile index 3c6ac3694..117141322 100644 --- a/nuttx/configs/freedom-kl25z/src/Makefile +++ b/nuttx/configs/freedom-kl25z/src/Makefile @@ -40,7 +40,11 @@ CFLAGS += -I$(TOPDIR)/sched ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = kl_boardinitialize.c kl_wifi.c +CSRCS = kl_boardinitialize.c + +ifeq ($(CONFIG_WL_CC3000),y) +CSRCS += kl_wifi.c +endif ifeq ($(CONFIG_KL_TSI),y) CSRCS += kl_tsi.c |