From 4c9003b1779b7b404e3bb0ce103db683bd92bccb Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 18 Aug 2021 00:04:15 +0100 Subject: [PATCH] Move chibios board files to allow tmk_core platform migration (#13777) * Move board files * fix up after rebase --- build_keyboard.mk | 2 +- .../BLACKPILL_STM32_F401/board/board.mk | 0 .../BLACKPILL_STM32_F401/configs/board.h | 0 .../configs/bootloader_defs.h | 0 .../BLACKPILL_STM32_F401/configs/config.h | 0 .../BLACKPILL_STM32_F401/configs/mcuconf.h | 0 .../BLACKPILL_STM32_F411/board/board.mk | 0 .../BLACKPILL_STM32_F411/configs/board.h | 0 .../configs/bootloader_defs.h | 0 .../BLACKPILL_STM32_F411/configs/config.h | 0 .../BLACKPILL_STM32_F411/configs/mcuconf.h | 0 .../ld/STM32F411xC_tinyuf2.ld | 0 .../ld/STM32F411xE_tinyuf2.ld | 0 .../GENERIC_STM32_F042X6/board/board.c | 0 .../GENERIC_STM32_F042X6/board/board.h | 0 .../GENERIC_STM32_F042X6/board/board.mk | 0 .../configs/bootloader_defs.h | 0 .../GENERIC_STM32_F042X6/configs/config.h | 0 .../GENERIC_STM32_F042X6/configs/mcuconf.h | 0 .../GENERIC_STM32_F072XB/board/board.mk | 0 .../GENERIC_STM32_F072XB/configs/board.h | 0 .../configs/bootloader_defs.h | 0 .../GENERIC_STM32_F072XB/configs/config.h | 0 .../GENERIC_STM32_F072XB/configs/mcuconf.h | 0 .../GENERIC_STM32_F303XC/board/board.mk | 0 .../GENERIC_STM32_F303XC/configs/board.h | 0 .../configs/bootloader_defs.h | 0 .../GENERIC_STM32_F303XC/configs/config.h | 0 .../GENERIC_STM32_F303XC/configs/mcuconf.h | 0 .../GENERIC_STM32_F407XE/board/board.mk | 0 .../GENERIC_STM32_F407XE/configs/board.h | 0 .../GENERIC_STM32_F407XE/configs/config.h | 0 .../GENERIC_STM32_F407XE/configs/mcuconf.h | 0 .../GENERIC_STM32_F446XE/board/board.mk | 0 .../GENERIC_STM32_F446XE/configs/board.h | 0 .../GENERIC_STM32_F446XE/configs/config.h | 0 .../GENERIC_STM32_F446XE/configs/mcuconf.h | 0 .../GENERIC_STM32_G431XB/board/board.mk | 0 .../GENERIC_STM32_G431XB/configs/config.h | 0 .../GENERIC_STM32_G431XB/configs/mcuconf.h | 0 .../GENERIC_STM32_G474XE/board/board.mk | 0 .../GENERIC_STM32_G474XE/configs/config.h | 0 .../GENERIC_STM32_G474XE/configs/mcuconf.h | 0 .../GENERIC_STM32_L412XB/board/board.mk | 0 .../GENERIC_STM32_L412XB/configs/board.h | 0 .../GENERIC_STM32_L412XB/configs/config.h | 0 .../GENERIC_STM32_L412XB/configs/mcuconf.h | 0 .../GENERIC_STM32_L433XC/board/board.mk | 0 .../GENERIC_STM32_L433XC/configs/board.h | 0 .../GENERIC_STM32_L433XC/configs/config.h | 0 .../GENERIC_STM32_L433XC/configs/mcuconf.h | 0 .../{ => boards}/IC_TEENSY_3_1/board/board.c | 0 .../{ => boards}/IC_TEENSY_3_1/board/board.h | 0 .../{ => boards}/IC_TEENSY_3_1/board/board.mk | 0 .../{ => boards}/IC_TEENSY_4_1/board/board.mk | 0 .../{ => boards}/IC_TEENSY_4_1/rules.mk | 0 .../{ => boards}/QMK_PROTON_C/board/board.mk | 0 .../{ => boards}/QMK_PROTON_C/configs/board.h | 0 .../QMK_PROTON_C/configs/bootloader_defs.h | 0 .../QMK_PROTON_C/configs/chconf.h | 0 .../QMK_PROTON_C/configs/config.h | 0 .../QMK_PROTON_C/configs/halconf.h | 0 .../QMK_PROTON_C/configs/mcuconf.h | 0 .../QMK_PROTON_C/convert_to_proton_c.mk | 0 .../STM32_F103_STM32DUINO/board/board.c | 0 .../STM32_F103_STM32DUINO/board/board.h | 0 .../STM32_F103_STM32DUINO/board/board.mk | 0 .../STM32_F103_STM32DUINO/configs/mcuconf.h | 0 .../ld/STM32F103x8_stm32duino_bootloader.ld | 0 .../ld/STM32F103xB_stm32duino_bootloader.ld | 0 .../ld/stm32duino_bootloader_common.ld | 0 .../{ => boards}/common/configs/chconf.h | 0 .../{ => boards}/common/configs/halconf.h | 0 .../{ => boards}/common/ld/MKL26Z64.ld | 0 .../{ => boards}/common/ld/STM32L412xB.ld | 0 .../keyboard-config-templates/board.h | 0 .../keyboard-config-templates/chconf.h | 0 .../keyboard-config-templates/halconf.h | 0 .../keyboard-config-templates/mcuconf.h | 0 tmk_core/chibios.mk | 38 +++++++++---------- 80 files changed, 20 insertions(+), 20 deletions(-) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F401/board/board.mk (100%) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F401/configs/board.h (100%) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F401/configs/bootloader_defs.h (100%) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F401/configs/config.h (100%) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F401/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/board/board.mk (100%) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/configs/board.h (100%) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/configs/bootloader_defs.h (100%) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/configs/config.h (100%) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld (100%) rename platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/board/board.c (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/board/board.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/board/board.mk (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/configs/bootloader_defs.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/configs/config.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F072XB/board/board.mk (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F072XB/configs/board.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F072XB/configs/bootloader_defs.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F072XB/configs/config.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F072XB/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F303XC/board/board.mk (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F303XC/configs/board.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F303XC/configs/bootloader_defs.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F303XC/configs/config.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F303XC/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F407XE/board/board.mk (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F407XE/configs/board.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F407XE/configs/config.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F407XE/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F446XE/board/board.mk (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F446XE/configs/board.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F446XE/configs/config.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_F446XE/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_G431XB/board/board.mk (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_G431XB/configs/config.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_G431XB/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_G474XE/board/board.mk (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_G474XE/configs/config.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_G474XE/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_L412XB/board/board.mk (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_L412XB/configs/board.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_L412XB/configs/config.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_L412XB/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_L433XC/board/board.mk (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_L433XC/configs/board.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_L433XC/configs/config.h (100%) rename platforms/chibios/{ => boards}/GENERIC_STM32_L433XC/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/IC_TEENSY_3_1/board/board.c (100%) rename platforms/chibios/{ => boards}/IC_TEENSY_3_1/board/board.h (100%) rename platforms/chibios/{ => boards}/IC_TEENSY_3_1/board/board.mk (100%) rename platforms/chibios/{ => boards}/IC_TEENSY_4_1/board/board.mk (100%) rename platforms/chibios/{ => boards}/IC_TEENSY_4_1/rules.mk (100%) rename platforms/chibios/{ => boards}/QMK_PROTON_C/board/board.mk (100%) rename platforms/chibios/{ => boards}/QMK_PROTON_C/configs/board.h (100%) rename platforms/chibios/{ => boards}/QMK_PROTON_C/configs/bootloader_defs.h (100%) rename platforms/chibios/{ => boards}/QMK_PROTON_C/configs/chconf.h (100%) rename platforms/chibios/{ => boards}/QMK_PROTON_C/configs/config.h (100%) rename platforms/chibios/{ => boards}/QMK_PROTON_C/configs/halconf.h (100%) rename platforms/chibios/{ => boards}/QMK_PROTON_C/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/QMK_PROTON_C/convert_to_proton_c.mk (100%) rename platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/board/board.c (100%) rename platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/board/board.h (100%) rename platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/board/board.mk (100%) rename platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/configs/mcuconf.h (100%) rename platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld (100%) rename platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld (100%) rename platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld (100%) rename platforms/chibios/{ => boards}/common/configs/chconf.h (100%) rename platforms/chibios/{ => boards}/common/configs/halconf.h (100%) rename platforms/chibios/{ => boards}/common/ld/MKL26Z64.ld (100%) rename platforms/chibios/{ => boards}/common/ld/STM32L412xB.ld (100%) rename platforms/chibios/{ => boards}/keyboard-config-templates/board.h (100%) rename platforms/chibios/{ => boards}/keyboard-config-templates/chconf.h (100%) rename platforms/chibios/{ => boards}/keyboard-config-templates/halconf.h (100%) rename platforms/chibios/{ => boards}/keyboard-config-templates/mcuconf.h (100%) diff --git a/build_keyboard.mk b/build_keyboard.mk index 262bfd9a7..62a7ba6a0 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -151,7 +151,7 @@ ifeq ($(strip $(CTPC)), yes) endif 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 include quantum/mcu_selection.mk diff --git a/platforms/chibios/BLACKPILL_STM32_F401/board/board.mk b/platforms/chibios/boards/BLACKPILL_STM32_F401/board/board.mk similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F401/board/board.mk rename to platforms/chibios/boards/BLACKPILL_STM32_F401/board/board.mk diff --git a/platforms/chibios/BLACKPILL_STM32_F401/configs/board.h b/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/board.h similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F401/configs/board.h rename to platforms/chibios/boards/BLACKPILL_STM32_F401/configs/board.h diff --git a/platforms/chibios/BLACKPILL_STM32_F401/configs/bootloader_defs.h b/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/bootloader_defs.h similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F401/configs/bootloader_defs.h rename to platforms/chibios/boards/BLACKPILL_STM32_F401/configs/bootloader_defs.h diff --git a/platforms/chibios/BLACKPILL_STM32_F401/configs/config.h b/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/config.h similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F401/configs/config.h rename to platforms/chibios/boards/BLACKPILL_STM32_F401/configs/config.h diff --git a/platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h b/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/mcuconf.h similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h rename to platforms/chibios/boards/BLACKPILL_STM32_F401/configs/mcuconf.h diff --git a/platforms/chibios/BLACKPILL_STM32_F411/board/board.mk b/platforms/chibios/boards/BLACKPILL_STM32_F411/board/board.mk similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F411/board/board.mk rename to platforms/chibios/boards/BLACKPILL_STM32_F411/board/board.mk diff --git a/platforms/chibios/BLACKPILL_STM32_F411/configs/board.h b/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/board.h similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F411/configs/board.h rename to platforms/chibios/boards/BLACKPILL_STM32_F411/configs/board.h diff --git a/platforms/chibios/BLACKPILL_STM32_F411/configs/bootloader_defs.h b/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/bootloader_defs.h similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F411/configs/bootloader_defs.h rename to platforms/chibios/boards/BLACKPILL_STM32_F411/configs/bootloader_defs.h diff --git a/platforms/chibios/BLACKPILL_STM32_F411/configs/config.h b/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/config.h similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F411/configs/config.h rename to platforms/chibios/boards/BLACKPILL_STM32_F411/configs/config.h diff --git a/platforms/chibios/BLACKPILL_STM32_F411/configs/mcuconf.h b/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/mcuconf.h similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F411/configs/mcuconf.h rename to platforms/chibios/boards/BLACKPILL_STM32_F411/configs/mcuconf.h diff --git a/platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld b/platforms/chibios/boards/BLACKPILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld rename to platforms/chibios/boards/BLACKPILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld diff --git a/platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld b/platforms/chibios/boards/BLACKPILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld similarity index 100% rename from platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld rename to platforms/chibios/boards/BLACKPILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld diff --git a/platforms/chibios/GENERIC_STM32_F042X6/board/board.c b/platforms/chibios/boards/GENERIC_STM32_F042X6/board/board.c similarity index 100% rename from platforms/chibios/GENERIC_STM32_F042X6/board/board.c rename to platforms/chibios/boards/GENERIC_STM32_F042X6/board/board.c diff --git a/platforms/chibios/GENERIC_STM32_F042X6/board/board.h b/platforms/chibios/boards/GENERIC_STM32_F042X6/board/board.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F042X6/board/board.h rename to platforms/chibios/boards/GENERIC_STM32_F042X6/board/board.h diff --git a/platforms/chibios/GENERIC_STM32_F042X6/board/board.mk b/platforms/chibios/boards/GENERIC_STM32_F042X6/board/board.mk similarity index 100% rename from platforms/chibios/GENERIC_STM32_F042X6/board/board.mk rename to platforms/chibios/boards/GENERIC_STM32_F042X6/board/board.mk diff --git a/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h b/platforms/chibios/boards/GENERIC_STM32_F042X6/configs/bootloader_defs.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h rename to platforms/chibios/boards/GENERIC_STM32_F042X6/configs/bootloader_defs.h diff --git a/platforms/chibios/GENERIC_STM32_F042X6/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_F042X6/configs/config.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F042X6/configs/config.h rename to platforms/chibios/boards/GENERIC_STM32_F042X6/configs/config.h diff --git a/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_F042X6/configs/mcuconf.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h rename to platforms/chibios/boards/GENERIC_STM32_F042X6/configs/mcuconf.h diff --git a/platforms/chibios/GENERIC_STM32_F072XB/board/board.mk b/platforms/chibios/boards/GENERIC_STM32_F072XB/board/board.mk similarity index 100% rename from platforms/chibios/GENERIC_STM32_F072XB/board/board.mk rename to platforms/chibios/boards/GENERIC_STM32_F072XB/board/board.mk diff --git a/platforms/chibios/GENERIC_STM32_F072XB/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/board.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F072XB/configs/board.h rename to platforms/chibios/boards/GENERIC_STM32_F072XB/configs/board.h diff --git a/platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h b/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/bootloader_defs.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h rename to platforms/chibios/boards/GENERIC_STM32_F072XB/configs/bootloader_defs.h diff --git a/platforms/chibios/GENERIC_STM32_F072XB/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/config.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F072XB/configs/config.h rename to platforms/chibios/boards/GENERIC_STM32_F072XB/configs/config.h diff --git a/platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/mcuconf.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h rename to platforms/chibios/boards/GENERIC_STM32_F072XB/configs/mcuconf.h diff --git a/platforms/chibios/GENERIC_STM32_F303XC/board/board.mk b/platforms/chibios/boards/GENERIC_STM32_F303XC/board/board.mk similarity index 100% rename from platforms/chibios/GENERIC_STM32_F303XC/board/board.mk rename to platforms/chibios/boards/GENERIC_STM32_F303XC/board/board.mk diff --git a/platforms/chibios/GENERIC_STM32_F303XC/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/board.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F303XC/configs/board.h rename to platforms/chibios/boards/GENERIC_STM32_F303XC/configs/board.h diff --git a/platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h b/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/bootloader_defs.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h rename to platforms/chibios/boards/GENERIC_STM32_F303XC/configs/bootloader_defs.h diff --git a/platforms/chibios/GENERIC_STM32_F303XC/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/config.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F303XC/configs/config.h rename to platforms/chibios/boards/GENERIC_STM32_F303XC/configs/config.h diff --git a/platforms/chibios/GENERIC_STM32_F303XC/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/mcuconf.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F303XC/configs/mcuconf.h rename to platforms/chibios/boards/GENERIC_STM32_F303XC/configs/mcuconf.h diff --git a/platforms/chibios/GENERIC_STM32_F407XE/board/board.mk b/platforms/chibios/boards/GENERIC_STM32_F407XE/board/board.mk similarity index 100% rename from platforms/chibios/GENERIC_STM32_F407XE/board/board.mk rename to platforms/chibios/boards/GENERIC_STM32_F407XE/board/board.mk diff --git a/platforms/chibios/GENERIC_STM32_F407XE/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/board.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F407XE/configs/board.h rename to platforms/chibios/boards/GENERIC_STM32_F407XE/configs/board.h diff --git a/platforms/chibios/GENERIC_STM32_F407XE/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/config.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F407XE/configs/config.h rename to platforms/chibios/boards/GENERIC_STM32_F407XE/configs/config.h diff --git a/platforms/chibios/GENERIC_STM32_F407XE/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/mcuconf.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F407XE/configs/mcuconf.h rename to platforms/chibios/boards/GENERIC_STM32_F407XE/configs/mcuconf.h diff --git a/platforms/chibios/GENERIC_STM32_F446XE/board/board.mk b/platforms/chibios/boards/GENERIC_STM32_F446XE/board/board.mk similarity index 100% rename from platforms/chibios/GENERIC_STM32_F446XE/board/board.mk rename to platforms/chibios/boards/GENERIC_STM32_F446XE/board/board.mk diff --git a/platforms/chibios/GENERIC_STM32_F446XE/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/board.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F446XE/configs/board.h rename to platforms/chibios/boards/GENERIC_STM32_F446XE/configs/board.h diff --git a/platforms/chibios/GENERIC_STM32_F446XE/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/config.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F446XE/configs/config.h rename to platforms/chibios/boards/GENERIC_STM32_F446XE/configs/config.h diff --git a/platforms/chibios/GENERIC_STM32_F446XE/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/mcuconf.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_F446XE/configs/mcuconf.h rename to platforms/chibios/boards/GENERIC_STM32_F446XE/configs/mcuconf.h diff --git a/platforms/chibios/GENERIC_STM32_G431XB/board/board.mk b/platforms/chibios/boards/GENERIC_STM32_G431XB/board/board.mk similarity index 100% rename from platforms/chibios/GENERIC_STM32_G431XB/board/board.mk rename to platforms/chibios/boards/GENERIC_STM32_G431XB/board/board.mk diff --git a/platforms/chibios/GENERIC_STM32_G431XB/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/config.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_G431XB/configs/config.h rename to platforms/chibios/boards/GENERIC_STM32_G431XB/configs/config.h diff --git a/platforms/chibios/GENERIC_STM32_G431XB/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/mcuconf.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_G431XB/configs/mcuconf.h rename to platforms/chibios/boards/GENERIC_STM32_G431XB/configs/mcuconf.h diff --git a/platforms/chibios/GENERIC_STM32_G474XE/board/board.mk b/platforms/chibios/boards/GENERIC_STM32_G474XE/board/board.mk similarity index 100% rename from platforms/chibios/GENERIC_STM32_G474XE/board/board.mk rename to platforms/chibios/boards/GENERIC_STM32_G474XE/board/board.mk diff --git a/platforms/chibios/GENERIC_STM32_G474XE/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_G474XE/configs/config.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_G474XE/configs/config.h rename to platforms/chibios/boards/GENERIC_STM32_G474XE/configs/config.h diff --git a/platforms/chibios/GENERIC_STM32_G474XE/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_G474XE/configs/mcuconf.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_G474XE/configs/mcuconf.h rename to platforms/chibios/boards/GENERIC_STM32_G474XE/configs/mcuconf.h diff --git a/platforms/chibios/GENERIC_STM32_L412XB/board/board.mk b/platforms/chibios/boards/GENERIC_STM32_L412XB/board/board.mk similarity index 100% rename from platforms/chibios/GENERIC_STM32_L412XB/board/board.mk rename to platforms/chibios/boards/GENERIC_STM32_L412XB/board/board.mk diff --git a/platforms/chibios/GENERIC_STM32_L412XB/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/board.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_L412XB/configs/board.h rename to platforms/chibios/boards/GENERIC_STM32_L412XB/configs/board.h diff --git a/platforms/chibios/GENERIC_STM32_L412XB/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/config.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_L412XB/configs/config.h rename to platforms/chibios/boards/GENERIC_STM32_L412XB/configs/config.h diff --git a/platforms/chibios/GENERIC_STM32_L412XB/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/mcuconf.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_L412XB/configs/mcuconf.h rename to platforms/chibios/boards/GENERIC_STM32_L412XB/configs/mcuconf.h diff --git a/platforms/chibios/GENERIC_STM32_L433XC/board/board.mk b/platforms/chibios/boards/GENERIC_STM32_L433XC/board/board.mk similarity index 100% rename from platforms/chibios/GENERIC_STM32_L433XC/board/board.mk rename to platforms/chibios/boards/GENERIC_STM32_L433XC/board/board.mk diff --git a/platforms/chibios/GENERIC_STM32_L433XC/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/board.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_L433XC/configs/board.h rename to platforms/chibios/boards/GENERIC_STM32_L433XC/configs/board.h diff --git a/platforms/chibios/GENERIC_STM32_L433XC/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/config.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_L433XC/configs/config.h rename to platforms/chibios/boards/GENERIC_STM32_L433XC/configs/config.h diff --git a/platforms/chibios/GENERIC_STM32_L433XC/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/mcuconf.h similarity index 100% rename from platforms/chibios/GENERIC_STM32_L433XC/configs/mcuconf.h rename to platforms/chibios/boards/GENERIC_STM32_L433XC/configs/mcuconf.h diff --git a/platforms/chibios/IC_TEENSY_3_1/board/board.c b/platforms/chibios/boards/IC_TEENSY_3_1/board/board.c similarity index 100% rename from platforms/chibios/IC_TEENSY_3_1/board/board.c rename to platforms/chibios/boards/IC_TEENSY_3_1/board/board.c diff --git a/platforms/chibios/IC_TEENSY_3_1/board/board.h b/platforms/chibios/boards/IC_TEENSY_3_1/board/board.h similarity index 100% rename from platforms/chibios/IC_TEENSY_3_1/board/board.h rename to platforms/chibios/boards/IC_TEENSY_3_1/board/board.h diff --git a/platforms/chibios/IC_TEENSY_3_1/board/board.mk b/platforms/chibios/boards/IC_TEENSY_3_1/board/board.mk similarity index 100% rename from platforms/chibios/IC_TEENSY_3_1/board/board.mk rename to platforms/chibios/boards/IC_TEENSY_3_1/board/board.mk diff --git a/platforms/chibios/IC_TEENSY_4_1/board/board.mk b/platforms/chibios/boards/IC_TEENSY_4_1/board/board.mk similarity index 100% rename from platforms/chibios/IC_TEENSY_4_1/board/board.mk rename to platforms/chibios/boards/IC_TEENSY_4_1/board/board.mk diff --git a/platforms/chibios/IC_TEENSY_4_1/rules.mk b/platforms/chibios/boards/IC_TEENSY_4_1/rules.mk similarity index 100% rename from platforms/chibios/IC_TEENSY_4_1/rules.mk rename to platforms/chibios/boards/IC_TEENSY_4_1/rules.mk diff --git a/platforms/chibios/QMK_PROTON_C/board/board.mk b/platforms/chibios/boards/QMK_PROTON_C/board/board.mk similarity index 100% rename from platforms/chibios/QMK_PROTON_C/board/board.mk rename to platforms/chibios/boards/QMK_PROTON_C/board/board.mk diff --git a/platforms/chibios/QMK_PROTON_C/configs/board.h b/platforms/chibios/boards/QMK_PROTON_C/configs/board.h similarity index 100% rename from platforms/chibios/QMK_PROTON_C/configs/board.h rename to platforms/chibios/boards/QMK_PROTON_C/configs/board.h diff --git a/platforms/chibios/QMK_PROTON_C/configs/bootloader_defs.h b/platforms/chibios/boards/QMK_PROTON_C/configs/bootloader_defs.h similarity index 100% rename from platforms/chibios/QMK_PROTON_C/configs/bootloader_defs.h rename to platforms/chibios/boards/QMK_PROTON_C/configs/bootloader_defs.h diff --git a/platforms/chibios/QMK_PROTON_C/configs/chconf.h b/platforms/chibios/boards/QMK_PROTON_C/configs/chconf.h similarity index 100% rename from platforms/chibios/QMK_PROTON_C/configs/chconf.h rename to platforms/chibios/boards/QMK_PROTON_C/configs/chconf.h diff --git a/platforms/chibios/QMK_PROTON_C/configs/config.h b/platforms/chibios/boards/QMK_PROTON_C/configs/config.h similarity index 100% rename from platforms/chibios/QMK_PROTON_C/configs/config.h rename to platforms/chibios/boards/QMK_PROTON_C/configs/config.h diff --git a/platforms/chibios/QMK_PROTON_C/configs/halconf.h b/platforms/chibios/boards/QMK_PROTON_C/configs/halconf.h similarity index 100% rename from platforms/chibios/QMK_PROTON_C/configs/halconf.h rename to platforms/chibios/boards/QMK_PROTON_C/configs/halconf.h diff --git a/platforms/chibios/QMK_PROTON_C/configs/mcuconf.h b/platforms/chibios/boards/QMK_PROTON_C/configs/mcuconf.h similarity index 100% rename from platforms/chibios/QMK_PROTON_C/configs/mcuconf.h rename to platforms/chibios/boards/QMK_PROTON_C/configs/mcuconf.h diff --git a/platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk b/platforms/chibios/boards/QMK_PROTON_C/convert_to_proton_c.mk similarity index 100% rename from platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk rename to platforms/chibios/boards/QMK_PROTON_C/convert_to_proton_c.mk diff --git a/platforms/chibios/STM32_F103_STM32DUINO/board/board.c b/platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.c similarity index 100% rename from platforms/chibios/STM32_F103_STM32DUINO/board/board.c rename to platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.c diff --git a/platforms/chibios/STM32_F103_STM32DUINO/board/board.h b/platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.h similarity index 100% rename from platforms/chibios/STM32_F103_STM32DUINO/board/board.h rename to platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.h diff --git a/platforms/chibios/STM32_F103_STM32DUINO/board/board.mk b/platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.mk similarity index 100% rename from platforms/chibios/STM32_F103_STM32DUINO/board/board.mk rename to platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.mk diff --git a/platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h b/platforms/chibios/boards/STM32_F103_STM32DUINO/configs/mcuconf.h similarity index 100% rename from platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h rename to platforms/chibios/boards/STM32_F103_STM32DUINO/configs/mcuconf.h diff --git a/platforms/chibios/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld similarity index 100% rename from platforms/chibios/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld rename to platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld diff --git a/platforms/chibios/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld similarity index 100% rename from platforms/chibios/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld rename to platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld diff --git a/platforms/chibios/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld similarity index 100% rename from platforms/chibios/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld rename to platforms/chibios/boards/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld diff --git a/platforms/chibios/common/configs/chconf.h b/platforms/chibios/boards/common/configs/chconf.h similarity index 100% rename from platforms/chibios/common/configs/chconf.h rename to platforms/chibios/boards/common/configs/chconf.h diff --git a/platforms/chibios/common/configs/halconf.h b/platforms/chibios/boards/common/configs/halconf.h similarity index 100% rename from platforms/chibios/common/configs/halconf.h rename to platforms/chibios/boards/common/configs/halconf.h diff --git a/platforms/chibios/common/ld/MKL26Z64.ld b/platforms/chibios/boards/common/ld/MKL26Z64.ld similarity index 100% rename from platforms/chibios/common/ld/MKL26Z64.ld rename to platforms/chibios/boards/common/ld/MKL26Z64.ld diff --git a/platforms/chibios/common/ld/STM32L412xB.ld b/platforms/chibios/boards/common/ld/STM32L412xB.ld similarity index 100% rename from platforms/chibios/common/ld/STM32L412xB.ld rename to platforms/chibios/boards/common/ld/STM32L412xB.ld diff --git a/platforms/chibios/keyboard-config-templates/board.h b/platforms/chibios/boards/keyboard-config-templates/board.h similarity index 100% rename from platforms/chibios/keyboard-config-templates/board.h rename to platforms/chibios/boards/keyboard-config-templates/board.h diff --git a/platforms/chibios/keyboard-config-templates/chconf.h b/platforms/chibios/boards/keyboard-config-templates/chconf.h similarity index 100% rename from platforms/chibios/keyboard-config-templates/chconf.h rename to platforms/chibios/boards/keyboard-config-templates/chconf.h diff --git a/platforms/chibios/keyboard-config-templates/halconf.h b/platforms/chibios/boards/keyboard-config-templates/halconf.h similarity index 100% rename from platforms/chibios/keyboard-config-templates/halconf.h rename to platforms/chibios/boards/keyboard-config-templates/halconf.h diff --git a/platforms/chibios/keyboard-config-templates/mcuconf.h b/platforms/chibios/boards/keyboard-config-templates/mcuconf.h similarity index 100% rename from platforms/chibios/keyboard-config-templates/mcuconf.h rename to platforms/chibios/boards/keyboard-config-templates/mcuconf.h diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 28aaaecba..7962516a0 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -67,9 +67,9 @@ else ifneq ("$(wildcard $(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 +else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/board/board.mk)","") + BOARD_PATH = $(TOP_DIR)/platforms/chibios/boards/$(BOARD) + BOARD_MK += $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/board/board.mk KEYBOARD_PATHS += $(BOARD_PATH)/configs ifneq ("$(wildcard $(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) 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 -else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/common/configs/chconf.h)","") - CHCONFDIR = $(TOP_DIR)/platforms/chibios/common/configs +else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs/chconf.h)","") + CHCONFDIR = $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs +else ifneq ("$(wildcard $(TOP_DIR)/platforms/boards/chibios/common/configs/chconf.h)","") + CHCONFDIR = $(TOP_DIR)/platforms/chibios/boards/common/configs endif ifneq ("$(wildcard $(KEYBOARD_PATH_5)/halconf.h)","") @@ -140,10 +140,10 @@ 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 -else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/common/configs/halconf.h)","") - HALCONFDIR = $(TOP_DIR)/platforms/chibios/common/configs +else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs/halconf.h)","") + HALCONFDIR = $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs +else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/common/configs/halconf.h)","") + HALCONFDIR = $(TOP_DIR)/platforms/chibios/boards/common/configs endif # 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 else ifneq ("$(wildcard $(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)","") - LDFLAGS += -L$(TOP_DIR)/platforms/chibios/$(BOARD)/ld - LDSCRIPT = $(TOP_DIR)/platforms/chibios/$(BOARD)/ld/$(MCU_LDSCRIPT).ld -else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/common/ld/$(MCU_LDSCRIPT).ld)","") - LDSCRIPT = $(TOP_DIR)/platforms/chibios/common/ld/$(MCU_LDSCRIPT).ld +else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld/$(MCU_LDSCRIPT).ld)","") + LDFLAGS += -L$(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld + LDSCRIPT = $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld/$(MCU_LDSCRIPT).ld +else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/common/ld/$(MCU_LDSCRIPT).ld)","") + LDSCRIPT = $(TOP_DIR)/platforms/chibios/boards/common/ld/$(MCU_LDSCRIPT).ld else ifneq ("$(wildcard $(STARTUPLD_CONTRIB)/$(MCU_LDSCRIPT).ld)","") LDSCRIPT = $(STARTUPLD_CONTRIB)/$(MCU_LDSCRIPT).ld USE_CHIBIOS_CONTRIB = yes @@ -219,8 +219,8 @@ QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM) $(PLATFORMASM) CHIBISRC := $(patsubst $(TOP_DIR)/%,%,$(CHIBISRC)) EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \ - $(TOP_DIR)/platforms/chibios/$(BOARD)/configs \ - $(TOP_DIR)/platforms/chibios/common/configs \ + $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs \ + $(TOP_DIR)/platforms/chibios/boards/common/configs \ $(HALCONFDIR) $(CHCONFDIR) \ $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ @@ -241,7 +241,7 @@ 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)","") +else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs/halconf_community.h)","") USE_CHIBIOS_CONTRIB = yes endif