Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ARM Teensy flashing support #6016

Merged
merged 1 commit into from
May 30, 2019
Merged

Add ARM Teensy flashing support #6016

merged 1 commit into from
May 30, 2019

Conversation

zvecr
Copy link
Member

@zvecr zvecr commented May 30, 2019

Description

Teensy 3.x and LC both use teensy_loader_cli for flashing and expect a .hex file.

The change has been stolen from avr.mk, im not sure if there is a more centralised location to avoid duplication? (MCU logic will need to be slightly different between ARM and AVR due to ARM teensy requiring MCU = cortex-m0plus and that not being what -mmcu expects).

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@drashna
Copy link
Member

drashna commented May 30, 2019

Nope, that's fine. And actually, I think that's the correct way, since of the difference (and what I did for my draft wally PR)

However, is MCU_LDSCRIPT correct for the boards that would use the teensy_loader_cli?

@zvecr
Copy link
Member Author

zvecr commented May 30, 2019

MCU_LDSCRIPT is currently set to the correct values for teensy boards, however with the old chibios fork i don't know if this will change. I can add an additional rules.mk flag to pass down if it helps clarify or contain the issue ( i was just being lazy and reusing an existing one).

@drashna
Copy link
Member

drashna commented May 30, 2019

If it does change, we'll have to deal with that, then.

The worst case, is that for now, we could add a new variable: TEENSY_MCU_ARG, and set it to MCU_LDSCRIPT if it's not set

@zvecr
Copy link
Member Author

zvecr commented May 30, 2019

Happy to go whatever direction on the flags, dealers choice.

@drashna
Copy link
Member

drashna commented May 30, 2019

I think for now, this should be fine.

@drashna drashna merged commit 2f7a57a into qmk:master May 30, 2019
tenderlove added a commit to tenderlove/qmk_firmware that referenced this pull request Jun 10, 2019
* master: (790 commits)
  [Keyboard] YMD96 refactor (qmk#5472)
  Update reference_configurator_support.md
  Use qmk docker image for travis CI builds
  [Keyboard] Remove file with same name and different case (qmk#6028)
  [Keyboard] Fix json for NK65 (qmk#6026)
  [Keymap] added hhkb layout for tada68 (qmk#6027)
  [Keymap] Added keymap for user jasondunsmore (qmk#6023)
  [Keyboard] Fix jc65 when RGB or BACKLIGHT disabled (qmk#6022)
  Update feature_encoders.md
  Copy avr teensy flash logic to arm (qmk#6016)
  [Keyboard] E6V2 R2 BMC PCB (qmk#6009)
  Add belgian layout for sendstring (qmk#6008)
  [Keyboard] Added XW60 PCB (qmk#6011)
  [Keymap] Georgi flippydippy layout (qmk#6005)
  Fix TO() and DF() calling layer_state_set_[kb,user] twice (qmk#6003)
  Update 333fred keymaps and add new iris map. (qmk#6010)
  [Keyboard] Changed LED positions for Massdrop CTRL and DZ60RGB (qmk#5801)
  [Keyboard] Add support for AKB boards (qmk#5996)
  Duck Octagon V1 Configurator cleanup (qmk#5957)
  Fixing matrix_scan so it properly returns changed status
  ...
drashna pushed a commit to zsa/qmk_firmware that referenced this pull request Jun 14, 2019
fdidron pushed a commit to zsa/qmk_firmware that referenced this pull request Jun 20, 2019
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
kimat pushed a commit to kimat/qmk_firmware that referenced this pull request Sep 8, 2019
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
JeffreyPalmer pushed a commit to JeffreyPalmer/qmk_firmware that referenced this pull request Feb 27, 2020
swamp09 pushed a commit to swamp09/qmk_firmware that referenced this pull request Mar 11, 2020
@zvecr zvecr deleted the teensy_arm_flash branch April 28, 2020 00:34
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants