Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flash_usb: Use "-s" option to specify flash offset on atsamd 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-10-26 18:33:00 -04:00
parent c694da3753
commit 538d6ac3a2
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/flash_usb.py
View File

@ -135,7 +135,7 @@ def flash_atsam4(options, binfile):
sys.exit(-1) sys.exit(-1)
def flash_atsamd(options, binfile): def flash_atsamd(options, binfile):
extra_flags = ["--offset=" + options.offset, "-b", "-R"] extra_flags = ["--offset=0x%x" % (options.start,), "-b", "-R"]
try: try:
flash_bossac(options.device, binfile, extra_flags) flash_bossac(options.device, binfile, extra_flags)
except error as e: except error as e:
@ -228,8 +228,6 @@ def main():
help="micro-controller type") help="micro-controller type")
opts.add_option("-d", "--device", type="string", dest="device", opts.add_option("-d", "--device", type="string", dest="device",
help="serial port device") help="serial port device")
opts.add_option("-o", "--offset", type="string", dest="offset",
help="flash offset")
opts.add_option("-s", "--start", type="int", dest="start", opts.add_option("-s", "--start", type="int", dest="start",
help="start address in flash") help="start address in flash")
opts.add_option("--no-sudo", action="store_false", dest="sudo", opts.add_option("--no-sudo", action="store_false", dest="sudo",

2
src/atsamd/Makefile
View File

@ -54,4 +54,4 @@ BOSSAC_OFFSET-$(CONFIG_MACH_SAMD51) := 0x4000
flash: $(OUT)klipper.bin lib/bossac/bin/bossac flash: $(OUT)klipper.bin lib/bossac/bin/bossac
@echo " Flashing $< to $(FLASH_DEVICE)" @echo " Flashing $< to $(FLASH_DEVICE)"
$(Q)$(PYTHON) ./scripts/flash_usb.py -t atsamd -d "$(FLASH_DEVICE)" -o $(BOSSAC_OFFSET-y) $(OUT)klipper.bin $(Q)$(PYTHON) ./scripts/flash_usb.py -t atsamd -d "$(FLASH_DEVICE)" -s "$(BOSSAC_OFFSET-y)" $(OUT)klipper.bin