Initial work for consolidation of ChibiOS platform files (#8327)
* Initial work for consolidation of board files and default ChibiOS configs. * Migrate F401/F411 black pills for testing. * Add early init bootloader jump flag. * Add support for I2C in order to use i2c_scanner keymap. * Add F401/F411 HSE bypass to get things booting. * Exempt "hooked" ChibiOS conf files from updater script. * Fix up ordering for bootloader_defs file check. * Match previous $(KEYBOARD_PATHS) value for Proton-C, updated for all board configs.
This commit is contained in:
Nick Brassel
James Young
parent
5cc3ab38c9
commit
385d49cc39
69 changed files with 2564 additions and 8237 deletions
|
|
@ -50,11 +50,42 @@ PLATFORM_MK = $(CHIBIOS_CONTRIB)/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)/$(PLAT
|
|||
endif
|
||||
include $(PLATFORM_MK)
|
||||
|
||||
BOARD_MK :=
|
||||
|
||||
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/boards/$(BOARD)/board.mk)","")
|
||||
BOARD_PATH = $(KEYBOARD_PATH_5)
|
||||
BOARD_MK += $(KEYBOARD_PATH_5)/boards/$(BOARD)/board.mk
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_4)/boards/$(BOARD)/board.mk)","")
|
||||
BOARD_PATH = $(KEYBOARD_PATH_4)
|
||||
BOARD_MK += $(KEYBOARD_PATH_4)/boards/$(BOARD)/board.mk
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_3)/boards/$(BOARD)/board.mk)","")
|
||||
BOARD_PATH = $(KEYBOARD_PATH_3)
|
||||
BOARD_MK += $(KEYBOARD_PATH_3)/boards/$(BOARD)/board.mk
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/boards/$(BOARD)/board.mk)","")
|
||||
BOARD_PATH = $(KEYBOARD_PATH_2)
|
||||
BOARD_MK += $(KEYBOARD_PATH_2)/boards/$(BOARD)/board.mk
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk)","")
|
||||
BOARD_PATH = $(KEYBOARD_PATH_1)
|
||||
BOARD_MK += $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk
|
||||
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/board/board.mk)","")
|
||||
BOARD_PATH = $(TOP_DIR)/platforms/chibios/$(BOARD)
|
||||
BOARD_MK += $(TOP_DIR)/platforms/chibios/$(BOARD)/board/board.mk
|
||||
KEYBOARD_PATHS += $(BOARD_PATH)/configs
|
||||
endif
|
||||
|
||||
ifeq ("$(wildcard $(BOARD_MK))","")
|
||||
BOARD_MK = $(CHIBIOS)/os/hal/boards/$(BOARD)/board.mk
|
||||
ifeq ("$(wildcard $(BOARD_MK))","")
|
||||
BOARD_MK = $(CHIBIOS_CONTRIB)/os/hal/boards/$(BOARD)/board.mk
|
||||
endif
|
||||
endif
|
||||
|
||||
# Bootloader address
|
||||
ifdef STM32_BOOTLOADER_ADDRESS
|
||||
OPT_DEFS += -DSTM32_BOOTLOADER_ADDRESS=$(STM32_BOOTLOADER_ADDRESS)
|
||||
endif
|
||||
|
||||
# Work out if we need to set up the include for the bootloader definitions
|
||||
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/bootloader_defs.h)","")
|
||||
OPT_DEFS += -include $(KEYBOARD_PATH_5)/bootloader_defs.h
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_5)/boards/$(BOARD)/bootloader_defs.h)","")
|
||||
|
|
@ -75,39 +106,53 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/bootloader_defs.h)","")
|
|||
OPT_DEFS += -include $(KEYBOARD_PATH_1)/bootloader_defs.h
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/bootloader_defs.h)","")
|
||||
OPT_DEFS += -include $(KEYBOARD_PATH_1)/boards/$(BOARD)/bootloader_defs.h
|
||||
else ifneq ("$(wildcard $(TOP_DIR)/drivers/boards/$(BOARD)/bootloader_defs.h)","")
|
||||
OPT_DEFS += -include $(TOP_DIR)/drivers/boards/$(BOARD)/bootloader_defs.h
|
||||
else ifneq ("$(wildcard $(BOARD_PATH)/configs/bootloader_defs.h)","")
|
||||
OPT_DEFS += -include $(BOARD_PATH)/configs/bootloader_defs.h
|
||||
endif
|
||||
|
||||
BOARD_MK :=
|
||||
|
||||
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/boards/$(BOARD)/board.mk)","")
|
||||
BOARD_PATH = $(KEYBOARD_PATH_5)
|
||||
BOARD_MK += $(KEYBOARD_PATH_5)/boards/$(BOARD)/board.mk
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_4)/boards/$(BOARD)/board.mk)","")
|
||||
BOARD_PATH = $(KEYBOARD_PATH_4)
|
||||
BOARD_MK += $(KEYBOARD_PATH_4)/boards/$(BOARD)/board.mk
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_3)/boards/$(BOARD)/board.mk)","")
|
||||
BOARD_PATH = $(KEYBOARD_PATH_3)
|
||||
BOARD_MK += $(KEYBOARD_PATH_3)/boards/$(BOARD)/board.mk
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/boards/$(BOARD)/board.mk)","")
|
||||
BOARD_PATH = $(KEYBOARD_PATH_2)
|
||||
BOARD_MK += $(KEYBOARD_PATH_2)/boards/$(BOARD)/board.mk
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk)","")
|
||||
BOARD_PATH = $(KEYBOARD_PATH_1)
|
||||
BOARD_MK += $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk
|
||||
else ifneq ("$(wildcard $(TOP_DIR)/drivers/boards/$(BOARD)/board.mk)","")
|
||||
BOARD_PATH = $(TOP_DIR)/drivers
|
||||
BOARD_MK += $(TOP_DIR)/drivers/boards/$(BOARD)/board.mk
|
||||
# Work out the config file directories
|
||||
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/chconf.h)","")
|
||||
CHCONFDIR = $(KEYBOARD_PATH_5)
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_4)/chconf.h)","")
|
||||
CHCONFDIR = $(KEYBOARD_PATH_4)
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_3)/chconf.h)","")
|
||||
CHCONFDIR = $(KEYBOARD_PATH_3)
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/chconf.h)","")
|
||||
CHCONFDIR = $(KEYBOARD_PATH_2)
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/chconf.h)","")
|
||||
CHCONFDIR = $(KEYBOARD_PATH_1)
|
||||
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/configs/chconf.h)","")
|
||||
CHCONFDIR = $(TOP_DIR)/platforms/chibios/$(BOARD)/configs
|
||||
endif
|
||||
|
||||
ifeq ("$(wildcard $(BOARD_MK))","")
|
||||
BOARD_MK = $(CHIBIOS)/os/hal/boards/$(BOARD)/board.mk
|
||||
ifeq ("$(wildcard $(BOARD_MK))","")
|
||||
BOARD_MK = $(CHIBIOS_CONTRIB)/os/hal/boards/$(BOARD)/board.mk
|
||||
endif
|
||||
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/halconf.h)","")
|
||||
HALCONFDIR = $(KEYBOARD_PATH_5)
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_4)/halconf.h)","")
|
||||
HALCONFDIR = $(KEYBOARD_PATH_4)
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_3)/halconf.h)","")
|
||||
HALCONFDIR = $(KEYBOARD_PATH_3)
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/halconf.h)","")
|
||||
HALCONFDIR = $(KEYBOARD_PATH_2)
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/halconf.h)","")
|
||||
HALCONFDIR = $(KEYBOARD_PATH_1)
|
||||
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/configs/halconf.h)","")
|
||||
HALCONFDIR = $(TOP_DIR)/platforms/chibios/$(BOARD)/configs
|
||||
endif
|
||||
|
||||
# HAL-OSAL files (optional).
|
||||
include $(CHIBIOS)/os/hal/hal.mk
|
||||
|
||||
ifeq ("$(PLATFORM_NAME)","")
|
||||
PLATFORM_NAME = platform
|
||||
endif
|
||||
|
||||
PLATFORM_MK = $(CHIBIOS)/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)/$(PLATFORM_NAME).mk
|
||||
ifeq ("$(wildcard $(PLATFORM_MK))","")
|
||||
PLATFORM_MK = $(CHIBIOS_CONTRIB)/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)/$(PLATFORM_NAME).mk
|
||||
endif
|
||||
include $(PLATFORM_MK)
|
||||
|
||||
|
||||
include $(BOARD_MK)
|
||||
-include $(CHIBIOS)/os/hal/osal/rt/osal.mk # ChibiOS <= 19.x
|
||||
-include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk # ChibiOS >= 20.x
|
||||
|
|
@ -138,8 +183,8 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld)","")
|
|||
LDSCRIPT = $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld)","")
|
||||
LDSCRIPT = $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld
|
||||
else ifneq ("$(wildcard $(TOP_DIR)/drivers/boards/ld/$(MCU_LDSCRIPT).ld)","")
|
||||
LDSCRIPT = $(TOP_DIR)/drivers/boards/ld/$(MCU_LDSCRIPT).ld
|
||||
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/ld/$(MCU_LDSCRIPT).ld)","")
|
||||
LDSCRIPT = $(TOP_DIR)/platforms/chibios/ld/$(MCU_LDSCRIPT).ld
|
||||
else ifneq ("$(wildcard $(STARTUPLD_CONTRIB)/$(MCU_LDSCRIPT).ld)","")
|
||||
LDSCRIPT = $(STARTUPLD_CONTRIB)/$(MCU_LDSCRIPT).ld
|
||||
USE_CHIBIOS_CONTRIB = yes
|
||||
|
|
@ -163,6 +208,7 @@ QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM)
|
|||
CHIBISRC := $(patsubst $(TOP_DIR)/%,%,$(CHIBISRC))
|
||||
|
||||
EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \
|
||||
$(TOP_DIR)/platforms/chibios/$(BOARD)/configs \
|
||||
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
|
||||
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
|
||||
$(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH)
|
||||
|
|
@ -182,6 +228,8 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/halconf_community.h)","")
|
|||
USE_CHIBIOS_CONTRIB = yes
|
||||
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/halconf_community.h)","")
|
||||
USE_CHIBIOS_CONTRIB = yes
|
||||
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/configs/halconf_community.h)","")
|
||||
USE_CHIBIOS_CONTRIB = yes
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(USE_CHIBIOS_CONTRIB)),yes)
|
||||
|
|
@ -194,6 +242,15 @@ endif
|
|||
# Project, sources and paths
|
||||
##############################################################################
|
||||
|
||||
##############################################################################
|
||||
# Injected configs
|
||||
#
|
||||
ifneq ("$(wildcard $(BOARD_PATH)/configs/config.h)","")
|
||||
CONFIG_H += $(BOARD_PATH)/configs/config.h
|
||||
endif
|
||||
ifneq ("$(wildcard $(BOARD_PATH)/configs/post_config.h)","")
|
||||
POST_CONFIG_H += $(BOARD_PATH)/configs/post_config.h
|
||||
endif
|
||||
|
||||
##############################################################################
|
||||
# Compiler settings
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue