summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2022-02-03 19:22:49 +1100
committerGitHub <noreply@github.com>2022-02-03 19:22:49 +1100
commit0be2eaf1745e42fc5ebf19656cef40708ca19b3c (patch)
tree2080f028442672f6aa45780596eb2eb8b64212df
parent0d7ff026b1cabc6512f218b3d073832428b3942d (diff)
downloadqmk_firmware-0be2eaf1745e42fc5ebf19656cef40708ca19b3c.tar.gz
qmk_firmware-0be2eaf1745e42fc5ebf19656cef40708ca19b3c.zip
Create a build error if no bootloader is specified. (#16181)
* 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>
-rw-r--r--builddefs/bootloader.mk11
-rw-r--r--platforms/avr/bootloaders/custom.c (renamed from platforms/avr/bootloaders/none.c)0
-rw-r--r--platforms/chibios/bootloaders/custom.c (renamed from platforms/chibios/bootloaders/none.c)2
3 files changed, 10 insertions, 3 deletions
diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index 470febc346..56ef7ff5d8 100644
--- a/builddefs/bootloader.mk
+++ b/builddefs/bootloader.mk
@@ -38,9 +38,18 @@
# RISC-V:
# 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
# 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)
OPT_DEFS += -DBOOTLOADER_ATMEL_DFU
OPT_DEFS += -DBOOTLOADER_DFU
@@ -195,5 +204,5 @@ ifeq ($(strip $(BOOTLOADER)), md-boot)
endif
ifeq ($(strip $(BOOTLOADER_TYPE)),)
- BOOTLOADER_TYPE = none
+ $(error No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file)
endif
diff --git a/platforms/avr/bootloaders/none.c b/platforms/avr/bootloaders/custom.c
index 624fbe242a..624fbe242a 100644
--- a/platforms/avr/bootloaders/none.c
+++ b/platforms/avr/bootloaders/custom.c
diff --git a/platforms/chibios/bootloaders/none.c b/platforms/chibios/bootloaders/custom.c
index 8379d35abf..bba9fc4637 100644
--- a/platforms/chibios/bootloaders/none.c
+++ b/platforms/chibios/bootloaders/custom.c
@@ -16,8 +16,6 @@
#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 enter_bootloader_mode_if_requested(void) {}