diff options
| author | Chris Lee <clee@mg8.org> | 2022-12-19 12:30:12 -0700 |
|---|---|---|
| committer | KevinOConnor <kevin@koconnor.net> | 2022-12-19 15:42:53 -0500 |
| commit | aac613bf44ca1feb4334ab35378b48711baccb60 (patch) | |
| tree | 899dc2ec85b6a209a3a950bf1983987ae8a60e8a /src/rp2040 | |
| parent | f078a279059670e692ea676237b152b4d42518e4 (diff) | |
| download | kutter-aac613bf44ca1feb4334ab35378b48711baccb60.tar.gz kutter-aac613bf44ca1feb4334ab35378b48711baccb60.tar.xz kutter-aac613bf44ca1feb4334ab35378b48711baccb60.zip | |
scripts: support CanBoot on RP2040 in flash_usb.py
Signed-off-by: Chris Lee <clee@mg8.org>
Diffstat (limited to 'src/rp2040')
| -rw-r--r-- | src/rp2040/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rp2040/Makefile b/src/rp2040/Makefile index 32d731f2..71ed90a0 100644 --- a/src/rp2040/Makefile +++ b/src/rp2040/Makefile @@ -45,7 +45,7 @@ $(OUT)klipper.uf2: $(OUT)klipper.elf $(OUT)lib/rp2040/elf2uf2/elf2uf2 @echo " Creating uf2 file $@" $(Q)$(OUT)lib/rp2040/elf2uf2/elf2uf2 $< $@ -target-$(CONFIG_RP2040_HAVE_STAGE2) += $(OUT)klipper.uf2 +rptarget-$(CONFIG_RP2040_HAVE_STAGE2) := $(OUT)klipper.uf2 rplink-$(CONFIG_RP2040_HAVE_STAGE2) := $(OUT)src/rp2040/rp2040_link.ld stage2-$(CONFIG_RP2040_HAVE_STAGE2) := $(OUT)stage2.o @@ -54,10 +54,11 @@ $(OUT)klipper.bin: $(OUT)klipper.elf @echo " Creating bin file $@" $(Q)$(OBJCOPY) -O binary $< $@ -target-$(CONFIG_RP2040_HAVE_BOOTLOADER) += $(OUT)klipper.bin +rptarget-$(CONFIG_RP2040_HAVE_BOOTLOADER) := $(OUT)klipper.bin rplink-$(CONFIG_RP2040_HAVE_BOOTLOADER) := $(OUT)src/generic/armcm_link.ld # Set klipper.elf linker rules +target-y += $(rptarget-y) CFLAGS_klipper.elf += --specs=nano.specs --specs=nosys.specs -T $(rplink-y) OBJS_klipper.elf += $(stage2-y) $(OUT)klipper.elf: $(stage2-y) $(rplink-y) @@ -67,6 +68,6 @@ lib/rp2040_flash/rp2040_flash: @echo " Building rp2040_flash" $(Q)make -C lib/rp2040_flash rp2040_flash -flash: $(OUT)klipper.uf2 lib/rp2040_flash/rp2040_flash +flash: $(rptarget-y) lib/rp2040_flash/rp2040_flash @echo " Flashing $< to $(FLASH_DEVICE)" - $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" $(if $(NOSUDO),--no-sudo) $(OUT)klipper.uf2 + $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" $(if $(NOSUDO),--no-sudo) $(rptarget-y) |