Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Move chibios board files to allow tmk_core platform migration (#13777)

Browse source 
* Move board files

* fix up after rebase
This commit is contained in:
Joel Challis 2021-08-18 00:04:15 +01:00 committed by GitHub
parent 4c4f632378
commit 4c9003b177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build_keyboard.mk
View file

@ -151,7 +151,7 @@ ifeq ($(strip $(CTPC)), yes)
endif endif
ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes) ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
include platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk include platforms/chibios/boards/QMK_PROTON_C/convert_to_proton_c.mk
endif endif
include quantum/mcu_selection.mk include quantum/mcu_selection.mk

0
platforms/chibios/BLACKPILL_STM32_F401/board/board.mk → platforms/chibios/boards/BLACKPILL_STM32_F401/board/board.mk
View file

0
platforms/chibios/BLACKPILL_STM32_F401/configs/board.h → platforms/chibios/boards/BLACKPILL_STM32_F401/configs/board.h
View file

0
platforms/chibios/BLACKPILL_STM32_F401/configs/bootloader_defs.h → platforms/chibios/boards/BLACKPILL_STM32_F401/configs/bootloader_defs.h
View file

0
platforms/chibios/BLACKPILL_STM32_F401/configs/config.h → platforms/chibios/boards/BLACKPILL_STM32_F401/configs/config.h
View file

0
platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h → platforms/chibios/boards/BLACKPILL_STM32_F401/configs/mcuconf.h
View file

0
platforms/chibios/BLACKPILL_STM32_F411/board/board.mk → platforms/chibios/boards/BLACKPILL_STM32_F411/board/board.mk
View file

0
platforms/chibios/BLACKPILL_STM32_F411/configs/board.h → platforms/chibios/boards/BLACKPILL_STM32_F411/configs/board.h
View file

0
platforms/chibios/BLACKPILL_STM32_F411/configs/bootloader_defs.h → platforms/chibios/boards/BLACKPILL_STM32_F411/configs/bootloader_defs.h
View file

0
platforms/chibios/BLACKPILL_STM32_F411/configs/config.h → platforms/chibios/boards/BLACKPILL_STM32_F411/configs/config.h
View file

0
platforms/chibios/BLACKPILL_STM32_F411/configs/mcuconf.h → platforms/chibios/boards/BLACKPILL_STM32_F411/configs/mcuconf.h
View file

0
platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld → platforms/chibios/boards/BLACKPILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld
View file

0
platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld → platforms/chibios/boards/BLACKPILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld
View file

0
platforms/chibios/GENERIC_STM32_F042X6/board/board.c → platforms/chibios/boards/GENERIC_STM32_F042X6/board/board.c
View file

0
platforms/chibios/GENERIC_STM32_F042X6/board/board.h → platforms/chibios/boards/GENERIC_STM32_F042X6/board/board.h
View file

0
platforms/chibios/GENERIC_STM32_F042X6/board/board.mk → platforms/chibios/boards/GENERIC_STM32_F042X6/board/board.mk
View file

0
platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h → platforms/chibios/boards/GENERIC_STM32_F042X6/configs/bootloader_defs.h
View file

0
platforms/chibios/GENERIC_STM32_F042X6/configs/config.h → platforms/chibios/boards/GENERIC_STM32_F042X6/configs/config.h
View file

0
platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h → platforms/chibios/boards/GENERIC_STM32_F042X6/configs/mcuconf.h
View file

0
platforms/chibios/GENERIC_STM32_F072XB/board/board.mk → platforms/chibios/boards/GENERIC_STM32_F072XB/board/board.mk
View file

0
platforms/chibios/GENERIC_STM32_F072XB/configs/board.h → platforms/chibios/boards/GENERIC_STM32_F072XB/configs/board.h
View file

0
platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h → platforms/chibios/boards/GENERIC_STM32_F072XB/configs/bootloader_defs.h
View file

0
platforms/chibios/GENERIC_STM32_F072XB/configs/config.h → platforms/chibios/boards/GENERIC_STM32_F072XB/configs/config.h
View file

0
platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h → platforms/chibios/boards/GENERIC_STM32_F072XB/configs/mcuconf.h
View file

0
platforms/chibios/GENERIC_STM32_F303XC/board/board.mk → platforms/chibios/boards/GENERIC_STM32_F303XC/board/board.mk
View file

0
platforms/chibios/GENERIC_STM32_F303XC/configs/board.h → platforms/chibios/boards/GENERIC_STM32_F303XC/configs/board.h
View file

0
platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h → platforms/chibios/boards/GENERIC_STM32_F303XC/configs/bootloader_defs.h
View file

0
platforms/chibios/GENERIC_STM32_F303XC/configs/config.h → platforms/chibios/boards/GENERIC_STM32_F303XC/configs/config.h
View file

0
platforms/chibios/GENERIC_STM32_F303XC/configs/mcuconf.h → platforms/chibios/boards/GENERIC_STM32_F303XC/configs/mcuconf.h
View file

0
platforms/chibios/GENERIC_STM32_F407XE/board/board.mk → platforms/chibios/boards/GENERIC_STM32_F407XE/board/board.mk
View file

0
platforms/chibios/GENERIC_STM32_F407XE/configs/board.h → platforms/chibios/boards/GENERIC_STM32_F407XE/configs/board.h
View file

0
platforms/chibios/GENERIC_STM32_F407XE/configs/config.h → platforms/chibios/boards/GENERIC_STM32_F407XE/configs/config.h
View file

0
platforms/chibios/GENERIC_STM32_F407XE/configs/mcuconf.h → platforms/chibios/boards/GENERIC_STM32_F407XE/configs/mcuconf.h
View file

0
platforms/chibios/GENERIC_STM32_F446XE/board/board.mk → platforms/chibios/boards/GENERIC_STM32_F446XE/board/board.mk
View file

0
platforms/chibios/GENERIC_STM32_F446XE/configs/board.h → platforms/chibios/boards/GENERIC_STM32_F446XE/configs/board.h
View file

0
platforms/chibios/GENERIC_STM32_F446XE/configs/config.h → platforms/chibios/boards/GENERIC_STM32_F446XE/configs/config.h
View file

0
platforms/chibios/GENERIC_STM32_F446XE/configs/mcuconf.h → platforms/chibios/boards/GENERIC_STM32_F446XE/configs/mcuconf.h
View file

0
platforms/chibios/GENERIC_STM32_G431XB/board/board.mk → platforms/chibios/boards/GENERIC_STM32_G431XB/board/board.mk
View file

0
platforms/chibios/GENERIC_STM32_G431XB/configs/config.h → platforms/chibios/boards/GENERIC_STM32_G431XB/configs/config.h
View file

0
platforms/chibios/GENERIC_STM32_G431XB/configs/mcuconf.h → platforms/chibios/boards/GENERIC_STM32_G431XB/configs/mcuconf.h
View file

0
platforms/chibios/GENERIC_STM32_G474XE/board/board.mk → platforms/chibios/boards/GENERIC_STM32_G474XE/board/board.mk
View file

0
platforms/chibios/GENERIC_STM32_G474XE/configs/config.h → platforms/chibios/boards/GENERIC_STM32_G474XE/configs/config.h
View file

0
platforms/chibios/GENERIC_STM32_G474XE/configs/mcuconf.h → platforms/chibios/boards/GENERIC_STM32_G474XE/configs/mcuconf.h
View file

0
platforms/chibios/GENERIC_STM32_L412XB/board/board.mk → platforms/chibios/boards/GENERIC_STM32_L412XB/board/board.mk
View file

0
platforms/chibios/GENERIC_STM32_L412XB/configs/board.h → platforms/chibios/boards/GENERIC_STM32_L412XB/configs/board.h
View file

0
platforms/chibios/GENERIC_STM32_L412XB/configs/config.h → platforms/chibios/boards/GENERIC_STM32_L412XB/configs/config.h
View file

0
platforms/chibios/GENERIC_STM32_L412XB/configs/mcuconf.h → platforms/chibios/boards/GENERIC_STM32_L412XB/configs/mcuconf.h
View file

0
platforms/chibios/GENERIC_STM32_L433XC/board/board.mk → platforms/chibios/boards/GENERIC_STM32_L433XC/board/board.mk
View file

0
platforms/chibios/GENERIC_STM32_L433XC/configs/board.h → platforms/chibios/boards/GENERIC_STM32_L433XC/configs/board.h
View file

0
platforms/chibios/GENERIC_STM32_L433XC/configs/config.h → platforms/chibios/boards/GENERIC_STM32_L433XC/configs/config.h
View file

0
platforms/chibios/GENERIC_STM32_L433XC/configs/mcuconf.h → platforms/chibios/boards/GENERIC_STM32_L433XC/configs/mcuconf.h
View file

0
platforms/chibios/IC_TEENSY_3_1/board/board.c → platforms/chibios/boards/IC_TEENSY_3_1/board/board.c
View file

0
platforms/chibios/IC_TEENSY_3_1/board/board.h → platforms/chibios/boards/IC_TEENSY_3_1/board/board.h
View file

0
platforms/chibios/IC_TEENSY_3_1/board/board.mk → platforms/chibios/boards/IC_TEENSY_3_1/board/board.mk
View file

0
platforms/chibios/IC_TEENSY_4_1/board/board.mk → platforms/chibios/boards/IC_TEENSY_4_1/board/board.mk
View file

0
platforms/chibios/IC_TEENSY_4_1/rules.mk → platforms/chibios/boards/IC_TEENSY_4_1/rules.mk
View file

0
platforms/chibios/QMK_PROTON_C/board/board.mk → platforms/chibios/boards/QMK_PROTON_C/board/board.mk
View file

0
platforms/chibios/QMK_PROTON_C/configs/board.h → platforms/chibios/boards/QMK_PROTON_C/configs/board.h
View file

0
platforms/chibios/QMK_PROTON_C/configs/bootloader_defs.h → platforms/chibios/boards/QMK_PROTON_C/configs/bootloader_defs.h
View file

0
platforms/chibios/QMK_PROTON_C/configs/chconf.h → platforms/chibios/boards/QMK_PROTON_C/configs/chconf.h
View file

0
platforms/chibios/QMK_PROTON_C/configs/config.h → platforms/chibios/boards/QMK_PROTON_C/configs/config.h
View file

0
platforms/chibios/QMK_PROTON_C/configs/halconf.h → platforms/chibios/boards/QMK_PROTON_C/configs/halconf.h
View file

0
platforms/chibios/QMK_PROTON_C/configs/mcuconf.h → platforms/chibios/boards/QMK_PROTON_C/configs/mcuconf.h
View file

0
platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk → platforms/chibios/boards/QMK_PROTON_C/convert_to_proton_c.mk
View file

0
platforms/chibios/STM32_F103_STM32DUINO/board/board.c → platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.c
View file

0
platforms/chibios/STM32_F103_STM32DUINO/board/board.h → platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.h
View file

0
platforms/chibios/STM32_F103_STM32DUINO/board/board.mk → platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.mk
View file

0
platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h → platforms/chibios/boards/STM32_F103_STM32DUINO/configs/mcuconf.h
View file

0
platforms/chibios/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld → platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld
View file

0
platforms/chibios/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld → platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld
View file

0
platforms/chibios/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld → platforms/chibios/boards/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld
View file

0
platforms/chibios/common/configs/chconf.h → platforms/chibios/boards/common/configs/chconf.h
View file

0
platforms/chibios/common/configs/halconf.h → platforms/chibios/boards/common/configs/halconf.h
View file

0
platforms/chibios/common/ld/MKL26Z64.ld → platforms/chibios/boards/common/ld/MKL26Z64.ld
View file

0
platforms/chibios/common/ld/STM32L412xB.ld → platforms/chibios/boards/common/ld/STM32L412xB.ld
View file

0
platforms/chibios/keyboard-config-templates/board.h → platforms/chibios/boards/keyboard-config-templates/board.h
View file

0
platforms/chibios/keyboard-config-templates/chconf.h → platforms/chibios/boards/keyboard-config-templates/chconf.h
View file

0
platforms/chibios/keyboard-config-templates/halconf.h → platforms/chibios/boards/keyboard-config-templates/halconf.h
View file

0
platforms/chibios/keyboard-config-templates/mcuconf.h → platforms/chibios/boards/keyboard-config-templates/mcuconf.h
View file

38
tmk_core/chibios.mk
View file

@ -67,9 +67,9 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/boards/$(BOARD)/board.mk)","")
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk)","") else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk)","")
BOARD_PATH = $(KEYBOARD_PATH_1) BOARD_PATH = $(KEYBOARD_PATH_1)
BOARD_MK += $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk BOARD_MK += $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/board/board.mk)","") else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/board/board.mk)","")
BOARD_PATH = $(TOP_DIR)/platforms/chibios/$(BOARD) BOARD_PATH = $(TOP_DIR)/platforms/chibios/boards/$(BOARD)
BOARD_MK += $(TOP_DIR)/platforms/chibios/$(BOARD)/board/board.mk BOARD_MK += $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/board/board.mk
KEYBOARD_PATHS += $(BOARD_PATH)/configs KEYBOARD_PATHS += $(BOARD_PATH)/configs
ifneq ("$(wildcard $(BOARD_PATH)/rules.mk)","") ifneq ("$(wildcard $(BOARD_PATH)/rules.mk)","")
include $(BOARD_PATH)/rules.mk include $(BOARD_PATH)/rules.mk
@ -124,10 +124,10 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/chconf.h)","")
CHCONFDIR = $(KEYBOARD_PATH_2) CHCONFDIR = $(KEYBOARD_PATH_2)
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/chconf.h)","") else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/chconf.h)","")
CHCONFDIR = $(KEYBOARD_PATH_1) CHCONFDIR = $(KEYBOARD_PATH_1)
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/configs/chconf.h)","") else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs/chconf.h)","")
CHCONFDIR = $(TOP_DIR)/platforms/chibios/$(BOARD)/configs CHCONFDIR = $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/common/configs/chconf.h)","") else ifneq ("$(wildcard $(TOP_DIR)/platforms/boards/chibios/common/configs/chconf.h)","")
CHCONFDIR = $(TOP_DIR)/platforms/chibios/common/configs CHCONFDIR = $(TOP_DIR)/platforms/chibios/boards/common/configs
endif endif
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/halconf.h)","") ifneq ("$(wildcard $(KEYBOARD_PATH_5)/halconf.h)","")
@ -140,10 +140,10 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/halconf.h)","")
HALCONFDIR = $(KEYBOARD_PATH_2) HALCONFDIR = $(KEYBOARD_PATH_2)
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/halconf.h)","") else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/halconf.h)","")
HALCONFDIR = $(KEYBOARD_PATH_1) HALCONFDIR = $(KEYBOARD_PATH_1)
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/configs/halconf.h)","") else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs/halconf.h)","")
HALCONFDIR = $(TOP_DIR)/platforms/chibios/$(BOARD)/configs HALCONFDIR = $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/common/configs/halconf.h)","") else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/common/configs/halconf.h)","")
HALCONFDIR = $(TOP_DIR)/platforms/chibios/common/configs HALCONFDIR = $(TOP_DIR)/platforms/chibios/boards/common/configs
endif endif
# HAL-OSAL files (optional). # HAL-OSAL files (optional).
@ -190,11 +190,11 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld)","")
LDSCRIPT = $(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)","") else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld)","")
LDSCRIPT = $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld LDSCRIPT = $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/ld/$(MCU_LDSCRIPT).ld)","") else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld/$(MCU_LDSCRIPT).ld)","")
LDFLAGS += -L$(TOP_DIR)/platforms/chibios/$(BOARD)/ld LDFLAGS += -L$(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld
LDSCRIPT = $(TOP_DIR)/platforms/chibios/$(BOARD)/ld/$(MCU_LDSCRIPT).ld LDSCRIPT = $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld/$(MCU_LDSCRIPT).ld
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/common/ld/$(MCU_LDSCRIPT).ld)","") else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/common/ld/$(MCU_LDSCRIPT).ld)","")
LDSCRIPT = $(TOP_DIR)/platforms/chibios/common/ld/$(MCU_LDSCRIPT).ld LDSCRIPT = $(TOP_DIR)/platforms/chibios/boards/common/ld/$(MCU_LDSCRIPT).ld
else ifneq ("$(wildcard $(STARTUPLD_CONTRIB)/$(MCU_LDSCRIPT).ld)","") else ifneq ("$(wildcard $(STARTUPLD_CONTRIB)/$(MCU_LDSCRIPT).ld)","")
LDSCRIPT = $(STARTUPLD_CONTRIB)/$(MCU_LDSCRIPT).ld LDSCRIPT = $(STARTUPLD_CONTRIB)/$(MCU_LDSCRIPT).ld
USE_CHIBIOS_CONTRIB = yes USE_CHIBIOS_CONTRIB = yes
@ -219,8 +219,8 @@ QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM) $(PLATFORMASM)
CHIBISRC := $(patsubst $(TOP_DIR)/%,%,$(CHIBISRC)) CHIBISRC := $(patsubst $(TOP_DIR)/%,%,$(CHIBISRC))
EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \ EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \
$(TOP_DIR)/platforms/chibios/$(BOARD)/configs \ $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs \
$(TOP_DIR)/platforms/chibios/common/configs \ $(TOP_DIR)/platforms/chibios/boards/common/configs \
$(HALCONFDIR) $(CHCONFDIR) \ $(HALCONFDIR) $(CHCONFDIR) \
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
@ -241,7 +241,7 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/halconf_community.h)","")
USE_CHIBIOS_CONTRIB = yes USE_CHIBIOS_CONTRIB = yes
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/halconf_community.h)","") else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/halconf_community.h)","")
USE_CHIBIOS_CONTRIB = yes USE_CHIBIOS_CONTRIB = yes
else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/configs/halconf_community.h)","") else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs/halconf_community.h)","")
USE_CHIBIOS_CONTRIB = yes USE_CHIBIOS_CONTRIB = yes
endif endif