diff options
| author | David Sidrane <david_s5@nscdg.com> | 2015-04-20 14:47:50 -1000 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-04-22 02:30:13 -1000 |
| commit | da192bd74ca474bbc12340dc669dbbf2173aa36e (patch) | |
| tree | 6c5ffa64d8d753c65b604d0035b9f89a9d526397 | |
| parent | 786fb30c0113ed3af5a7986c56454690c5838f35 (diff) | |
| download | px4-firmware-da192bd74ca474bbc12340dc669dbbf2173aa36e.tar.gz px4-firmware-da192bd74ca474bbc12340dc669dbbf2173aa36e.tar.bz2 px4-firmware-da192bd74ca474bbc12340dc669dbbf2173aa36e.zip | |
Builds in tree
| -rw-r--r-- | makefiles/nuttx.mk | 6 | ||||
| -rw-r--r-- | src/drivers/boards/px4cannode-v1/bootloader/src/boot.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/makefiles/nuttx.mk b/makefiles/nuttx.mk index 578438f22..879656230 100644 --- a/makefiles/nuttx.mk +++ b/makefiles/nuttx.mk @@ -59,7 +59,7 @@ $(info % NUTTX_CONFIG_HEADER = $(NUTTX_CONFIG_HEADER)) NUTTX_STARTUP := $(wildcard $(NUTTX_EXPORT_DIR)startup/*.o) -$(info * NUTTX_STARTUP = $(NUTTX_STARTUP)) +$(info % NUTTX_STARTUP = $(NUTTX_STARTUP)) GLOBAL_DEPS += $(NUTTX_CONFIG_HEADER) @@ -67,7 +67,11 @@ GLOBAL_DEPS += $(NUTTX_CONFIG_HEADER) # # Use the linker script from the NuttX export # +ifeq ($(NUTTX_CONFIG),bootloader) +LDSCRIPT += $(NUTTX_EXPORT_DIR)build/bootloaderld.script +else LDSCRIPT += $(NUTTX_EXPORT_DIR)build/$(BOOTLOADER)ld.script +endif # # Add directories from the NuttX export to the relevant search paths diff --git a/src/drivers/boards/px4cannode-v1/bootloader/src/boot.c b/src/drivers/boards/px4cannode-v1/bootloader/src/boot.c index efa8f83eb..6f1a07d13 100644 --- a/src/drivers/boards/px4cannode-v1/bootloader/src/boot.c +++ b/src/drivers/boards/px4cannode-v1/bootloader/src/boot.c @@ -116,7 +116,7 @@ uint8_t board_get_product_name(uint8_t * product_name) void board_get_hardware_version(uavcan_hardwareversion_t * hw_version) { uint32_t i; - volatile uint8_t *stm32f_uid = (volatile uint8_t *)STM32_UNIQUE_DEVICE_ID; + volatile uint8_t *stm32f_uid = (volatile uint8_t *)STM32_SYSMEM_UID; hw_version->major = 1u; hw_version->minor = 0u; |