drashna/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create a build error if no bootloader is specified. (#16181)

Browse Source 
* Create a build error if no bootloader is specified.

* Update builddefs/bootloader.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
This commit is contained in:
Nick Brassel 2022-02-03 19:22:49 +11:00 committed by GitHub
parent 0d7ff026b1
commit 0be2eaf174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builddefs/bootloader.mk
View File

@ -38,9 +38,18 @@
# RISC-V: # RISC-V:
# gd32v-dfu GD32V USB DFU in ROM # gd32v-dfu GD32V USB DFU in ROM
# #
# If you need to provide your own implementation, you can set inside `rules.mk`
# `BOOTLOADER = custom` -- you'll need to provide your own implementations. See
# the respective file under `platforms/<PLATFORM>/bootloaders/custom.c` to see
# which functions may be overridden.
#
# BOOTLOADER_SIZE can still be defined manually, but it's recommended # BOOTLOADER_SIZE can still be defined manually, but it's recommended
# you add any possible configuration to this list # you add any possible configuration to this list
ifeq ($(strip $(BOOTLOADER)), custom)
OPT_DEFS += -DBOOTLOADER_CUSTOM
BOOTLOADER_TYPE = custom
endif
ifeq ($(strip $(BOOTLOADER)), atmel-dfu) ifeq ($(strip $(BOOTLOADER)), atmel-dfu)
OPT_DEFS += -DBOOTLOADER_ATMEL_DFU OPT_DEFS += -DBOOTLOADER_ATMEL_DFU
OPT_DEFS += -DBOOTLOADER_DFU OPT_DEFS += -DBOOTLOADER_DFU
@ -195,5 +204,5 @@ ifeq ($(strip $(BOOTLOADER)), md-boot)
endif endif
ifeq ($(strip $(BOOTLOADER_TYPE)),) ifeq ($(strip $(BOOTLOADER_TYPE)),)
BOOTLOADER_TYPE = none $(error No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file)
endif endif

0
platforms/avr/bootloaders/none.c → platforms/avr/bootloaders/custom.c
View File

2
platforms/chibios/bootloaders/none.c → platforms/chibios/bootloaders/custom.c
View File

@ -16,8 +16,6 @@
#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) {} __attribute__((weak)) void enter_bootloader_mode_if_requested(void) {}