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

) * Move board files * fix up after rebase
studiokestra · Aug 17, 2021 · 4c9003b · 4c9003b
1 parent 4c4f632
commit 4c9003b
Show file tree

Hide file tree

Showing 80 changed files with 20 additions and 20 deletions.
diff --git 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/...ibios/BLACKPILL_STM32_F401/board/board.mk → ...oards/BLACKPILL_STM32_F401/board/board.mk b/...ibios/BLACKPILL_STM32_F401/board/board.mk → ...oards/BLACKPILL_STM32_F401/board/board.mk
diff --git a/...bios/BLACKPILL_STM32_F401/configs/board.h → ...ards/BLACKPILL_STM32_F401/configs/board.h b/...bios/BLACKPILL_STM32_F401/configs/board.h → ...ards/BLACKPILL_STM32_F401/configs/board.h
diff --git a/...PILL_STM32_F401/configs/bootloader_defs.h → ...PILL_STM32_F401/configs/bootloader_defs.h b/...PILL_STM32_F401/configs/bootloader_defs.h → ...PILL_STM32_F401/configs/bootloader_defs.h
diff --git a/...ios/BLACKPILL_STM32_F401/configs/config.h → ...rds/BLACKPILL_STM32_F401/configs/config.h b/...ios/BLACKPILL_STM32_F401/configs/config.h → ...rds/BLACKPILL_STM32_F401/configs/config.h
diff --git a/...os/BLACKPILL_STM32_F401/configs/mcuconf.h → ...ds/BLACKPILL_STM32_F401/configs/mcuconf.h b/...os/BLACKPILL_STM32_F401/configs/mcuconf.h → ...ds/BLACKPILL_STM32_F401/configs/mcuconf.h
diff --git a/...ibios/BLACKPILL_STM32_F411/board/board.mk → ...oards/BLACKPILL_STM32_F411/board/board.mk b/...ibios/BLACKPILL_STM32_F411/board/board.mk → ...oards/BLACKPILL_STM32_F411/board/board.mk
diff --git a/...bios/BLACKPILL_STM32_F411/configs/board.h → ...ards/BLACKPILL_STM32_F411/configs/board.h b/...bios/BLACKPILL_STM32_F411/configs/board.h → ...ards/BLACKPILL_STM32_F411/configs/board.h
diff --git a/...PILL_STM32_F411/configs/bootloader_defs.h → ...PILL_STM32_F411/configs/bootloader_defs.h b/...PILL_STM32_F411/configs/bootloader_defs.h → ...PILL_STM32_F411/configs/bootloader_defs.h
diff --git a/...ios/BLACKPILL_STM32_F411/configs/config.h → ...rds/BLACKPILL_STM32_F411/configs/config.h b/...ios/BLACKPILL_STM32_F411/configs/config.h → ...rds/BLACKPILL_STM32_F411/configs/config.h
diff --git a/...os/BLACKPILL_STM32_F411/configs/mcuconf.h → ...ds/BLACKPILL_STM32_F411/configs/mcuconf.h b/...os/BLACKPILL_STM32_F411/configs/mcuconf.h → ...ds/BLACKPILL_STM32_F411/configs/mcuconf.h
diff --git a/...PILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld → ...PILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld b/...PILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld → ...PILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld
diff --git a/...PILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld → ...PILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld b/...PILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld → ...PILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld
diff --git a/...hibios/GENERIC_STM32_F042X6/board/board.c → ...boards/GENERIC_STM32_F042X6/board/board.c b/...hibios/GENERIC_STM32_F042X6/board/board.c → ...boards/GENERIC_STM32_F042X6/board/board.c
diff --git a/...hibios/GENERIC_STM32_F042X6/board/board.h → ...boards/GENERIC_STM32_F042X6/board/board.h b/...hibios/GENERIC_STM32_F042X6/board/board.h → ...boards/GENERIC_STM32_F042X6/board/board.h
diff --git a/...ibios/GENERIC_STM32_F042X6/board/board.mk → ...oards/GENERIC_STM32_F042X6/board/board.mk b/...ibios/GENERIC_STM32_F042X6/board/board.mk → ...oards/GENERIC_STM32_F042X6/board/board.mk
diff --git a/...IC_STM32_F042X6/configs/bootloader_defs.h → ...IC_STM32_F042X6/configs/bootloader_defs.h b/...IC_STM32_F042X6/configs/bootloader_defs.h → ...IC_STM32_F042X6/configs/bootloader_defs.h
diff --git a/...ios/GENERIC_STM32_F042X6/configs/config.h → ...rds/GENERIC_STM32_F042X6/configs/config.h b/...ios/GENERIC_STM32_F042X6/configs/config.h → ...rds/GENERIC_STM32_F042X6/configs/config.h
diff --git a/...os/GENERIC_STM32_F042X6/configs/mcuconf.h → ...ds/GENERIC_STM32_F042X6/configs/mcuconf.h b/...os/GENERIC_STM32_F042X6/configs/mcuconf.h → ...ds/GENERIC_STM32_F042X6/configs/mcuconf.h
diff --git a/...ibios/GENERIC_STM32_F072XB/board/board.mk → ...oards/GENERIC_STM32_F072XB/board/board.mk b/...ibios/GENERIC_STM32_F072XB/board/board.mk → ...oards/GENERIC_STM32_F072XB/board/board.mk
diff --git a/...bios/GENERIC_STM32_F072XB/configs/board.h → ...ards/GENERIC_STM32_F072XB/configs/board.h b/...bios/GENERIC_STM32_F072XB/configs/board.h → ...ards/GENERIC_STM32_F072XB/configs/board.h
diff --git a/...IC_STM32_F072XB/configs/bootloader_defs.h → ...IC_STM32_F072XB/configs/bootloader_defs.h b/...IC_STM32_F072XB/configs/bootloader_defs.h → ...IC_STM32_F072XB/configs/bootloader_defs.h
diff --git a/...ios/GENERIC_STM32_F072XB/configs/config.h → ...rds/GENERIC_STM32_F072XB/configs/config.h b/...ios/GENERIC_STM32_F072XB/configs/config.h → ...rds/GENERIC_STM32_F072XB/configs/config.h
diff --git a/...os/GENERIC_STM32_F072XB/configs/mcuconf.h → ...ds/GENERIC_STM32_F072XB/configs/mcuconf.h b/...os/GENERIC_STM32_F072XB/configs/mcuconf.h → ...ds/GENERIC_STM32_F072XB/configs/mcuconf.h
diff --git a/...ibios/GENERIC_STM32_F303XC/board/board.mk → ...oards/GENERIC_STM32_F303XC/board/board.mk b/...ibios/GENERIC_STM32_F303XC/board/board.mk → ...oards/GENERIC_STM32_F303XC/board/board.mk
diff --git a/...bios/GENERIC_STM32_F303XC/configs/board.h → ...ards/GENERIC_STM32_F303XC/configs/board.h b/...bios/GENERIC_STM32_F303XC/configs/board.h → ...ards/GENERIC_STM32_F303XC/configs/board.h
diff --git a/...IC_STM32_F303XC/configs/bootloader_defs.h → ...IC_STM32_F303XC/configs/bootloader_defs.h b/...IC_STM32_F303XC/configs/bootloader_defs.h → ...IC_STM32_F303XC/configs/bootloader_defs.h
diff --git a/...ios/GENERIC_STM32_F303XC/configs/config.h → ...rds/GENERIC_STM32_F303XC/configs/config.h b/...ios/GENERIC_STM32_F303XC/configs/config.h → ...rds/GENERIC_STM32_F303XC/configs/config.h
diff --git a/...os/GENERIC_STM32_F303XC/configs/mcuconf.h → ...ds/GENERIC_STM32_F303XC/configs/mcuconf.h b/...os/GENERIC_STM32_F303XC/configs/mcuconf.h → ...ds/GENERIC_STM32_F303XC/configs/mcuconf.h
diff --git a/...ibios/GENERIC_STM32_F407XE/board/board.mk → ...oards/GENERIC_STM32_F407XE/board/board.mk b/...ibios/GENERIC_STM32_F407XE/board/board.mk → ...oards/GENERIC_STM32_F407XE/board/board.mk
diff --git a/...bios/GENERIC_STM32_F407XE/configs/board.h → ...ards/GENERIC_STM32_F407XE/configs/board.h b/...bios/GENERIC_STM32_F407XE/configs/board.h → ...ards/GENERIC_STM32_F407XE/configs/board.h
diff --git a/...ios/GENERIC_STM32_F407XE/configs/config.h → ...rds/GENERIC_STM32_F407XE/configs/config.h b/...ios/GENERIC_STM32_F407XE/configs/config.h → ...rds/GENERIC_STM32_F407XE/configs/config.h
diff --git a/...os/GENERIC_STM32_F407XE/configs/mcuconf.h → ...ds/GENERIC_STM32_F407XE/configs/mcuconf.h b/...os/GENERIC_STM32_F407XE/configs/mcuconf.h → ...ds/GENERIC_STM32_F407XE/configs/mcuconf.h
diff --git a/...ibios/GENERIC_STM32_F446XE/board/board.mk → ...oards/GENERIC_STM32_F446XE/board/board.mk b/...ibios/GENERIC_STM32_F446XE/board/board.mk → ...oards/GENERIC_STM32_F446XE/board/board.mk
diff --git a/...bios/GENERIC_STM32_F446XE/configs/board.h → ...ards/GENERIC_STM32_F446XE/configs/board.h b/...bios/GENERIC_STM32_F446XE/configs/board.h → ...ards/GENERIC_STM32_F446XE/configs/board.h
diff --git a/...ios/GENERIC_STM32_F446XE/configs/config.h → ...rds/GENERIC_STM32_F446XE/configs/config.h b/...ios/GENERIC_STM32_F446XE/configs/config.h → ...rds/GENERIC_STM32_F446XE/configs/config.h
diff --git a/...os/GENERIC_STM32_F446XE/configs/mcuconf.h → ...ds/GENERIC_STM32_F446XE/configs/mcuconf.h b/...os/GENERIC_STM32_F446XE/configs/mcuconf.h → ...ds/GENERIC_STM32_F446XE/configs/mcuconf.h
diff --git a/...ibios/GENERIC_STM32_G431XB/board/board.mk → ...oards/GENERIC_STM32_G431XB/board/board.mk b/...ibios/GENERIC_STM32_G431XB/board/board.mk → ...oards/GENERIC_STM32_G431XB/board/board.mk
diff --git a/...ios/GENERIC_STM32_G431XB/configs/config.h → ...rds/GENERIC_STM32_G431XB/configs/config.h b/...ios/GENERIC_STM32_G431XB/configs/config.h → ...rds/GENERIC_STM32_G431XB/configs/config.h
diff --git a/...os/GENERIC_STM32_G431XB/configs/mcuconf.h → ...ds/GENERIC_STM32_G431XB/configs/mcuconf.h b/...os/GENERIC_STM32_G431XB/configs/mcuconf.h → ...ds/GENERIC_STM32_G431XB/configs/mcuconf.h
diff --git a/...ibios/GENERIC_STM32_G474XE/board/board.mk → ...oards/GENERIC_STM32_G474XE/board/board.mk b/...ibios/GENERIC_STM32_G474XE/board/board.mk → ...oards/GENERIC_STM32_G474XE/board/board.mk
diff --git a/...ios/GENERIC_STM32_G474XE/configs/config.h → ...rds/GENERIC_STM32_G474XE/configs/config.h b/...ios/GENERIC_STM32_G474XE/configs/config.h → ...rds/GENERIC_STM32_G474XE/configs/config.h
diff --git a/...os/GENERIC_STM32_G474XE/configs/mcuconf.h → ...ds/GENERIC_STM32_G474XE/configs/mcuconf.h b/...os/GENERIC_STM32_G474XE/configs/mcuconf.h → ...ds/GENERIC_STM32_G474XE/configs/mcuconf.h
diff --git a/...ibios/GENERIC_STM32_L412XB/board/board.mk → ...oards/GENERIC_STM32_L412XB/board/board.mk b/...ibios/GENERIC_STM32_L412XB/board/board.mk → ...oards/GENERIC_STM32_L412XB/board/board.mk
diff --git a/...bios/GENERIC_STM32_L412XB/configs/board.h → ...ards/GENERIC_STM32_L412XB/configs/board.h b/...bios/GENERIC_STM32_L412XB/configs/board.h → ...ards/GENERIC_STM32_L412XB/configs/board.h
diff --git a/...ios/GENERIC_STM32_L412XB/configs/config.h → ...rds/GENERIC_STM32_L412XB/configs/config.h b/...ios/GENERIC_STM32_L412XB/configs/config.h → ...rds/GENERIC_STM32_L412XB/configs/config.h
diff --git a/...os/GENERIC_STM32_L412XB/configs/mcuconf.h → ...ds/GENERIC_STM32_L412XB/configs/mcuconf.h b/...os/GENERIC_STM32_L412XB/configs/mcuconf.h → ...ds/GENERIC_STM32_L412XB/configs/mcuconf.h
diff --git a/...ibios/GENERIC_STM32_L433XC/board/board.mk → ...oards/GENERIC_STM32_L433XC/board/board.mk b/...ibios/GENERIC_STM32_L433XC/board/board.mk → ...oards/GENERIC_STM32_L433XC/board/board.mk
diff --git a/...bios/GENERIC_STM32_L433XC/configs/board.h → ...ards/GENERIC_STM32_L433XC/configs/board.h b/...bios/GENERIC_STM32_L433XC/configs/board.h → ...ards/GENERIC_STM32_L433XC/configs/board.h
diff --git a/...ios/GENERIC_STM32_L433XC/configs/config.h → ...rds/GENERIC_STM32_L433XC/configs/config.h b/...ios/GENERIC_STM32_L433XC/configs/config.h → ...rds/GENERIC_STM32_L433XC/configs/config.h
diff --git a/...os/GENERIC_STM32_L433XC/configs/mcuconf.h → ...ds/GENERIC_STM32_L433XC/configs/mcuconf.h b/...os/GENERIC_STM32_L433XC/configs/mcuconf.h → ...ds/GENERIC_STM32_L433XC/configs/mcuconf.h
diff --git a/...forms/chibios/IC_TEENSY_3_1/board/board.c → ...hibios/boards/IC_TEENSY_3_1/board/board.c b/...forms/chibios/IC_TEENSY_3_1/board/board.c → ...hibios/boards/IC_TEENSY_3_1/board/board.c
diff --git a/...forms/chibios/IC_TEENSY_3_1/board/board.h → ...hibios/boards/IC_TEENSY_3_1/board/board.h b/...forms/chibios/IC_TEENSY_3_1/board/board.h → ...hibios/boards/IC_TEENSY_3_1/board/board.h
diff --git a/...orms/chibios/IC_TEENSY_3_1/board/board.mk → ...ibios/boards/IC_TEENSY_3_1/board/board.mk b/...orms/chibios/IC_TEENSY_3_1/board/board.mk → ...ibios/boards/IC_TEENSY_3_1/board/board.mk
diff --git a/...orms/chibios/IC_TEENSY_4_1/board/board.mk → ...ibios/boards/IC_TEENSY_4_1/board/board.mk b/...orms/chibios/IC_TEENSY_4_1/board/board.mk → ...ibios/boards/IC_TEENSY_4_1/board/board.mk
diff --git a/platforms/chibios/IC_TEENSY_4_1/rules.mk → ...rms/chibios/boards/IC_TEENSY_4_1/rules.mk b/platforms/chibios/IC_TEENSY_4_1/rules.mk → ...rms/chibios/boards/IC_TEENSY_4_1/rules.mk
diff --git a/...forms/chibios/QMK_PROTON_C/board/board.mk → ...hibios/boards/QMK_PROTON_C/board/board.mk b/...forms/chibios/QMK_PROTON_C/board/board.mk → ...hibios/boards/QMK_PROTON_C/board/board.mk
diff --git a/...orms/chibios/QMK_PROTON_C/configs/board.h → ...ibios/boards/QMK_PROTON_C/configs/board.h b/...orms/chibios/QMK_PROTON_C/configs/board.h → ...ibios/boards/QMK_PROTON_C/configs/board.h
diff --git a/...os/QMK_PROTON_C/configs/bootloader_defs.h → ...ds/QMK_PROTON_C/configs/bootloader_defs.h b/...os/QMK_PROTON_C/configs/bootloader_defs.h → ...ds/QMK_PROTON_C/configs/bootloader_defs.h
diff --git a/...rms/chibios/QMK_PROTON_C/configs/chconf.h → ...bios/boards/QMK_PROTON_C/configs/chconf.h b/...rms/chibios/QMK_PROTON_C/configs/chconf.h → ...bios/boards/QMK_PROTON_C/configs/chconf.h
diff --git a/...rms/chibios/QMK_PROTON_C/configs/config.h → ...bios/boards/QMK_PROTON_C/configs/config.h b/...rms/chibios/QMK_PROTON_C/configs/config.h → ...bios/boards/QMK_PROTON_C/configs/config.h
diff --git a/...ms/chibios/QMK_PROTON_C/configs/halconf.h → ...ios/boards/QMK_PROTON_C/configs/halconf.h b/...ms/chibios/QMK_PROTON_C/configs/halconf.h → ...ios/boards/QMK_PROTON_C/configs/halconf.h
diff --git a/...ms/chibios/QMK_PROTON_C/configs/mcuconf.h → ...ios/boards/QMK_PROTON_C/configs/mcuconf.h b/...ms/chibios/QMK_PROTON_C/configs/mcuconf.h → ...ios/boards/QMK_PROTON_C/configs/mcuconf.h
diff --git a/...ibios/QMK_PROTON_C/convert_to_proton_c.mk → ...oards/QMK_PROTON_C/convert_to_proton_c.mk b/...ibios/QMK_PROTON_C/convert_to_proton_c.mk → ...oards/QMK_PROTON_C/convert_to_proton_c.mk
diff --git a/...ibios/STM32_F103_STM32DUINO/board/board.c → ...oards/STM32_F103_STM32DUINO/board/board.c b/...ibios/STM32_F103_STM32DUINO/board/board.c → ...oards/STM32_F103_STM32DUINO/board/board.c
diff --git a/...ibios/STM32_F103_STM32DUINO/board/board.h → ...oards/STM32_F103_STM32DUINO/board/board.h b/...ibios/STM32_F103_STM32DUINO/board/board.h → ...oards/STM32_F103_STM32DUINO/board/board.h
diff --git a/...bios/STM32_F103_STM32DUINO/board/board.mk → ...ards/STM32_F103_STM32DUINO/board/board.mk b/...bios/STM32_F103_STM32DUINO/board/board.mk → ...ards/STM32_F103_STM32DUINO/board/board.mk
diff --git a/...s/STM32_F103_STM32DUINO/configs/mcuconf.h → ...s/STM32_F103_STM32DUINO/configs/mcuconf.h b/...s/STM32_F103_STM32DUINO/configs/mcuconf.h → ...s/STM32_F103_STM32DUINO/configs/mcuconf.h
diff --git a/...O/ld/STM32F103x8_stm32duino_bootloader.ld → ...O/ld/STM32F103x8_stm32duino_bootloader.ld b/...O/ld/STM32F103x8_stm32duino_bootloader.ld → ...O/ld/STM32F103x8_stm32duino_bootloader.ld
diff --git a/...O/ld/STM32F103xB_stm32duino_bootloader.ld → ...O/ld/STM32F103xB_stm32duino_bootloader.ld b/...O/ld/STM32F103xB_stm32duino_bootloader.ld → ...O/ld/STM32F103xB_stm32duino_bootloader.ld
diff --git a/...2DUINO/ld/stm32duino_bootloader_common.ld → ...2DUINO/ld/stm32duino_bootloader_common.ld b/...2DUINO/ld/stm32duino_bootloader_common.ld → ...2DUINO/ld/stm32duino_bootloader_common.ld
diff --git a/platforms/chibios/common/configs/chconf.h → ...ms/chibios/boards/common/configs/chconf.h b/platforms/chibios/common/configs/chconf.h → ...ms/chibios/boards/common/configs/chconf.h
diff --git a/platforms/chibios/common/configs/halconf.h → ...s/chibios/boards/common/configs/halconf.h b/platforms/chibios/common/configs/halconf.h → ...s/chibios/boards/common/configs/halconf.h
diff --git a/platforms/chibios/common/ld/MKL26Z64.ld → ...orms/chibios/boards/common/ld/MKL26Z64.ld b/platforms/chibios/common/ld/MKL26Z64.ld → ...orms/chibios/boards/common/ld/MKL26Z64.ld
diff --git a/platforms/chibios/common/ld/STM32L412xB.ld → ...s/chibios/boards/common/ld/STM32L412xB.ld b/platforms/chibios/common/ld/STM32L412xB.ld → ...s/chibios/boards/common/ld/STM32L412xB.ld
diff --git a/...chibios/keyboard-config-templates/board.h → .../boards/keyboard-config-templates/board.h b/...chibios/keyboard-config-templates/board.h → .../boards/keyboard-config-templates/board.h
diff --git a/...hibios/keyboard-config-templates/chconf.h → ...boards/keyboard-config-templates/chconf.h b/...hibios/keyboard-config-templates/chconf.h → ...boards/keyboard-config-templates/chconf.h
diff --git a/...ibios/keyboard-config-templates/halconf.h → ...oards/keyboard-config-templates/halconf.h b/...ibios/keyboard-config-templates/halconf.h → ...oards/keyboard-config-templates/halconf.h
diff --git a/...ibios/keyboard-config-templates/mcuconf.h → ...oards/keyboard-config-templates/mcuconf.h b/...ibios/keyboard-config-templates/mcuconf.h → ...oards/keyboard-config-templates/mcuconf.h
diff --git 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