diff options
| author | David Sidrane <david_s5@nscdg.com> | 2015-04-17 15:52:09 -1000 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-04-22 02:30:13 -1000 |
| commit | d5cf0ec899ca2b47e6017a8d11c668cd1fd84cf7 (patch) | |
| tree | 77a19f6435ab69bd52fa854c5aab0e876e810bd9 /makefiles/nuttx.mk | |
| parent | 7e7877b372c3c35a8f6150379aad896e5cdba72e (diff) | |
| download | px4-firmware-d5cf0ec899ca2b47e6017a8d11c668cd1fd84cf7.tar.gz px4-firmware-d5cf0ec899ca2b47e6017a8d11c668cd1fd84cf7.tar.bz2 px4-firmware-d5cf0ec899ca2b47e6017a8d11c668cd1fd84cf7.zip | |
Moved Nuttx Based uavcan bootloader ito PX4 tree
Diffstat (limited to 'makefiles/nuttx.mk')
| -rw-r--r-- | makefiles/nuttx.mk | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/makefiles/nuttx.mk b/makefiles/nuttx.mk index bf0744140..2b5449ea0 100644 --- a/makefiles/nuttx.mk +++ b/makefiles/nuttx.mk @@ -35,9 +35,19 @@ # # +# 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) +NUTTX_ARCHIVE := $(wildcard $(ARCHIVE_DIR)$(BOARD).export$(BOOTLOADEREXT)) ifeq ($(NUTTX_ARCHIVE),) $(error The NuttX export archive for $(BOARD) is missing from $(ARCHIVE_DIR) - try 'make archives' in $(PX4_BASE)) endif @@ -58,7 +68,7 @@ GLOBAL_DEPS += $(NUTTX_CONFIG_HEADER) # # Use the linker script from the NuttX export # -LDSCRIPT += $(NUTTX_EXPORT_DIR)build/ld.script +LDSCRIPT += $(NUTTX_EXPORT_DIR)build/$(BOOTLOADER)ld.script # # Add directories from the NuttX export to the relevant search paths @@ -66,13 +76,16 @@ LDSCRIPT += $(NUTTX_EXPORT_DIR)build/ld.script INCLUDE_DIRS += $(NUTTX_EXPORT_DIR)include \ $(NUTTX_EXPORT_DIR)include/cxx \ $(NUTTX_EXPORT_DIR)arch/chip \ - $(NUTTX_EXPORT_DIR)arch/common - + $(NUTTX_EXPORT_DIR)arch/common \ + $(NUTTX_EXPORT_DIR)arch/armv7-m + LIB_DIRS += $(NUTTX_EXPORT_DIR)libs -LIBS += -lapps -lnuttx +LIBS += -lapps -lnuttx +START_OBJ += $(NUTTX_STARTUP) NUTTX_LIBS = $(NUTTX_EXPORT_DIR)libs/libapps.a \ $(NUTTX_EXPORT_DIR)libs/libnuttx.a -LINK_DEPS += $(NUTTX_LIBS) + +LINK_DEPS += $(NUTTX_LIBS) $(NUTTX_CONFIG_HEADER): $(NUTTX_ARCHIVE) @$(ECHO) %% Unpacking $(NUTTX_ARCHIVE) |