diff options
| author | David Sidrane <david_s5@nscdg.com> | 2015-04-20 14:59:41 -1000 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-04-22 02:30:14 -1000 |
| commit | df88a792c6e86b1ae76d6b855b10d5bdadcea3e5 (patch) | |
| tree | 08e6ff0c786c9918b3fdb1f526073e6a73f654b3 | |
| parent | da192bd74ca474bbc12340dc669dbbf2173aa36e (diff) | |
| download | px4-firmware-df88a792c6e86b1ae76d6b855b10d5bdadcea3e5.tar.gz px4-firmware-df88a792c6e86b1ae76d6b855b10d5bdadcea3e5.tar.bz2 px4-firmware-df88a792c6e86b1ae76d6b855b10d5bdadcea3e5.zip | |
WS Fixes
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | makefiles/config_px4cannode-v1_bootloader.mk | 3 | ||||
| -rw-r--r-- | makefiles/config_px4cannode-v1_default.mk | 2 | ||||
| -rw-r--r-- | makefiles/firmware.mk | 2 | ||||
| -rw-r--r-- | makefiles/nuttx.mk | 14 |
5 files changed, 12 insertions, 13 deletions
@@ -129,7 +129,7 @@ $(STAGED_FIRMWARES): $(IMAGE_DIR)%.px4: $(BUILD_DIR)%.build/firmware.px4 # .PHONY: $(FIRMWARES) $(BUILD_DIR)%.build/firmware.px4: config = $(patsubst $(BUILD_DIR)%.build/firmware.px4,%,$@) -$(BUILD_DIR)%.build/firmware.px4: NUTTX_CONFIG = $(if $(findstring bootloader,$@),bootloader,nsh) +$(BUILD_DIR)%.build/firmware.px4: NUTTX_CONFIG = $(if $(findstring bootloader,$@),bootloader,nsh) $(BUILD_DIR)%.build/firmware.px4: work_dir = $(BUILD_DIR)$(config).build/ $(FIRMWARES): $(BUILD_DIR)%.build/firmware.px4: generateuorbtopicheaders checksubmodules @$(ECHO) %%%% @@ -168,7 +168,7 @@ $(foreach config,$(FMU_CONFIGS),$(eval $(call FMU_DEP,$(config)))) # downloads of the prebuilt archives as well... # NUTTX_BOOTLOADER_ARCHIVES = $(foreach board,$(BOARDS_WITH_BOOTLOADERS),$(ARCHIVE_DIR)$(board).bootloader.export) -NUTTX_ARCHIVES = $(NUTTX_BOOTLOADER_ARCHIVES) $(foreach board,$(BOARDS),$(ARCHIVE_DIR)$(board).nsh.export) +NUTTX_ARCHIVES = $(NUTTX_BOOTLOADER_ARCHIVES) $(foreach board,$(BOARDS),$(ARCHIVE_DIR)$(board).nsh.export) .PHONY: archives archives: checksubmodules nuttxpatches $(NUTTX_ARCHIVES) diff --git a/makefiles/config_px4cannode-v1_bootloader.mk b/makefiles/config_px4cannode-v1_bootloader.mk index 389f2d0c1..3654274b0 100644 --- a/makefiles/config_px4cannode-v1_bootloader.mk +++ b/makefiles/config_px4cannode-v1_bootloader.mk @@ -7,8 +7,7 @@ # MODULES += drivers/boards/px4cannode-v1/bootloader -SRC_SEARCH = can src common uavcan +SRC_SEARCH = can src common uavcan INCLUDE_DIRS += $(addprefix $(PX4_MODULE_SRC)$(MODULES)/,$(SRC_SEARCH)) - diff --git a/makefiles/config_px4cannode-v1_default.mk b/makefiles/config_px4cannode-v1_default.mk index de3902877..6979c1619 100644 --- a/makefiles/config_px4cannode-v1_default.mk +++ b/makefiles/config_px4cannode-v1_default.mk @@ -57,5 +57,5 @@ define _B endef BUILTIN_COMMANDS := \ - $(call _B, null, , 60, null_main) + $(call _B, null, , 60, null_main) diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index edd22797c..195885143 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -145,7 +145,7 @@ endif export CONFIG include $(CONFIG_FILE) $(info % CONFIG = $(CONFIG)) -$(info % NUTTX Config = $(NUTTX_CONFIG)) +$(info % NUTTX_CONFIG = $(NUTTX_CONFIG)) # # Sanity-check the BOARD variable and then get the board config. diff --git a/makefiles/nuttx.mk b/makefiles/nuttx.mk index 879656230..f57921422 100644 --- a/makefiles/nuttx.mk +++ b/makefiles/nuttx.mk @@ -70,7 +70,7 @@ GLOBAL_DEPS += $(NUTTX_CONFIG_HEADER) ifeq ($(NUTTX_CONFIG),bootloader) LDSCRIPT += $(NUTTX_EXPORT_DIR)build/bootloaderld.script else -LDSCRIPT += $(NUTTX_EXPORT_DIR)build/$(BOOTLOADER)ld.script +LDSCRIPT += $(NUTTX_EXPORT_DIR)build/ld.script endif # @@ -81,14 +81,14 @@ INCLUDE_DIRS += $(NUTTX_EXPORT_DIR)include \ $(NUTTX_EXPORT_DIR)arch/chip \ $(NUTTX_EXPORT_DIR)arch/common \ $(NUTTX_EXPORT_DIR)arch/armv7-m - + LIB_DIRS += $(NUTTX_EXPORT_DIR)libs -LIBS += -lapps -lnuttx -START_OBJ += $(NUTTX_STARTUP) -NUTTX_LIBS = $(NUTTX_EXPORT_DIR)libs/libapps.a \ - $(NUTTX_EXPORT_DIR)libs/libnuttx.a +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) |