forked from mfulz_github/qmk_firmware
		
	Fix broken bootloader builds in develop. (#15880)
This commit is contained in:
		
							parent
							
								
									77eae62d62
								
							
						
					
					
						commit
						08a42dc72c
					
				@ -5,6 +5,7 @@
 | 
				
			|||||||
  "debounce": 6,
 | 
					  "debounce": 6,
 | 
				
			||||||
  "processor": "STM32F303",
 | 
					  "processor": "STM32F303",
 | 
				
			||||||
  "board": "QMK_PROTON_C",
 | 
					  "board": "QMK_PROTON_C",
 | 
				
			||||||
 | 
					  "bootloader": "stm32-dfu",
 | 
				
			||||||
  "diode_direction": "COL2ROW",
 | 
					  "diode_direction": "COL2ROW",
 | 
				
			||||||
  "features": {
 | 
					  "features": {
 | 
				
			||||||
    "audio": true,
 | 
					    "audio": true,
 | 
				
			||||||
 | 
				
			|||||||
@ -5,6 +5,7 @@
 | 
				
			|||||||
  "debounce": 5,
 | 
					  "debounce": 5,
 | 
				
			||||||
  "processor": "STM32F303",
 | 
					  "processor": "STM32F303",
 | 
				
			||||||
  "board": "QMK_PROTON_C",
 | 
					  "board": "QMK_PROTON_C",
 | 
				
			||||||
 | 
					  "bootloader": "stm32-dfu",
 | 
				
			||||||
  "diode_direction": "COL2ROW",
 | 
					  "diode_direction": "COL2ROW",
 | 
				
			||||||
  "features": {
 | 
					  "features": {
 | 
				
			||||||
    "audio": true,
 | 
					    "audio": true,
 | 
				
			||||||
 | 
				
			|||||||
@ -5,6 +5,7 @@
 | 
				
			|||||||
  "debounce": 5,
 | 
					  "debounce": 5,
 | 
				
			||||||
  "processor": "STM32F303",
 | 
					  "processor": "STM32F303",
 | 
				
			||||||
  "board": "QMK_PROTON_C",
 | 
					  "board": "QMK_PROTON_C",
 | 
				
			||||||
 | 
					  "bootloader": "stm32-dfu",
 | 
				
			||||||
  "diode_direction": "COL2ROW",
 | 
					  "diode_direction": "COL2ROW",
 | 
				
			||||||
  "features": {
 | 
					  "features": {
 | 
				
			||||||
    "audio": true,
 | 
					    "audio": true,
 | 
				
			||||||
 | 
				
			|||||||
@ -4,6 +4,7 @@
 | 
				
			|||||||
    "maintainer": "skullydazed",
 | 
					    "maintainer": "skullydazed",
 | 
				
			||||||
    "processor": "STM32F303",
 | 
					    "processor": "STM32F303",
 | 
				
			||||||
    "board": "QMK_PROTON_C",
 | 
					    "board": "QMK_PROTON_C",
 | 
				
			||||||
 | 
					    "bootloader": "stm32-dfu",
 | 
				
			||||||
    "matrix_pins": {
 | 
					    "matrix_pins": {
 | 
				
			||||||
        "direct": [
 | 
					        "direct": [
 | 
				
			||||||
            ["A10", "A9"],
 | 
					            ["A10", "A9"],
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,7 @@
 | 
				
			|||||||
MCU = STM32F072
 | 
					MCU = STM32F072
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Bootloader selection
 | 
					# Bootloader selection
 | 
				
			||||||
Bootloader = stm32-dfu
 | 
					BOOTLOADER = stm32-dfu
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Wildcard to allow APM32 MCU
 | 
					# Wildcard to allow APM32 MCU
 | 
				
			||||||
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 | 
					DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 | 
				
			||||||
 | 
				
			|||||||
@ -5,6 +5,7 @@
 | 
				
			|||||||
    "debounce": 5,
 | 
					    "debounce": 5,
 | 
				
			||||||
    "processor": "STM32F303",
 | 
					    "processor": "STM32F303",
 | 
				
			||||||
    "board": "QMK_PROTON_C",
 | 
					    "board": "QMK_PROTON_C",
 | 
				
			||||||
 | 
					    "bootloader": "stm32-dfu",
 | 
				
			||||||
    "features": {
 | 
					    "features": {
 | 
				
			||||||
        "bootmagic": true,
 | 
					        "bootmagic": true,
 | 
				
			||||||
        "extrakey": true,
 | 
					        "extrakey": true,
 | 
				
			||||||
 | 
				
			|||||||
@ -3,6 +3,7 @@
 | 
				
			|||||||
    "manufacturer": "Nightingale Studios",
 | 
					    "manufacturer": "Nightingale Studios",
 | 
				
			||||||
    "maintainer": "zvecr",
 | 
					    "maintainer": "zvecr",
 | 
				
			||||||
    "processor": "STM32F072",
 | 
					    "processor": "STM32F072",
 | 
				
			||||||
 | 
					    "bootloader": "stm32-dfu",
 | 
				
			||||||
    "diode_direction": "COL2ROW",
 | 
					    "diode_direction": "COL2ROW",
 | 
				
			||||||
    "matrix_pins": {
 | 
					    "matrix_pins": {
 | 
				
			||||||
        "cols": ["A3", "F1", "F0", "C15", "C14", "C13", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "A4", "B5"],
 | 
					        "cols": ["A3", "F1", "F0", "C15", "C14", "C13", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "A4", "B5"],
 | 
				
			||||||
 | 
				
			|||||||
@ -2,6 +2,9 @@
 | 
				
			|||||||
MCU = STM32F303
 | 
					MCU = STM32F303
 | 
				
			||||||
BOARD = QMK_PROTON_C
 | 
					BOARD = QMK_PROTON_C
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Bootloader selection
 | 
				
			||||||
 | 
					BOOTLOADER = stm32-dfu
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Build Options
 | 
					# Build Options
 | 
				
			||||||
#   change yes to no to disable
 | 
					#   change yes to no to disable
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,9 @@
 | 
				
			|||||||
# MCU name
 | 
					# MCU name
 | 
				
			||||||
MCU = STM32F303
 | 
					MCU = STM32F303
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Bootloader selection
 | 
				
			||||||
 | 
					BOOTLOADER = stm32-dfu
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Touch encoder needs
 | 
					# Touch encoder needs
 | 
				
			||||||
SRC += ../common/touch_encoder.c
 | 
					SRC += ../common/touch_encoder.c
 | 
				
			||||||
SRC += ../common/common_oled.c
 | 
					SRC += ../common/common_oled.c
 | 
				
			||||||
 | 
				
			|||||||
@ -16,4 +16,8 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include "bootloader.h"
 | 
					#include "bootloader.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#pragma message "Unknown bootloader set, you may not be able to enter bootloader using software reset"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
__attribute__((weak)) void bootloader_jump(void) {}
 | 
					__attribute__((weak)) void bootloader_jump(void) {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					__attribute__((weak)) void enter_bootloader_mode_if_requested(void) {}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user