80 files changed, 20 insertions(+), 20 deletions(-)

M build_keyboard.mk
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F401/board/board.mk
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F401/configs/board.h
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F401/configs/bootloader_defs.h
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F401/configs/config.h
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F401/configs/mcuconf.h
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/board/board.mk
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/configs/board.h
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/configs/bootloader_defs.h
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/configs/config.h
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/configs/mcuconf.h
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld
R platforms/chibios/{ => boards}/BLACKPILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld
R platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/board/board.c
R platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/board/board.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/board/board.mk
R platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/configs/bootloader_defs.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/configs/config.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F042X6/configs/mcuconf.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F072XB/board/board.mk
R platforms/chibios/{ => boards}/GENERIC_STM32_F072XB/configs/board.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F072XB/configs/bootloader_defs.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F072XB/configs/config.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F072XB/configs/mcuconf.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F303XC/board/board.mk
R platforms/chibios/{ => boards}/GENERIC_STM32_F303XC/configs/board.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F303XC/configs/bootloader_defs.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F303XC/configs/config.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F303XC/configs/mcuconf.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F407XE/board/board.mk
R platforms/chibios/{ => boards}/GENERIC_STM32_F407XE/configs/board.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F407XE/configs/config.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F407XE/configs/mcuconf.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F446XE/board/board.mk
R platforms/chibios/{ => boards}/GENERIC_STM32_F446XE/configs/board.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F446XE/configs/config.h
R platforms/chibios/{ => boards}/GENERIC_STM32_F446XE/configs/mcuconf.h
R platforms/chibios/{ => boards}/GENERIC_STM32_G431XB/board/board.mk
R platforms/chibios/{ => boards}/GENERIC_STM32_G431XB/configs/config.h
R platforms/chibios/{ => boards}/GENERIC_STM32_G431XB/configs/mcuconf.h
R platforms/chibios/{ => boards}/GENERIC_STM32_G474XE/board/board.mk
R platforms/chibios/{ => boards}/GENERIC_STM32_G474XE/configs/config.h
R platforms/chibios/{ => boards}/GENERIC_STM32_G474XE/configs/mcuconf.h
R platforms/chibios/{ => boards}/GENERIC_STM32_L412XB/board/board.mk
R platforms/chibios/{ => boards}/GENERIC_STM32_L412XB/configs/board.h
R platforms/chibios/{ => boards}/GENERIC_STM32_L412XB/configs/config.h
R platforms/chibios/{ => boards}/GENERIC_STM32_L412XB/configs/mcuconf.h
R platforms/chibios/{ => boards}/GENERIC_STM32_L433XC/board/board.mk
R platforms/chibios/{ => boards}/GENERIC_STM32_L433XC/configs/board.h
R platforms/chibios/{ => boards}/GENERIC_STM32_L433XC/configs/config.h
R platforms/chibios/{ => boards}/GENERIC_STM32_L433XC/configs/mcuconf.h
R platforms/chibios/{ => boards}/IC_TEENSY_3_1/board/board.c
R platforms/chibios/{ => boards}/IC_TEENSY_3_1/board/board.h
R platforms/chibios/{ => boards}/IC_TEENSY_3_1/board/board.mk
R platforms/chibios/{ => boards}/IC_TEENSY_4_1/board/board.mk
R platforms/chibios/{ => boards}/IC_TEENSY_4_1/rules.mk
R platforms/chibios/{ => boards}/QMK_PROTON_C/board/board.mk
R platforms/chibios/{ => boards}/QMK_PROTON_C/configs/board.h
R platforms/chibios/{ => boards}/QMK_PROTON_C/configs/bootloader_defs.h
R platforms/chibios/{ => boards}/QMK_PROTON_C/configs/chconf.h
R platforms/chibios/{ => boards}/QMK_PROTON_C/configs/config.h
R platforms/chibios/{ => boards}/QMK_PROTON_C/configs/halconf.h
R platforms/chibios/{ => boards}/QMK_PROTON_C/configs/mcuconf.h
R platforms/chibios/{ => boards}/QMK_PROTON_C/convert_to_proton_c.mk
R platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/board/board.c
R platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/board/board.h
R platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/board/board.mk
R platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/configs/mcuconf.h
R platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld
R platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld
R platforms/chibios/{ => boards}/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld
R platforms/chibios/{ => boards}/common/configs/chconf.h
R platforms/chibios/{ => boards}/common/configs/halconf.h
R platforms/chibios/{ => boards}/common/ld/MKL26Z64.ld
R platforms/chibios/{ => boards}/common/ld/STM32L412xB.ld
R platforms/chibios/{ => boards}/keyboard-config-templates/board.h
R platforms/chibios/{ => boards}/keyboard-config-templates/chconf.h
R platforms/chibios/{ => boards}/keyboard-config-templates/halconf.h
R platforms/chibios/{ => boards}/keyboard-config-templates/mcuconf.h
M tmk_core/chibios.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

@@ 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