mk: use new bootloader location

This commit is contained in:
Andrew Tridgell 2018-02-10 15:02:21 +11:00
parent 2cbf04a3d0
commit e574250071
2 changed files with 8 additions and 6 deletions

View File

@ -0,0 +1,2 @@
bootloaders for PX4 build are now in Tools/bootloaders/

View File

@ -123,7 +123,7 @@ px4-v4: $(BUILDROOT)/make.flags CHECK_MODULES $(MAVLINK_HEADERS) $(UAVCAN_HEADER
$(v) arm-none-eabi-size $(PX4_ROOT)/Build/px4fmu-v4_APM.build/firmware.elf
$(v) cp $(PX4_ROOT)/Images/px4fmu-v4_APM.px4 $(SKETCH)-v4.px4
$(v) mkdir -p $(MK_DIR)/PX4/ROMFS/bootloader/
$(v) cp $(SKETCHBOOK)/mk/PX4/bootloader/px4fmuv4_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin
$(v) cp $(SKETCHBOOK)/Tools/bootloaders/px4fmuv4_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin
$(v) $(SKETCHBOOK)/Tools/scripts/add_git_hashes.py $(HASHADDER_FLAGS) "$(SKETCH)-v4.px4" "$(SKETCH)-v4.px4"
$(v) echo "PX4 $(SKETCH) Firmware is in $(SKETCH)-v4.px4"
@ -136,7 +136,7 @@ px4-v4pro: $(BUILDROOT)/make.flags CHECK_MODULES $(MAVLINK_HEADERS) $(UAVCAN_HEA
$(v) cp $(PX4_ROOT)/Images/px4fmu-v4pro_APM.px4 $(SKETCH)-v4pro.px4
$(v) $(SKETCHBOOK)/Tools/scripts/add_git_hashes.py $(HASHADDER_FLAGS) "$(SKETCH)-v4pro.px4" "$(SKETCH)-v4pro.px4"
$(v) echo "PX4 $(SKETCH) Firmware is in $(SKETCH)-v4pro.px4"
# force the 3 build types to not run in parallel. We got bad binaries with incorrect parameter handling
# when these were allowed to happen in parallel
px4:
@ -181,7 +181,7 @@ px4-v4-upload: px4-v4
px4-v4pro-upload: px4-v4pro
$(RULEHDR)
$(v) $(PX4_MAKE) px4fmu-v4pro_APM upload
px4-upload: px4-v1-upload
px4-archives-clean:
@ -194,7 +194,7 @@ px4-io-v1: $(PX4_ROOT)/Archives/px4io-v1.export
$(v) mkdir -p $(MK_DIR)/PX4/ROMFS/px4io/
$(v) cp px4io-v1.bin $(MK_DIR)/PX4/ROMFS/px4io/px4io.bin
$(v) mkdir -p $(MK_DIR)/PX4/ROMFS/bootloader/
$(v) cp $(SKETCHBOOK)/mk/PX4/bootloader/px4fmu_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin
$(v) cp $(SKETCHBOOK)/Tools/bootloaders/px4fmu_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin
$(v) echo "PX4IOv1 Firmware is in px4io-v1.bin"
@ -205,7 +205,7 @@ px4-io-v2: $(PX4_ROOT)/Archives/px4io-v2.export
$(v) mkdir -p $(MK_DIR)/PX4/ROMFS/px4io/
$(v) cp px4io-v2.bin $(MK_DIR)/PX4/ROMFS/px4io/px4io.bin
$(v) mkdir -p $(MK_DIR)/PX4/ROMFS/bootloader/
$(v) cp $(SKETCHBOOK)/mk/PX4/bootloader/px4fmuv2_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin
$(v) cp $(SKETCHBOOK)/Tools/bootloaders/px4fmuv2_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin
$(v) echo "PX4IOv2 Firmware is in px4io-v2.bin"
px4-io: px4-io-v1 px4-io-v2
@ -241,7 +241,7 @@ $(PX4_ROOT)/Archives/px4fmu-v4.export:
$(PX4_ROOT)/Archives/px4fmu-v4pro.export:
$(v) $(PX4_MAKE_ARCHIVES) BOARDS="px4fmu-v4pro"
$(PX4_ROOT)/Archives/px4io-v1.export:
$(v) $(PX4_MAKE_ARCHIVES) BOARDS="px4io-v1"