diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-10-26 18:33:00 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-10-26 18:33:00 -0400 |
| commit | 538d6ac3a278ae7e3f7ff55ea67c17012d063733 (patch) | |
| tree | f169fda10eb1310dfa9d7063c812826bd5ede4e8 | |
| parent | c694da37532e495e58d1e18a6ad55ad71d56f085 (diff) | |
| download | kutter-538d6ac3a278ae7e3f7ff55ea67c17012d063733.tar.gz kutter-538d6ac3a278ae7e3f7ff55ea67c17012d063733.tar.xz kutter-538d6ac3a278ae7e3f7ff55ea67c17012d063733.zip | |
flash_usb: Use "-s" option to specify flash offset on atsamd
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rwxr-xr-x | scripts/flash_usb.py | 4 | ||||
| -rw-r--r-- | src/atsamd/Makefile | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/scripts/flash_usb.py b/scripts/flash_usb.py index 9bad5040..13fa51b3 100755 --- a/scripts/flash_usb.py +++ b/scripts/flash_usb.py @@ -135,7 +135,7 @@ def flash_atsam4(options, binfile): sys.exit(-1) def flash_atsamd(options, binfile): - extra_flags = ["--offset=" + options.offset, "-b", "-R"] + extra_flags = ["--offset=0x%x" % (options.start,), "-b", "-R"] try: flash_bossac(options.device, binfile, extra_flags) except error as e: @@ -228,8 +228,6 @@ def main(): help="micro-controller type") opts.add_option("-d", "--device", type="string", dest="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", help="start address in flash") opts.add_option("--no-sudo", action="store_false", dest="sudo", diff --git a/src/atsamd/Makefile b/src/atsamd/Makefile index d856376f..658c5ad6 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)" -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 |