diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-10-26 18:48:00 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-10-26 18:48:00 -0400 |
| commit | 1a69f38e6e2783f0c6e46f4fbc03aad92ddfebd4 (patch) | |
| tree | 8072f27dd06b4d48be32825e0eb7be70a015a754 /src | |
| parent | 538d6ac3a278ae7e3f7ff55ea67c17012d063733 (diff) | |
| download | kutter-1a69f38e6e2783f0c6e46f4fbc03aad92ddfebd4.tar.gz kutter-1a69f38e6e2783f0c6e46f4fbc03aad92ddfebd4.tar.xz kutter-1a69f38e6e2783f0c6e46f4fbc03aad92ddfebd4.zip | |
flash_usb: Pass -t $CONFIG_MCU to flash_usb on all targets
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/atsam/Makefile | 5 | ||||
| -rw-r--r-- | src/atsamd/Makefile | 2 | ||||
| -rw-r--r-- | src/lpc176x/Makefile | 2 | ||||
| -rw-r--r-- | src/stm32/Makefile | 6 |
4 files changed, 4 insertions, 11 deletions
diff --git a/src/atsam/Makefile b/src/atsam/Makefile index 35b62488..872fcdde 100644 --- a/src/atsam/Makefile +++ b/src/atsam/Makefile @@ -49,9 +49,6 @@ lib/bossac/bin/bossac: @echo " Building bossac" $(Q)make -C lib/bossac bin/bossac -FLASH_TYPE-$(CONFIG_MACH_SAM3X) := atsam3 -FLASH_TYPE-$(CONFIG_MACH_SAM4) := atsam4 - flash: $(OUT)klipper.bin lib/bossac/bin/bossac @echo " Flashing $< to $(FLASH_DEVICE)" - $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(FLASH_TYPE-y) -d "$(FLASH_DEVICE)" $(OUT)klipper.bin + $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" $(OUT)klipper.bin diff --git a/src/atsamd/Makefile b/src/atsamd/Makefile index 658c5ad6..2ff91df1 100644 --- a/src/atsamd/Makefile +++ b/src/atsamd/Makefile @@ -54,4 +54,4 @@ BOSSAC_OFFSET-$(CONFIG_MACH_SAMD51) := 0x4000 flash: $(OUT)klipper.bin lib/bossac/bin/bossac @echo " Flashing $< to $(FLASH_DEVICE)" - $(Q)$(PYTHON) ./scripts/flash_usb.py -t atsamd -d "$(FLASH_DEVICE)" -s "$(BOSSAC_OFFSET-y)" $(OUT)klipper.bin + $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" -s "$(BOSSAC_OFFSET-y)" $(OUT)klipper.bin diff --git a/src/lpc176x/Makefile b/src/lpc176x/Makefile index 275d3972..0935158a 100644 --- a/src/lpc176x/Makefile +++ b/src/lpc176x/Makefile @@ -32,4 +32,4 @@ $(OUT)klipper.bin: $(OUT)klipper.elf # Flash rules flash: $(OUT)klipper.bin @echo " Flashing $< to $(FLASH_DEVICE)" - $(Q)$(PYTHON) ./scripts/flash_usb.py -t lpc176x -d "$(FLASH_DEVICE)" $(if $(NOSUDO),--no-sudo) $(OUT)klipper.bin + $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" $(if $(NOSUDO),--no-sudo) $(OUT)klipper.bin diff --git a/src/stm32/Makefile b/src/stm32/Makefile index 5d5a8408..d05f6b24 100644 --- a/src/stm32/Makefile +++ b/src/stm32/Makefile @@ -49,13 +49,9 @@ $(OUT)klipper.bin: $(OUT)klipper.elf $(Q)$(OBJCOPY) -O binary $< $@ # Flash rules -FLASH_TYPE-$(CONFIG_MACH_STM32F0) := stm32f0 -FLASH_TYPE-$(CONFIG_MACH_STM32F1) := stm32f1 -FLASH_TYPE-$(CONFIG_MACH_STM32F4) := stm32f4 - flash: $(OUT)klipper.bin @echo " Flashing $< to $(FLASH_DEVICE)" - $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(FLASH_TYPE-y) -d "$(FLASH_DEVICE)" -s "$(CONFIG_FLASH_START)" $(if $(NOSUDO),--no-sudo) $(OUT)klipper.bin + $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" -s "$(CONFIG_FLASH_START)" $(if $(NOSUDO),--no-sudo) $(OUT)klipper.bin serialflash: $(OUT)klipper.bin @echo " Flashing $< to $(FLASH_DEVICE) via stm32flash" |