From c6b89a901b0ceb948551b873ed18efa73427d9c2 Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Mon, 20 Apr 2015 12:17:30 -1000
Subject: Wip build integration

---
 makefiles/firmware.mk |  2 +-
 makefiles/nuttx.mk    | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'makefiles')

diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk
index b0ca58c8f..edd22797c 100644
--- a/makefiles/firmware.mk
+++ b/makefiles/firmware.mk
@@ -145,6 +145,7 @@ endif
 export CONFIG
 include $(CONFIG_FILE)
 $(info %  CONFIG              = $(CONFIG))
+$(info %  NUTTX Config        = $(NUTTX_CONFIG))
 
 #
 # Sanity-check the BOARD variable and then get the board config.
@@ -217,7 +218,6 @@ define MODULE_SEARCH
 	$(firstword $(abspath $(wildcard $(1)/module.mk)) \
 		$(abspath $(foreach search_dir,$(MODULE_SEARCH_DIRS),$(wildcard $(search_dir)/$(1)/module.mk))) \
 		MISSING_$1)
-		$(info MODULE_SEARCH_DIRS=$(MODULE_SEARCH_DIRS))
 endef
 
 # make a list of module makefiles and check that we found them all
diff --git a/makefiles/nuttx.mk b/makefiles/nuttx.mk
index 2b5449ea0..578438f22 100644
--- a/makefiles/nuttx.mk
+++ b/makefiles/nuttx.mk
@@ -34,22 +34,12 @@
 # building firmware.
 #
 
-#
-# Are we Building a bootloader
-#
-
-ifneq ($(BOOTLOADER),)
-BOOTLOADEREXT =.$(BOOTLOADER)
-NUTTX_STARTUP = $(NUTTX_EXPORT_DIR)startup/stm32_vectors.o
-endif
-
-
 #
 # Check that the NuttX archive for the selected board is available.
 #
-NUTTX_ARCHIVE		:= $(wildcard $(ARCHIVE_DIR)$(BOARD).export$(BOOTLOADEREXT))
+NUTTX_ARCHIVE		:= $(wildcard $(ARCHIVE_DIR)$(BOARD).$(NUTTX_CONFIG).export)
 ifeq ($(NUTTX_ARCHIVE),)
-$(error The NuttX export archive for $(BOARD) is missing from $(ARCHIVE_DIR) - try 'make archives' in $(PX4_BASE))
+$(error The NuttX export archive $(BOARD).$(CONFIG).export for $(BOARD) with configuration $(config) is missing from $(ARCHIVE_DIR) - try 'make archives' in $(PX4_BASE))
 endif
 
 #
@@ -62,6 +52,15 @@ NUTTX_CONFIG_HEADER	 = $(NUTTX_EXPORT_DIR)include/nuttx/config.h
 $(info %  NUTTX_EXPORT_DIR    = $(NUTTX_EXPORT_DIR))
 $(info %  NUTTX_CONFIG_HEADER = $(NUTTX_CONFIG_HEADER))
 
+#
+# Are there any start up files not in the nuttx lib
+#
+
+NUTTX_STARTUP := $(wildcard $(NUTTX_EXPORT_DIR)startup/*.o)
+
+
+$(info * NUTTX_STARTUP = $(NUTTX_STARTUP))
+
 
 GLOBAL_DEPS		+= $(NUTTX_CONFIG_HEADER)
 
-- 
cgit v1.2.3