~ruther/qmk_firmware

0be2eaf1745e42fc5ebf19656cef40708ca19b3c — Nick Brassel 3 years ago 0d7ff02
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>
M builddefs/bootloader.mk => builddefs/bootloader.mk +10 -1
@@ 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

R platforms/avr/bootloaders/none.c => platforms/avr/bootloaders/custom.c +0 -0
R platforms/chibios/bootloaders/none.c => platforms/chibios/bootloaders/custom.c +0 -2
@@ 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) {}