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

Set BOOTLOADER = stm32-dfu for all applicable STM32 boards #12956

Merged
merged 8 commits into from
Jun 8, 2021

Conversation

fauxpark
Copy link
Member

@fauxpark fauxpark commented May 20, 2021

Description

Currently, doesn't do much because it only specifies dfu-util/dfu-suffix args, which are also set at the MCU level for now.

Fixed up sowbug/68keys and sowbug/ansi_tkl to use BOOTLOADER = stm32duino.

Removed a few bootloader_defs.h files and STM32_BOOTLOADER_ADDRESS defines/rules where this information is already provided by platforms/.

Types of Changes

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

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • 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 20, 2021

Wouldn't this be simpler to put in mcu_selection.mk?

@fauxpark
Copy link
Member Author

Simpler? Yes, but I think the BOOTLOADER block should be always present in rules.mk, except in cases of custom bootloader/board eg. Matrix, K320, etc. And it reduces confusion regarding why STM32 boards don't have it and AVRs do.

@fauxpark
Copy link
Member Author

This is ready to go now. Confirmed it plays nice with the DFU_SUFFIX_ARGS override for APM32 (at least, the hashes match).

@fauxpark fauxpark merged commit 9dcd03b into qmk:master Jun 8, 2021
@fauxpark fauxpark deleted the stm32-dfu-bootloader-set branch June 8, 2021 09:48
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Jul 11, 2021
* Set bootloader to stm32-dfu for STM32F303

* Set bootloader to stm32-dfu for STM32F0x2

* Set bootloader to stm32-dfu for STM32F4x1

* Set bootloader to stm32duino for sowbug

* Delete redundant bootloader_defs headers

* Add some missing MCU name comments

* Move APM32 dfu-suffix overrides underneath bootloader

* Remove redundant STM32_BOOTLOADER_ADDRESS defines/rules
@kylemccreery kylemccreery mentioned this pull request Jul 20, 2021
14 tasks
wox pushed a commit to wox/qmk_firmware that referenced this pull request Aug 14, 2021
* Set bootloader to stm32-dfu for STM32F303

* Set bootloader to stm32-dfu for STM32F0x2

* Set bootloader to stm32-dfu for STM32F4x1

* Set bootloader to stm32duino for sowbug

* Delete redundant bootloader_defs headers

* Add some missing MCU name comments

* Move APM32 dfu-suffix overrides underneath bootloader

* Remove redundant STM32_BOOTLOADER_ADDRESS defines/rules
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
* Set bootloader to stm32-dfu for STM32F303

* Set bootloader to stm32-dfu for STM32F0x2

* Set bootloader to stm32-dfu for STM32F4x1

* Set bootloader to stm32duino for sowbug

* Delete redundant bootloader_defs headers

* Add some missing MCU name comments

* Move APM32 dfu-suffix overrides underneath bootloader

* Remove redundant STM32_BOOTLOADER_ADDRESS defines/rules
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
* Set bootloader to stm32-dfu for STM32F303

* Set bootloader to stm32-dfu for STM32F0x2

* Set bootloader to stm32-dfu for STM32F4x1

* Set bootloader to stm32duino for sowbug

* Delete redundant bootloader_defs headers

* Add some missing MCU name comments

* Move APM32 dfu-suffix overrides underneath bootloader

* Remove redundant STM32_BOOTLOADER_ADDRESS defines/rules
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.

2 participants