summaryrefslogtreecommitdiff
path: root/nuttx/configs/zkit-arm-1769/src
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-02-26 16:28:30 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-02-26 16:28:30 +0000
commitd681635b85e4a498dafd8822af19e0d5cd7f8f2f (patch)
tree1a01cc6fb1877f89a28b64b2d1576a1cd38fbffd /nuttx/configs/zkit-arm-1769/src
parent8fd4abf5ec0512bcdc43a3909bb3d691aa328e53 (diff)
downloadpx4-nuttx-d681635b85e4a498dafd8822af19e0d5cd7f8f2f.tar.gz
px4-nuttx-d681635b85e4a498dafd8822af19e0d5cd7f8f2f.tar.bz2
px4-nuttx-d681635b85e4a498dafd8822af19e0d5cd7f8f2f.zip
Add a THTTPD configuratin for zkit-arm-1769
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5675 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/zkit-arm-1769/src')
-rw-r--r--nuttx/configs/zkit-arm-1769/src/Makefile13
-rw-r--r--nuttx/configs/zkit-arm-1769/src/up_boot.c1
-rw-r--r--nuttx/configs/zkit-arm-1769/src/up_leds.c2
-rw-r--r--nuttx/configs/zkit-arm-1769/src/up_ssp.c8
4 files changed, 11 insertions, 13 deletions
diff --git a/nuttx/configs/zkit-arm-1769/src/Makefile b/nuttx/configs/zkit-arm-1769/src/Makefile
index b04f0c75f..f766616cd 100644
--- a/nuttx/configs/zkit-arm-1769/src/Makefile
+++ b/nuttx/configs/zkit-arm-1769/src/Makefile
@@ -77,21 +77,20 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@)
libboard$(LIBEXT): $(OBJS)
- @( for obj in $(OBJS) ; do \
- $(call ARCHIVE, $@, $${obj}); \
- done ; )
+ $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS)
- @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
- @touch $@
+ $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+ $(Q) touch $@
depend: .depend
clean:
- @rm -f libboard$(LIBEXT) *~ .*.swp
+ $(call DELFILE, libboard$(LIBEXT))
$(call CLEAN)
distclean: clean
- @rm -f Make.dep .depend
+ $(call DELFILE, Make.dep)
+ $(call DELFILE, .depend)
-include Make.dep
diff --git a/nuttx/configs/zkit-arm-1769/src/up_boot.c b/nuttx/configs/zkit-arm-1769/src/up_boot.c
index 6622f8de6..de7863eb1 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_boot.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_boot.c
@@ -52,7 +52,6 @@
#include "up_arch.h"
#include "up_internal.h"
-#include "lpc17_internal.h"
#include "zkitarm_internal.h"
/************************************************************************************
diff --git a/nuttx/configs/zkit-arm-1769/src/up_leds.c b/nuttx/configs/zkit-arm-1769/src/up_leds.c
index f0d8730d5..124c14af9 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_leds.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_leds.c
@@ -51,7 +51,7 @@
#include "up_arch.h"
#include "up_internal.h"
-#include "lpc17_internal.h"
+#include "lpc17_gpio.h"
#include "zkitarm_internal.h"
#ifdef CONFIG_ARCH_LEDS
diff --git a/nuttx/configs/zkit-arm-1769/src/up_ssp.c b/nuttx/configs/zkit-arm-1769/src/up_ssp.c
index 543669035..41fc0b344 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_ssp.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_ssp.c
@@ -54,7 +54,7 @@
#include "up_arch.h"
#include "chip.h"
-#include "lpc17_internal.h"
+#include "lpc17_ssp.h"
#include "zkitarm_internal.h"
#if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
@@ -122,7 +122,7 @@ void weak_function lpc17_sspinitialize(void)
#ifdef CONFIG_NX_LCDDRIVER
(void)lpc17_configgpio(ZKITARM_OLED_CS);
#endif
-#endif
+#endif /* CONFIG_LPC17_SSP0 */
ssp_dumpgpio("lpc17_sspinitialize() Exit");
}
@@ -168,7 +168,7 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
sspdbg("Returning SPI_STATUS_PRESENT\n");
return SPI_STATUS_PRESENT;
}
-#endif
+#endif /* CONFIG_LPC17_SSP1 */
#ifdef CONFIG_LPC17_SSP0
void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
@@ -209,6 +209,6 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
sspdbg("Returning zero\n");
return 0;
}
-#endif
+#endif /* CONFIG_LPC17_SSP0 */
#endif /* CONFIG_LPC17_SSP0 || CONFIG_LPC17_SSP1 */