From 1f63d85869b3495f3f66a3300b365c57469f1020 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 5 Jan 2018 22:47:10 -0500
Subject: [PATCH] NuttX generate Make.defs per config from PX4 cmake (#8573)

---
 platforms/nuttx/NuttX/CMakeLists.txt          |  21 +--
 .../src/Makefile => Make.defs.in}             |  78 ++++----
 platforms/nuttx/nuttx-configs/PX4_Config.mk   |  45 -----
 platforms/nuttx/nuttx-configs/PX4_Warnings.mk |  74 --------
 .../nuttx-configs/aerocore2/nsh/Make.defs     | 165 -----------------
 .../nuttx-configs/aerocore2/src/Makefile      |  86 ---------
 .../nuttx/nuttx-configs/aerocore2/src/empty.c |   4 -
 .../nuttx-configs/aerofc-v1/nsh/Make.defs     | 164 -----------------
 .../nuttx-configs/aerofc-v1/src/Makefile      |  87 ---------
 .../nuttx/nuttx-configs/aerofc-v1/src/empty.c |   4 -
 .../nuttx-configs/auav-x21/nsh/Make.defs      | 164 -----------------
 .../nuttx/nuttx-configs/auav-x21/src/Makefile |  87 ---------
 .../nuttx/nuttx-configs/auav-x21/src/empty.c  |   4 -
 .../nuttx-configs/crazyflie/nsh/Make.defs     | 167 ------------------
 .../nuttx-configs/crazyflie/src/Makefile      |  88 ---------
 .../nuttx/nuttx-configs/crazyflie/src/empty.c |   4 -
 .../nuttx-configs/esc35-v1/nsh/Make.defs      | 159 -----------------
 .../nuttx/nuttx-configs/esc35-v1/src/Makefile |  86 ---------
 .../nuttx/nuttx-configs/esc35-v1/src/empty.c  |   4 -
 .../nuttx-configs/mindpx-v2/nsh/Make.defs     | 165 -----------------
 .../nuttx-configs/mindpx-v2/src/Makefile      |  88 ---------
 .../nuttx/nuttx-configs/mindpx-v2/src/empty.c |   4 -
 .../nuttx-configs/nxphlite-v3/nsh/Make.defs   | 163 -----------------
 .../nuttx-configs/nxphlite-v3/src/Makefile    |  86 ---------
 .../nuttx-configs/nxphlite-v3/src/empty.c     |   4 -
 .../px4-same70xplained-v1/nsh/Make.defs       | 161 -----------------
 .../px4-same70xplained-v1/src/empty.c         |   4 -
 .../px4-stm32f4discovery/nsh/Make.defs        | 165 -----------------
 .../px4-stm32f4discovery/src/Makefile         |  87 ---------
 .../px4-stm32f4discovery/src/empty.c          |   4 -
 .../nuttx-configs/px4cannode-v1/nsh/Make.defs | 157 ----------------
 .../nuttx-configs/px4cannode-v1/src/Makefile  |  86 ---------
 .../nuttx-configs/px4cannode-v1/src/empty.c   |   4 -
 .../nuttx-configs/px4esc-v1/nsh/Make.defs     | 159 -----------------
 .../nuttx-configs/px4esc-v1/src/Makefile      |  86 ---------
 .../nuttx/nuttx-configs/px4esc-v1/src/empty.c |   4 -
 .../nuttx-configs/px4flow-v2/nsh/Make.defs    | 159 -----------------
 .../nuttx-configs/px4flow-v2/src/Makefile     |  86 ---------
 .../nuttx-configs/px4flow-v2/src/empty.c      |   4 -
 .../nuttx-configs/px4fmu-v2/nsh/Make.defs     | 164 -----------------
 .../nuttx-configs/px4fmu-v2/src/Makefile      |  86 ---------
 .../nuttx/nuttx-configs/px4fmu-v2/src/empty.c |   4 -
 .../nuttx-configs/px4fmu-v4/nsh/Make.defs     | 165 -----------------
 .../nuttx-configs/px4fmu-v4/src/Makefile      |  88 ---------
 .../nuttx/nuttx-configs/px4fmu-v4/src/empty.c |   4 -
 .../nuttx-configs/px4fmu-v4pro/nsh/Make.defs  | 164 -----------------
 .../nuttx-configs/px4fmu-v4pro/src/Makefile   |  88 ---------
 .../nuttx-configs/px4fmu-v4pro/src/empty.c    |   4 -
 .../nuttx-configs/px4fmu-v5/nsh/Make.defs     | 166 -----------------
 .../nuttx-configs/px4fmu-v5/src/Makefile      |  86 ---------
 .../nuttx/nuttx-configs/px4fmu-v5/src/empty.c |   4 -
 .../nuttx-configs/px4io-v2/nsh/Make.defs      | 158 -----------------
 .../nuttx/nuttx-configs/px4io-v2/src/Makefile |  87 ---------
 .../nuttx/nuttx-configs/px4io-v2/src/empty.c  |   4 -
 .../px4nucleoF767ZI-v1/nsh/Make.defs          | 166 -----------------
 .../px4nucleoF767ZI-v1/src/Makefile           |  86 ---------
 .../px4nucleoF767ZI-v1/src/empty.c            |   4 -
 .../nuttx-configs/s2740vc-v1/nsh/Make.defs    | 159 -----------------
 .../nuttx-configs/s2740vc-v1/src/Makefile     |  86 ---------
 .../nuttx-configs/s2740vc-v1/src/empty.c      |   4 -
 .../nuttx/nuttx-configs/tap-v1/nsh/Make.defs  | 165 -----------------
 .../nuttx/nuttx-configs/tap-v1/src/Makefile   |  88 ---------
 .../nuttx/nuttx-configs/tap-v1/src/empty.c    |   4 -
 .../nuttx-configs/zubaxgnss-v1/nsh/Make.defs  | 157 ----------------
 .../nuttx-configs/zubaxgnss-v1/src/Makefile   |  86 ---------
 .../nuttx-configs/zubaxgnss-v1/src/empty.c    |   4 -
 66 files changed, 40 insertions(+), 5408 deletions(-)
 rename platforms/nuttx/nuttx-configs/{px4-same70xplained-v1/src/Makefile => Make.defs.in} (62%)
 delete mode 100644 platforms/nuttx/nuttx-configs/PX4_Config.mk
 delete mode 100644 platforms/nuttx/nuttx-configs/PX4_Warnings.mk
 delete mode 100644 platforms/nuttx/nuttx-configs/aerocore2/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/aerocore2/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/aerocore2/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/aerofc-v1/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/aerofc-v1/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/aerofc-v1/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/auav-x21/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/auav-x21/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/auav-x21/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/crazyflie/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/crazyflie/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/crazyflie/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/esc35-v1/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/esc35-v1/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/esc35-v1/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/mindpx-v2/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/mindpx-v2/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/mindpx-v2/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/nxphlite-v3/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/nxphlite-v3/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/nxphlite-v3/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/px4-same70xplained-v1/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/px4-same70xplained-v1/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/px4-stm32f4discovery/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/px4cannode-v1/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/px4cannode-v1/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/px4esc-v1/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/px4esc-v1/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/px4esc-v1/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/px4flow-v2/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/px4flow-v2/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/px4flow-v2/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v2/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v2/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v2/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v4/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v4/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v4/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v4pro/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v5/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/px4fmu-v5/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/px4io-v2/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/px4io-v2/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/px4io-v2/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/s2740vc-v1/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/s2740vc-v1/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/s2740vc-v1/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/tap-v1/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/tap-v1/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/tap-v1/src/empty.c
 delete mode 100644 platforms/nuttx/nuttx-configs/zubaxgnss-v1/nsh/Make.defs
 delete mode 100644 platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/Makefile
 delete mode 100644 platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/empty.c

diff --git a/platforms/nuttx/NuttX/CMakeLists.txt b/platforms/nuttx/NuttX/CMakeLists.txt
index 3f446cf308..bfe98b9166 100644
--- a/platforms/nuttx/NuttX/CMakeLists.txt
+++ b/platforms/nuttx/NuttX/CMakeLists.txt
@@ -38,6 +38,10 @@ file(GLOB_RECURSE copy_apps_files
 	LIST_DIRECTORIES false
 	${CMAKE_CURRENT_SOURCE_DIR}/apps/*)
 
+set(NUTTX_DIR ${CMAKE_CURRENT_BINARY_DIR}/nuttx)
+set(NUTTX_CONFIG_DIR ${PX4_SOURCE_DIR}/platforms/nuttx/nuttx-configs)
+configure_file(${NUTTX_CONFIG_DIR}/Make.defs.in ${NUTTX_DIR}/Make.defs)
+
 # copy nuttx to build directory
 file(RELATIVE_PATH CP_SRC ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/nuttx)
 file(RELATIVE_PATH CP_DST ${CMAKE_SOURCE_DIR} ${PX4_BINARY_DIR}/NuttX)
@@ -49,9 +53,6 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/nuttx_copy.stamp
 	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 	)
 
-set(NUTTX_DIR ${CMAKE_CURRENT_BINARY_DIR}/nuttx)
-set(NUTTX_CONFIG_DIR ${PX4_SOURCE_DIR}/platforms/nuttx/nuttx-configs)
-
 # copy apps to build directory
 file(RELATIVE_PATH CP_SRC ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/apps)
 file(RELATIVE_PATH CP_DST ${CMAKE_SOURCE_DIR} ${PX4_BINARY_DIR}/NuttX)
@@ -68,22 +69,14 @@ set(APPS_DIR ${CMAKE_CURRENT_BINARY_DIR}/apps)
 file(GLOB_RECURSE board_config_files ${NUTTX_CONFIG_DIR}/${BOARD})
 file(RELATIVE_PATH CP_SRC ${CMAKE_SOURCE_DIR} ${NUTTX_CONFIG_DIR}/${BOARD})
 file(RELATIVE_PATH CP_DST ${CMAKE_SOURCE_DIR} ${NUTTX_DIR}/configs)
-add_custom_command(OUTPUT
-					${NUTTX_DIR}/PX4_Config.mk
-					${NUTTX_DIR}/PX4_Warnings.mk
-					${NUTTX_DIR}/.config
-					${NUTTX_DIR}/Make.defs
-	COMMAND ${CMAKE_COMMAND} -E copy ${NUTTX_CONFIG_DIR}/PX4_Config.mk ${NUTTX_DIR}/PX4_Config.mk
-	COMMAND ${CMAKE_COMMAND} -E copy ${NUTTX_CONFIG_DIR}/PX4_Warnings.mk ${NUTTX_DIR}/PX4_Warnings.mk
+add_custom_command(
+	OUTPUT ${NUTTX_DIR}/.config
 	COMMAND ${CMAKE_COMMAND} -E copy ${NUTTX_CONFIG_DIR}/${BOARD}/${nuttx_config_type}/defconfig ${NUTTX_DIR}/.config
-	COMMAND ${CMAKE_COMMAND} -E copy ${NUTTX_CONFIG_DIR}/${BOARD}/${nuttx_config_type}/Make.defs ${NUTTX_DIR}/Make.defs
 	COMMAND ${CMAKE_COMMAND} -E remove -f ${NUTTX_DIR}/include/nuttx/config.h
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${NUTTX_DIR}/configs/${BOARD}/src
 	COMMAND cd ${CMAKE_SOURCE_DIR} && ${cp_cmd} ${cp_opts} ${CP_SRC} ${CP_DST}
 	DEPENDS
-		${NUTTX_CONFIG_DIR}/PX4_Config.mk
-		${NUTTX_CONFIG_DIR}/PX4_Warnings.mk
 		${NUTTX_CONFIG_DIR}/${BOARD}/${nuttx_config_type}/defconfig
-		${NUTTX_CONFIG_DIR}/${BOARD}/${nuttx_config_type}/Make.defs
 		${board_config_files}
 		${CMAKE_CURRENT_BINARY_DIR}/nuttx_copy.stamp
 		${CMAKE_CURRENT_BINARY_DIR}/apps_copy.stamp
diff --git a/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/src/Makefile b/platforms/nuttx/nuttx-configs/Make.defs.in
similarity index 62%
rename from platforms/nuttx/nuttx-configs/px4-same70xplained-v1/src/Makefile
rename to platforms/nuttx/nuttx-configs/Make.defs.in
index 35ad52a2d3..23f9108b0a 100644
--- a/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/src/Makefile
+++ b/platforms/nuttx/nuttx-configs/Make.defs.in
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/px4fmu-v2_upstream/src/Makefile
+# nuttx-configs/Make.defs
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,51 +33,39 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/.config
+include $(TOPDIR)/tools/Config.mk
 
-CFLAGS += -I$(TOPDIR)/sched
+CC = ${C_COMPILER}
+CXX = ${CXX_COMPILER}
+CPP = ${C_COMPILER} -E
+LD = ${LD}
+AR = ${CMAKE_AR} rcs
+NM = ${CMAKE_NM}
+OBJCOPY = ${CMAKE_OBJCOPY}
+OBJDUMP = ${CMAKE_OBJDUMP}
 
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
+CFLAGS = -Os -g2 -I${PX4_SOURCE_DIR}/src/include ${CMAKE_C_FLAGS} -I. -isystem $(TOPDIR)/include \
+	-Wno-bad-function-cast \
+	-Wno-cpp \
+	-Wno-float-equal \
+	-Wno-implicit-fallthrough \
+	-Wno-implicit-function-declaration \
+	-Wno-maybe-uninitialized \
+	-Wno-missing-declarations \
+	-Wno-missing-field-initializers \
+	-Wno-missing-prototypes \
+	-Wno-nested-externs \
+	-Wno-nonnull-compare \
+	-Wno-old-style-declaration \
+	-Wno-sign-compare \
+	-Wno-type-limits
 
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
+CXXFLAGS = -Os -g2 -I${PX4_SOURCE_DIR}/src/include ${CMAKE_CXX_FLAGS} -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx \
+	-fcheck-new \
+	-fno-builtin \
+	-Wno-double-promotion \
+	-Wno-maybe-uninitialized \
+	-Wno-missing-declarations
 
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
--include Make.dep
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
diff --git a/platforms/nuttx/nuttx-configs/PX4_Config.mk b/platforms/nuttx/nuttx-configs/PX4_Config.mk
deleted file mode 100644
index 4ec3002da1..0000000000
--- a/platforms/nuttx/nuttx-configs/PX4_Config.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-############################################################################
-# nuttx-configs/PX4_Config.mk
-#
-# Copyright (c) 2016 PX4 Development Team. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name PX4 nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-# Nuttx GNU builds now use GNU_EABI<L|W> to set the toolchaine
-# PX4 uses the host OS to decide if it is Linux, Darwin or Windows
-
-ifeq ($(OS),Windows_NT)
-    OS_DETECTED := Windows
-    HOST_OS_FIRST_LETTER:= W
-else
-    OS_DETECTED := $(shell uname -s)
-     # Clump Dawin and Linux as L to set GNU_EABI<L|W>
-    HOST_OS_FIRST_LETTER := L
-endif
diff --git a/platforms/nuttx/nuttx-configs/PX4_Warnings.mk b/platforms/nuttx/nuttx-configs/PX4_Warnings.mk
deleted file mode 100644
index 3f44fd22d7..0000000000
--- a/platforms/nuttx/nuttx-configs/PX4_Warnings.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-############################################################################
-# nuttx-configs/PX4_Warnings.mk
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-PX4_ARCHWARNINGS = -Wall \
-                   -Wextra \
-                   -Werror \
-                   -Wdouble-promotion \
-                   -Wframe-larger-than=1024 \
-                   -Wlogical-op \
-                   -Wpacked \
-                   -Wpointer-arith \
-                   -Wshadow \
-                   -Wno-sign-compare \
-                   -Wno-unused-parameter \
-                   -Wno-nonnull-compare \
-                   -Wno-implicit-fallthrough
-                   #-Wno-misleading-indentation # re-enable GCC >= 6
-
-#   -Wimplicit-fallthrough - generates compilation errors with GCC >= 7
-#   -Wnonnull-compare      - generates compilation errors with GCC >= 7
-#   -Wcast-qual            - generates spurious noreturn attribute warnings, try again later
-#   -Wconversion           - would be nice, but too many "risky-but-safe" conversions in the code
-#   -Wcast-align           - would help catch bad casts in some cases, but generates too many false positives
-
-PX4_ARCHCWARNINGS = \
-                   -Wbad-function-cast \
-                   -Wmissing-parameter-type \
-                   -Wnested-externs \
-                   -Wstrict-prototypes \
-                   -Wno-bad-function-cast \
-                   -Wno-cpp \
-                   -Wno-implicit-function-declaration \
-                   -Wno-maybe-uninitialized \
-                   -Wno-missing-field-initializers \
-                   -Wno-nested-externs \
-                   -Wno-old-style-declaration \
-                   -Wno-pointer-sign \
-                   -Wno-type-limits
-
-PX4_ARCHWARNINGSXX = \
-                   -Wno-cpp \
-                   -Wno-psabi
diff --git a/platforms/nuttx/nuttx-configs/aerocore2/nsh/Make.defs b/platforms/nuttx/nuttx-configs/aerocore2/nsh/Make.defs
deleted file mode 100644
index df83a18f6c..0000000000
--- a/platforms/nuttx/nuttx-configs/aerocore2/nsh/Make.defs
+++ /dev/null
@@ -1,165 +0,0 @@
-############################################################################
-# nuttx-configs/aerocore2/nsh/Make.defs
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
-
diff --git a/platforms/nuttx/nuttx-configs/aerocore2/src/Makefile b/platforms/nuttx/nuttx-configs/aerocore2/src/Makefile
deleted file mode 100644
index f29cfe594a..0000000000
--- a/platforms/nuttx/nuttx-configs/aerocore2/src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS += -I$(TOPDIR)/sched
-
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/aerocore2/src/empty.c b/platforms/nuttx/nuttx-configs/aerocore2/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/aerocore2/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/aerofc-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/aerofc-v1/nsh/Make.defs
deleted file mode 100644
index dea42e23cc..0000000000
--- a/platforms/nuttx/nuttx-configs/aerofc-v1/nsh/Make.defs
+++ /dev/null
@@ -1,164 +0,0 @@
-############################################################################
-# configs/tap-v1/nsh/Make.defs
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
diff --git a/platforms/nuttx/nuttx-configs/aerofc-v1/src/Makefile b/platforms/nuttx/nuttx-configs/aerofc-v1/src/Makefile
deleted file mode 100644
index 2cc0ff72f3..0000000000
--- a/platforms/nuttx/nuttx-configs/aerofc-v1/src/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-############################################################################
-# configs/tap-v1/src/Makefile
-#
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS		+= -I$(TOPDIR)/sched
-
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-
-CSRCS		= empty.c
-COBJS		= $(CSRCS:.c=$(OBJEXT))
-
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-             -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-             -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/aerofc-v1/src/empty.c b/platforms/nuttx/nuttx-configs/aerofc-v1/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/aerofc-v1/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/auav-x21/nsh/Make.defs b/platforms/nuttx/nuttx-configs/auav-x21/nsh/Make.defs
deleted file mode 100644
index 7b3384c6be..0000000000
--- a/platforms/nuttx/nuttx-configs/auav-x21/nsh/Make.defs
+++ /dev/null
@@ -1,164 +0,0 @@
-############################################################################
-# configs/auav_x21/nsh/Make.defs
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
\ No newline at end of file
diff --git a/platforms/nuttx/nuttx-configs/auav-x21/src/Makefile b/platforms/nuttx/nuttx-configs/auav-x21/src/Makefile
deleted file mode 100644
index e6b8c50098..0000000000
--- a/platforms/nuttx/nuttx-configs/auav-x21/src/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-############################################################################
-# configs/auav_x21/src/Makefile
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS		+= -I$(TOPDIR)/sched
-
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-
-CSRCS		= empty.c
-COBJS		= $(CSRCS:.c=$(OBJEXT))
-
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-		   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/auav-x21/src/empty.c b/platforms/nuttx/nuttx-configs/auav-x21/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/auav-x21/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/crazyflie/nsh/Make.defs b/platforms/nuttx/nuttx-configs/crazyflie/nsh/Make.defs
deleted file mode 100644
index a927b69820..0000000000
--- a/platforms/nuttx/nuttx-configs/crazyflie/nsh/Make.defs
+++ /dev/null
@@ -1,167 +0,0 @@
-############################################################################
-# configs/crazyflie/nsh/Make.defs
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-include $(TOPDIR)/PX4_Warnings.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
-
diff --git a/platforms/nuttx/nuttx-configs/crazyflie/src/Makefile b/platforms/nuttx/nuttx-configs/crazyflie/src/Makefile
deleted file mode 100644
index 238f38551b..0000000000
--- a/platforms/nuttx/nuttx-configs/crazyflie/src/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-############################################################################
-# configs/crazyflie/src/Makefile
-#
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS		+= -I$(TOPDIR)/sched
-
-ASRCS		= 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-
-CSRCS		= empty.c
-COBJS		= $(CSRCS:.c=$(OBJEXT))
-
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
-
diff --git a/platforms/nuttx/nuttx-configs/crazyflie/src/empty.c b/platforms/nuttx/nuttx-configs/crazyflie/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/crazyflie/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/esc35-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/esc35-v1/nsh/Make.defs
deleted file mode 100644
index e41cfac5fe..0000000000
--- a/platforms/nuttx/nuttx-configs/esc35-v1/nsh/Make.defs
+++ /dev/null
@@ -1,159 +0,0 @@
-############################################################################
-# configs/esc35-v1/nsh/Make.defs
-#
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
diff --git a/platforms/nuttx/nuttx-configs/esc35-v1/src/Makefile b/platforms/nuttx/nuttx-configs/esc35-v1/src/Makefile
deleted file mode 100644
index f29cfe594a..0000000000
--- a/platforms/nuttx/nuttx-configs/esc35-v1/src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS += -I$(TOPDIR)/sched
-
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/esc35-v1/src/empty.c b/platforms/nuttx/nuttx-configs/esc35-v1/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/esc35-v1/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/mindpx-v2/nsh/Make.defs b/platforms/nuttx/nuttx-configs/mindpx-v2/nsh/Make.defs
deleted file mode 100644
index 1a2a186ab6..0000000000
--- a/platforms/nuttx/nuttx-configs/mindpx-v2/nsh/Make.defs
+++ /dev/null
@@ -1,165 +0,0 @@
-############################################################################
-# nuttx-configs/mindpx-v2/nsh/Make.defs
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
-
diff --git a/platforms/nuttx/nuttx-configs/mindpx-v2/src/Makefile b/platforms/nuttx/nuttx-configs/mindpx-v2/src/Makefile
deleted file mode 100644
index 2ef7eebd37..0000000000
--- a/platforms/nuttx/nuttx-configs/mindpx-v2/src/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-############################################################################
-# configs/px4fmu/src/Makefile
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS		+= -I$(TOPDIR)/sched
-
-ASRCS		= 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-
-CSRCS		= empty.c
-COBJS		= $(CSRCS:.c=$(OBJEXT))
-
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
-
diff --git a/platforms/nuttx/nuttx-configs/mindpx-v2/src/empty.c b/platforms/nuttx/nuttx-configs/mindpx-v2/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/mindpx-v2/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/nxphlite-v3/nsh/Make.defs b/platforms/nuttx/nuttx-configs/nxphlite-v3/nsh/Make.defs
deleted file mode 100644
index ae15994757..0000000000
--- a/platforms/nuttx/nuttx-configs/nxphlite-v3/nsh/Make.defs
+++ /dev/null
@@ -1,163 +0,0 @@
-############################################################################
-# nuttx-configs/nxphlite-v3/nsh/Make.defs
-#
-#   Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 =-Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
diff --git a/platforms/nuttx/nuttx-configs/nxphlite-v3/src/Makefile b/platforms/nuttx/nuttx-configs/nxphlite-v3/src/Makefile
deleted file mode 100644
index 05b25a2694..0000000000
--- a/platforms/nuttx/nuttx-configs/nxphlite-v3/src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS		+= -I$(TOPDIR)/sched
-
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-
-CSRCS		= empty.c
-COBJS		= $(CSRCS:.c=$(OBJEXT))
-
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-	CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-		   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/nxphlite-v3/src/empty.c b/platforms/nuttx/nuttx-configs/nxphlite-v3/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/nxphlite-v3/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/nsh/Make.defs
deleted file mode 100644
index 7000d1a1ba..0000000000
--- a/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/nsh/Make.defs
+++ /dev/null
@@ -1,161 +0,0 @@
-############################################################################
-# configs/same70-xplained/nsh/Make.defs
-#
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-# enable precise stack overflow tracking
-INSTRUMENTATIONDEFINES   = -finstrument-functions \
-                           -ffixed-r10
-endif
-
-ifeq ($(CONFIG_ARMV7M_DTCM),y)
-  LDSCRIPT = flash-dtcm.ld
-else
-  LDSCRIPT = ld.script
-endif
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
-  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  # Linux/Cygwin-native toolchain
-  MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-endif
-
-CC = $(CROSSDEV)gcc
-CXX = $(CROSSDEV)g++
-CPP = $(CROSSDEV)gcc -E
-LD = $(CROSSDEV)ld
-AR = $(CROSSDEV)ar rcs
-NM = $(CROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
-ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-ARCHOPTIMIZATION = $(MAXOPTIMIZATION) \
-    -fno-strict-aliasing \
-    -fno-strength-reduce \
-    -fomit-frame-pointer \
-    -funsafe-math-optimizations \
-    -fno-builtin-printf \
-    -ffunction-sections \
-    -fdata-sections
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION += -g
-endif
-
-ifneq ($(CONFIG_DEBUG_NOOPT),y)
-  ARCHOPTIMIZATION += $(MAXOPTIMIZATION)
-endif
-
-ARCHCFLAGS = -fno-builtin
-ARCHCFLAGS += -std=gnu99
-
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -fno-strict-aliasing
-ARCHWARNINGS += -Wno-sign-compare \
-    -Wextra \
-    -Wdouble-promotion \
-    -Wshadow \
-    -Wfloat-equal \
-    -Wframe-larger-than=1024 \
-    -Wpointer-arith \
-    -Wlogical-op \
-    -Wmissing-declarations \
-    -Wpacked \
-    -Wno-unused-parameter
-#   -Wcast-qual  - generates spurious noreturn attribute warnings, try again later
-#   -Wconversion - would be nice, but too many "risky-but-safe" conversions in the code
-#   -Wcast-align - would help catch bad casts in some cases, but generates too many false positives
-ARCHCWARNINGS = $(ARCHWARNINGS) \
-    -Wbad-function-cast \
-    -Wstrict-prototypes \
-    -Wold-style-declaration \
-    -Wmissing-parameter-type \
-    -Wmissing-prototypes \
-    -Wnested-externs
-ARCHWARNINGSXX = -Wall -Wshadow -Wundef
-ARCHWARNINGSXX += $(ARCHWARNINGS) \
-    -Wno-psabi
-ARCHDEFINES =
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS += --warn-common \
-    --gc-sections
-
-CFLAGS = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
-
-ASMEXT = .S
-OBJEXT = .o
-LIBEXT = .a
-EXEEXT =
-
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS += -g
-endif
-
-
-HOSTCC = gcc
-HOSTINCLUDES = -I.
-HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
-HOSTLDFLAGS =
diff --git a/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/src/empty.c b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/nsh/Make.defs
deleted file mode 100644
index 38a7e4dcd1..0000000000
--- a/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/nsh/Make.defs
+++ /dev/null
@@ -1,165 +0,0 @@
-############################################################################
-# nuttx-configs/px4stm32f4discovery/nsh/Make.defs
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
-
diff --git a/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/Makefile b/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/Makefile
deleted file mode 100644
index 94393d43c5..0000000000
--- a/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS		+= -I$(TOPDIR)/sched
-
-ASRCS		= 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-
-CSRCS		= empty.c
-COBJS		= $(CSRCS:.c=$(OBJEXT))
-
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
-
diff --git a/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/empty.c b/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/Make.defs
deleted file mode 100644
index ca4ce603b2..0000000000
--- a/platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/Make.defs
+++ /dev/null
@@ -1,157 +0,0 @@
-############################################################################
-# nuttx-configs/px4cannode-v1/nsh/Make.defs
-#
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m3 \
-			   -mthumb \
-			   -march=armv7-m
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
diff --git a/platforms/nuttx/nuttx-configs/px4cannode-v1/src/Makefile b/platforms/nuttx/nuttx-configs/px4cannode-v1/src/Makefile
deleted file mode 100644
index f29cfe594a..0000000000
--- a/platforms/nuttx/nuttx-configs/px4cannode-v1/src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS += -I$(TOPDIR)/sched
-
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/px4cannode-v1/src/empty.c b/platforms/nuttx/nuttx-configs/px4cannode-v1/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/px4cannode-v1/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/px4esc-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4esc-v1/nsh/Make.defs
deleted file mode 100644
index 431b33be39..0000000000
--- a/platforms/nuttx/nuttx-configs/px4esc-v1/nsh/Make.defs
+++ /dev/null
@@ -1,159 +0,0 @@
-############################################################################
-# nuttx-configs/px4esc-v1/nsh/Make.defs
-#
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
diff --git a/platforms/nuttx/nuttx-configs/px4esc-v1/src/Makefile b/platforms/nuttx/nuttx-configs/px4esc-v1/src/Makefile
deleted file mode 100644
index f29cfe594a..0000000000
--- a/platforms/nuttx/nuttx-configs/px4esc-v1/src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS += -I$(TOPDIR)/sched
-
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/px4esc-v1/src/empty.c b/platforms/nuttx/nuttx-configs/px4esc-v1/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/px4esc-v1/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/px4flow-v2/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4flow-v2/nsh/Make.defs
deleted file mode 100644
index cc632bebf5..0000000000
--- a/platforms/nuttx/nuttx-configs/px4flow-v2/nsh/Make.defs
+++ /dev/null
@@ -1,159 +0,0 @@
-############################################################################
-# nuttx-configs/px4flow-v2/nsh/Make.defs
-#
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
diff --git a/platforms/nuttx/nuttx-configs/px4flow-v2/src/Makefile b/platforms/nuttx/nuttx-configs/px4flow-v2/src/Makefile
deleted file mode 100644
index f29cfe594a..0000000000
--- a/platforms/nuttx/nuttx-configs/px4flow-v2/src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS += -I$(TOPDIR)/sched
-
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/px4flow-v2/src/empty.c b/platforms/nuttx/nuttx-configs/px4flow-v2/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/px4flow-v2/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v2/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4fmu-v2/nsh/Make.defs
deleted file mode 100644
index 41194f00e9..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v2/nsh/Make.defs
+++ /dev/null
@@ -1,164 +0,0 @@
-############################################################################
-# nuttx-configs/px4fmu-v2/nsh/Make.defs
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v2/src/Makefile b/platforms/nuttx/nuttx-configs/px4fmu-v2/src/Makefile
deleted file mode 100644
index f29cfe594a..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v2/src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS += -I$(TOPDIR)/sched
-
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v2/src/empty.c b/platforms/nuttx/nuttx-configs/px4fmu-v2/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v2/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v4/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4fmu-v4/nsh/Make.defs
deleted file mode 100644
index 583216ce9c..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v4/nsh/Make.defs
+++ /dev/null
@@ -1,165 +0,0 @@
-############################################################################
-# configs/px4fmu-v4/nsh/Make.defs
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
-
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v4/src/Makefile b/platforms/nuttx/nuttx-configs/px4fmu-v4/src/Makefile
deleted file mode 100644
index da420078cf..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v4/src/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-############################################################################
-# configs/px4fmu/src/Makefile
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS		+= -I$(TOPDIR)/sched
-
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-
-CSRCS		= empty.c
-COBJS		= $(CSRCS:.c=$(OBJEXT))
-
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-					   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-					   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
-
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v4/src/empty.c b/platforms/nuttx/nuttx-configs/px4fmu-v4/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v4/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v4pro/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4fmu-v4pro/nsh/Make.defs
deleted file mode 100644
index bb3ed386e6..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v4pro/nsh/Make.defs
+++ /dev/null
@@ -1,164 +0,0 @@
-############################################################################
-# configs/px4fmu-v4pro/nsh/Make.defs
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/Makefile b/platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/Makefile
deleted file mode 100644
index bf9088501f..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-############################################################################
-# configs/px4fmu-v4pro/src/Makefile
-#
-#   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
-#   Authors: Gregory Nutt <gnutt@nuttx.org>
-#            David Sidrane <david_s5@nscdg.com>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS += -I$(TOPDIR)/sched
-
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/empty.c b/platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/Make.defs
deleted file mode 100644
index 685f8fffc0..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/Make.defs
+++ /dev/null
@@ -1,166 +0,0 @@
-############################################################################
-# configs/px4fmu-v5/nsh/Make.defs
-#
-#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
-#   Authors: Gregory Nutt <gnutt@nuttx.org>
-#            David Sidrane <david_s5@nscdg.com>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC = $(CROSSDEV)gcc
-CXX = $(CROSSDEV)g++
-CPP = $(CROSSDEV)gcc -E
-LD = $(CROSSDEV)ld
-AR = $(ARCROSSDEV)ar rcs
-NM = $(ARCROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
-  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION += -g
-endif
-
-ifneq ($(CONFIG_DEBUG_NOOPT),y)
-  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
-endif
-
-ARCHCFLAGS		= --std=gnu99
-ARCHCXXFLAGS	= -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS	= $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS	= $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX	= $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES =
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS 		= $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS 	= $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS 	= $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES)  $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS 	= $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS 		= $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
-
-ASMEXT = .S
-OBJEXT = .o
-LIBEXT = .a
-EXEEXT =
-
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS += -g
-endif
-
-
-HOSTCC = gcc
-HOSTINCLUDES = -I.
-HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
-HOSTLDFLAGS =
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v5/src/Makefile b/platforms/nuttx/nuttx-configs/px4fmu-v5/src/Makefile
deleted file mode 100644
index f29cfe594a..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v5/src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS += -I$(TOPDIR)/sched
-
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v5/src/empty.c b/platforms/nuttx/nuttx-configs/px4fmu-v5/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/px4fmu-v5/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/px4io-v2/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4io-v2/nsh/Make.defs
deleted file mode 100644
index 8942a168dc..0000000000
--- a/platforms/nuttx/nuttx-configs/px4io-v2/nsh/Make.defs
+++ /dev/null
@@ -1,158 +0,0 @@
-############################################################################
-# nuttx-configs/px4io-v2/nsh/Make.defs
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m3 \
-			   -mthumb \
-			   -march=armv7-m
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
-
diff --git a/platforms/nuttx/nuttx-configs/px4io-v2/src/Makefile b/platforms/nuttx/nuttx-configs/px4io-v2/src/Makefile
deleted file mode 100644
index 03da7142d1..0000000000
--- a/platforms/nuttx/nuttx-configs/px4io-v2/src/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS		+= -I$(TOPDIR)/sched
-
-ASRCS		= 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-
-CSRCS		= empty.c
-
-COBJS		= $(CSRCS:.c=$(OBJEXT))
-
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/px4io-v2/src/empty.c b/platforms/nuttx/nuttx-configs/px4io-v2/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/px4io-v2/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/nsh/Make.defs
deleted file mode 100644
index 6a56d25453..0000000000
--- a/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/nsh/Make.defs
+++ /dev/null
@@ -1,166 +0,0 @@
-############################################################################
-# nuttx-configs/px4nucleoF767ZI-v1/nsh/Make.defs
-#
-#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
-#   Authors: Gregory Nutt <gnutt@nuttx.org>
-#            David Sidrane <david_s5@nscdg.com>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC = $(CROSSDEV)gcc
-CXX = $(CROSSDEV)g++
-CPP = $(CROSSDEV)gcc -E
-LD = $(CROSSDEV)ld
-AR = $(ARCROSSDEV)ar rcs
-NM = $(ARCROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
-  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION += -g
-endif
-
-ifneq ($(CONFIG_DEBUG_NOOPT),y)
-  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
-endif
-
-ARCHCFLAGS		= --std=gnu99
-ARCHCXXFLAGS	= -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS	= $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS	= $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX	= $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES =
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS 		= $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS 	= $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS 	= $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES)  $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS 	= $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS 		= $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
-
-ASMEXT = .S
-OBJEXT = .o
-LIBEXT = .a
-EXEEXT =
-
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS += -g
-endif
-
-
-HOSTCC = gcc
-HOSTINCLUDES = -I.
-HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
-HOSTLDFLAGS =
diff --git a/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/Makefile b/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/Makefile
deleted file mode 100644
index f29cfe594a..0000000000
--- a/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS += -I$(TOPDIR)/sched
-
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/empty.c b/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/s2740vc-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/s2740vc-v1/nsh/Make.defs
deleted file mode 100644
index 80d0a0b7d8..0000000000
--- a/platforms/nuttx/nuttx-configs/s2740vc-v1/nsh/Make.defs
+++ /dev/null
@@ -1,159 +0,0 @@
-############################################################################
-# configs/s2740vc-v1/nsh/Make.defs
-#
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS = -mcpu=cortex-m4 \
-    -mthumb \
-    -march=armv7e-m \
-    -mfpu=fpv4-sp-d16 \
-    -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
diff --git a/platforms/nuttx/nuttx-configs/s2740vc-v1/src/Makefile b/platforms/nuttx/nuttx-configs/s2740vc-v1/src/Makefile
deleted file mode 100644
index f29cfe594a..0000000000
--- a/platforms/nuttx/nuttx-configs/s2740vc-v1/src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS += -I$(TOPDIR)/sched
-
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/s2740vc-v1/src/empty.c b/platforms/nuttx/nuttx-configs/s2740vc-v1/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/s2740vc-v1/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/tap-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/tap-v1/nsh/Make.defs
deleted file mode 100644
index 35f4bb1ace..0000000000
--- a/platforms/nuttx/nuttx-configs/tap-v1/nsh/Make.defs
+++ /dev/null
@@ -1,165 +0,0 @@
-############################################################################
-# configs/tap-v1/nsh/Make.defs
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
-			   -mthumb \
-			   -march=armv7e-m \
-			   -mfpu=fpv4-sp-d16 \
-			   -mfloat-abi=hard
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Pull in *just* libm from the toolchain ... this is grody
-
-LIBM			 = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
-EXTRA_LIBS		+= $(LIBM)
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
-
diff --git a/platforms/nuttx/nuttx-configs/tap-v1/src/Makefile b/platforms/nuttx/nuttx-configs/tap-v1/src/Makefile
deleted file mode 100644
index c59066b029..0000000000
--- a/platforms/nuttx/nuttx-configs/tap-v1/src/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-############################################################################
-# configs/tap-v1/src/Makefile
-#
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS		+= -I$(TOPDIR)/sched
-
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-
-CSRCS		= empty.c
-COBJS		= $(CSRCS:.c=$(OBJEXT))
-
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-             -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-             -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
-
diff --git a/platforms/nuttx/nuttx-configs/tap-v1/src/empty.c b/platforms/nuttx/nuttx-configs/tap-v1/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/tap-v1/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
diff --git a/platforms/nuttx/nuttx-configs/zubaxgnss-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/zubaxgnss-v1/nsh/Make.defs
deleted file mode 100644
index c26ccc72a4..0000000000
--- a/platforms/nuttx/nuttx-configs/zubaxgnss-v1/nsh/Make.defs
+++ /dev/null
@@ -1,157 +0,0 @@
-############################################################################
-# nuttx-configs/zubaxgnss-v1/nsh/Make.defs
-#
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include $(TOPDIR)/PX4_Warnings.mk
-include $(TOPDIR)/PX4_Config.mk
-
-#
-# We only support building with the ARM bare-metal toolchain from
-# https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
-#
-CONFIG_ARMV7M_TOOLCHAIN	:= GNU_EABI${HOST_OS_FIRST_LETTER}
-
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-CC			 = $(CROSSDEV)gcc
-CXX			 = $(CROSSDEV)g++
-CPP			 = $(CROSSDEV)gcc -E
-LD			 = $(CROSSDEV)ld
-AR			 = $(CROSSDEV)ar rcs
-NM			 = $(CROSSDEV)nm
-OBJCOPY			 = $(CROSSDEV)objcopy
-OBJDUMP			 = $(CROSSDEV)objdump
-
-MAXOPTIMIZATION		 = -Os
-ARCHCPUFLAGS		 = -mcpu=cortex-m3 \
-			   -mthumb \
-			   -march=armv7-m
-
-# Enable precise stack overflow tracking
-
-ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
-INSTRUMENTATIONDEFINES	 = -finstrument-functions -ffixed-r10
-endif
-
-# Use our linker script
-
-LDSCRIPT		 = ld.script
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-  MKDEP			 = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		 = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  ifeq ($(PX4_WINTOOL),y)
-    # Windows-native toolchains (MSYS)
-    DIRLINK		 = $(TOPDIR)/tools/copydir.sh
-    DIRUNLINK		 = $(TOPDIR)/tools/unlink.sh
-    MKDEP		 = $(TOPDIR)/tools/mknulldeps.sh
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  else
-    # Linux/Cygwin-native toolchain
-    MKDEP		 = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-    ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
-    ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-    ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-  endif
-endif
-
-# Tool versions
-
-ARCHCCVERSION		 = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		 = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-# Optimization flags
-
-ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-			   -fno-strict-aliasing \
-			   -fno-strength-reduce \
-			   -fomit-frame-pointer \
-			   -funsafe-math-optimizations \
-			   -fno-builtin-printf \
-			   -ffunction-sections \
-			   -fdata-sections
-
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-ARCHOPTIMIZATION	+= -g
-endif
-
-ARCHCFLAGS		 = -std=gnu99
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
-ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
-ARCHDEFINES		 =
-ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
-
-# This seems to be the only way to add linker flags
-
-EXTRA_LIBS		+= --warn-common \
-			   --gc-sections
-
-CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
-CPICFLAGS		 = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		 = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		 = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		 = $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1		 = -r -d -warn-common
-NXFLATLDFLAGS2		 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
-LDNXFLATFLAGS		 = -e main -s 2048
-
-OBJEXT			 = .o
-LIBEXT			 = .a
-EXEEXT			 =
-
-# Produce partially-linked $1 from files in $2
-
-define PRELINK
-	@echo "PRELINK: $1"
-	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-endef
-
-HOSTCC			 = gcc
-HOSTINCLUDES		 = -I.
-HOSTCFLAGS		 = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		 =
diff --git a/platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/Makefile b/platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/Makefile
deleted file mode 100644
index f29cfe594a..0000000000
--- a/platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS += -I$(TOPDIR)/sched
-
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-
-CSRCS = empty.c
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	$(Q) touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep
diff --git a/platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/empty.c b/platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/empty.c
deleted file mode 100644
index 5de10699fb..0000000000
--- a/platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/empty.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There are no source files here, but libboard.a can't be empty, so
- * we have this empty source file to keep it company.
- */
-- 
GitLab