Branch point for 2023q2 Breaking Change.

.clangd

@@ -1,3 +0,0 @@
-CompileFlags:
-    Remove: -mcall-prologues
-    Add: -nostdinc

.github/labeler.yml

@@ -5,7 +5,6 @@ core:
   - tests/**/*
   - util/**/*
   - platforms/**/*
-  - builddefs/**/*
   - Makefile
   - '*.mk'
 dependencies:

.github/workflows/ci_builds.yml

@@ -1,60 +0,0 @@
-name: CI Builds
-
-permissions:
-  contents: read
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0,12 * * *'
-
-jobs:
-  ci_builds:
-    name: "CI Build"
-    runs-on: self-hosted
-    timeout-minutes: 1380
-
-    if: github.repository == 'qmk/qmk_firmware'
-
-    strategy:
-      fail-fast: false
-      matrix:
-        branch: [master, develop]
-        keymap: [default, via]
-
-    container: qmkfm/qmk_cli
-
-    steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-        ref: ${{ matrix.branch }}
-
-    - name: Install dependencies
-      run: pip3 install -r requirements.txt
-
-    - name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
-      run: |
-        export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
-        qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes || touch .failed
-        # Generate the step summary markdown
-        ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
-        # Truncate to a maximum of 1MB to deal with GitHub workflow limit
-        truncate --size='<960K' $GITHUB_STEP_SUMMARY || true
-        # Exit with failure if the compilation stage failed
-        [ ! -f .failed ] || exit 1
-
-    - name: 'Upload artifacts'
-      uses: actions/upload-artifact@v3
-      if: always()
-      with:
-        name: artifacts-${{ matrix.branch }}-${{ matrix.keymap }}
-        if-no-files-found: ignore
-        path: |
-          *.bin
-          *.hex
-          *.uf2
-          .build/failed.*

.github/workflows/cli.yml

@@ -21,13 +21,9 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
     - uses: actions/checkout@v3
       with:
         submodules: recursive
-
     - name: Install dependencies
       run: pip3 install -r requirements-dev.txt
     - name: Run tests

.github/workflows/format.yml

@@ -22,9 +22,6 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
@@ -35,7 +32,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v35
+      uses: tj-actions/changed-files@v34
 
     - name: Run qmk formatters
       shell: 'bash {0}'

.github/workflows/format_push.yml

@@ -16,9 +16,6 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0

.github/workflows/lint.yml

@@ -15,9 +15,6 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
@@ -27,7 +24,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v35
+      uses: tj-actions/changed-files@v34
 
     - name: Print info
       run: |

.github/workflows/regen.yml

@@ -16,9 +16,6 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
     - uses: actions/checkout@v3
 
     - name: Run qmk generators

.github/workflows/regen_push.yml

@@ -16,9 +16,6 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
     - uses: actions/checkout@v3
 
     - name: Run qmk generators

.github/workflows/stale.yml

@@ -13,7 +13,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v7
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 

.gitignore

@@ -52,12 +52,9 @@ quantum/version.h
 .history/
 build/
 cmake-build-debug
-# CMakeLists.txt
+CMakeLists.txt
 *.pdf
 
-# cmake toolchain downloads
-/toolchains
-
 # Let these ones be user specific, since we have so many different configurations
 *.code-workspace
 .stfolder

.vscode/cmake-kits.json

@@ -1,9 +0,0 @@
-[
-    {
-        "name": "AVR GCC",
-        "compilers": {
-            "CC": "C:\\QMK_MSYS\\mingw64\\bin\\avr-gcc.exe",
-            "CXX": "C:\\QMK_MSYS\\mingw64\\bin\\avr-g++.exe"
-        }
-    }
-]

.vscode/settings.json

@@ -5,8 +5,8 @@
     // Configure glob patterns for excluding files and folders.
     "files.exclude": {
         "**/.build": true,
-        // "**/*.hex": true,
-        // "**/*.bin": true,
+        "**/*.hex": true,
+        "**/*.bin": true,
         "**/*.uf2": true
     },
     "files.associations": {

.vscode/tasks.json

@@ -1,114 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Load Keyboard",
-            "dependsOrder": "sequence",
-            "dependsOn":[
-                "Only Load Keyboard",
-                "Configure CMake"
-            ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
-        },
-        {
-            "label": "Only Load Keyboard",
-            "type": "shell",
-            "command": "cmake -D QMK_KEYBOARD_FOLDER=\"${input:all_keyboards}\" -D QMK_KEYMAP_FOLDER=\"${input:keyboard_keymap}\" -P ${workspaceFolder}/cmake/ConfigureKeyboard.cmake",
-            "problemMatcher": []
-        },
-        {
-            "label": "Configure CMake",
-            "type": "cmake",
-            "command": "configure"
-        },
-        {
-            "label": "Build",
-            "problemMatcher": [
-                {
-                    "base": "$gcc",
-                    "fileLocation": ["relative", "${workspaceFolder}/build"]
-                },
-            ],
-            "options": {
-                "environment": {
-                    "CLICOLOR_FORCE": "1"
-                }
-            },
-            "type": "cmake",
-            "command": "build",
-            "targets":[
-                "${input:keyboard_target}"
-            ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-        },
-        // {
-        //     "label": "Rebuild",
-        //     "problemMatcher": [
-        //         {
-        //             "base": "$gcc",
-        //             "fileLocation": ["relative", "${workspaceFolder}/build"]
-        //         },
-        //     ],
-        //     "options": {
-        //         "environment": {
-        //             "CLICOLOR_FORCE": "1"
-        //         }
-        //     },
-        //     "type": "cmake",
-        //     "command": "cleanRebuild",
-        //     "targets":[
-        //         "${input:keyboard_target}"
-        //     ],
-        //     "group": {
-        //         "kind": "build",
-        //         "isDefault": true
-        //     },
-        // }
-    ],
-    "inputs": [
-        {
-            "id": "keyboard_target",
-            "type": "command",
-            "command": "shellCommand.execute",
-            "args": {
-                "command": "type build\\targets",
-                "description": "Target:",
-                "fieldSeparator": "|"
-            },
-        },
-        {
-            "id": "all_keyboards",
-            "type": "command",
-            "command": "shellCommand.execute",
-            "args": {
-                "command": "type build\\all_keyboards",
-                "description": "Keyboard:",
-                "default": ""
-            },
-        },
-        {
-            "id": "keymap",
-            "description": "Keymap:",
-            "type": "pickString",
-            "options":[
-                "default"
-            ]
-        },
-        {
-            "id": "keyboard_keymap",
-            "type": "command",
-            "command": "shellCommand.execute",
-            "args": {
-                "command": "cmake -D QMK_KEYBOARD_FOLDER=\"${input:all_keyboards}\" -P ${workspaceFolder}/cmake/GetKeymaps.cmake && type build\\keyboard_keymaps",
-                "description": "Keymap:",
-                "default": ""
-            },
-        },
-    ]
-}

CMakeLists.txt

@@ -1,97 +0,0 @@
-cmake_minimum_required(VERSION 3.20)
-
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-
-include(UpdateSubmodule)
-include(ResolveKeyboard)
-include(ValidateJson)
-include(ProcessKeyboard)
-
-set(QMK_KEYBOARDS_FOLDER "${CMAKE_SOURCE_DIR}/keyboards")
-
-function(_get_all_cmake_targets out_var current_dir)
-    get_property(targets DIRECTORY ${current_dir} PROPERTY BUILDSYSTEM_TARGETS)
-    get_property(subdirs DIRECTORY ${current_dir} PROPERTY SUBDIRECTORIES)
-
-    foreach(subdir ${subdirs})
-        _get_all_cmake_targets(subdir_targets ${subdir})
-        list(APPEND targets ${subdir_targets})
-    endforeach()
-
-    set(${out_var} ${targets} PARENT_SCOPE)
-endfunction()
-
-if(NOT DEFINED QMK_KEYBOARD)
-    # configure step - populate targets
-    project(qmk_firmware)
-
-    add_subdirectory(keyboards)
-
-else()
-    # build step
-    if(NOT DEFINED QMK_KEYMAP_FOLDER)
-        set(QMK_KEYMAP_FOLDER "default")
-    endif()
-
-    resolve_keyboard(${QMK_KEYBOARD_FOLDER} QMK_KEYBOARD_FOLDER_ABS)
-    cmake_path(IS_PREFIX QMK_KEYBOARDS_FOLDER "${QMK_KEYBOARD_FOLDER_ABS}" IS_KEYBOARDS_FOLDER)
-    resolve_config_h(${QMK_KEYBOARD_FOLDER_ABS} QMK_KEYBOARD_CONFIG_H)
-    process_keyboard()
-    resolve_keyboard_h(${QMK_KEYBOARD_FOLDER_ABS} QMK_KEYBOARD_H)
-    resolve_keymap_c(${QMK_KEYBOARD_FOLDER_ABS} ${QMK_KEYMAP_FOLDER} QMK_KEYMAP_C)
-
-    message(STATUS "config.h: ${QMK_KEYBOARD_CONFIG_H}")
-    message(STATUS "keyboard.h: ${QMK_KEYBOARD_H}")
-    message(STATUS "keymap.c: ${QMK_KEYMAP_C}")
-
-
-    project(${QMK_KEYBOARD}
-        LANGUAGES C CXX ASM
-        HOMEPAGE_URL ${URL}
-        VERSION ${DEVICE_VER})
-
-    # add_compile_options(
-    # -include ${QMK_KEYBOARD_CONFIG_H}
-    # )
-    add_compile_definitions(
-        QMK_KEYBOARD_H="${QMK_KEYBOARD_H}"
-        KEYBOARD_${QMK_KEYBOARD}
-        KEYMAP_C="${QMK_KEYMAP_C}"
-        MATRIX_ROWS=8
-        MATRIX_COLS=6
-    )
-
-    if(DEFINED DIODE_DIRECTION)
-        add_compile_definitions(DIODE_DIRECTION=${DIODE_DIRECTION})
-    endif()
-
-    include_directories(${CMAKE_SOURCE_DIR})
-
-    # if(EXISTS ${QMK_KEYBOARD_FOLDER_ABS}/CMakeLists.txt)
-    # add_subdirectory(${QMK_KEYBOARD_FOLDER_ABS})
-    # else()
-    file(GLOB KEYBOARD_SRC "${QMK_KEYBOARD_FOLDER_ABS}/*.c")
-    list(REMOVE_ITEM KEYBOARD_SRC "${QMK_KEYMAP_C}")
-    add_qmk_executable(${TARGET_NAME} ${KEYBOARD_SRC})
-
-    # endif()
-    # add_library(qmk)
-
-    target_precompile_headers(qmk PUBLIC
-        ${QMK_KEYBOARD_CONFIG_H}
-    )
-
-    resolve_keyboard_includes(${QMK_KEYBOARD_FOLDER_ABS})
-
-    add_subdirectory(quantum)
-    add_subdirectory(platforms)
-    add_subdirectory(tmk_core/protocol)
-
-    include(features/oled)
-    include(features/backlight)
-    include(features/eeprom)
-    include(features/matrix)
-    include(features/fnv)
-endif()

builddefs/build_keyboard.mk

@@ -29,11 +29,6 @@ KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD))
 TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP)
 KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD_FILESAFE)
 
-ifeq ($(strip $(DUMP_CI_METADATA)),yes)
-    $(info CI Metadata: KEYBOARD=$(KEYBOARD))
-    $(info CI Metadata: KEYMAP=$(KEYMAP))
-endif
-
 # Force expansion
 TARGET := $(TARGET)
 

chibios_mcu.json

@@ -1,41 +0,0 @@
-{
-    "MKL26Z64" : {
-        "MCU" : "cortex-m0plus",
-        "ARMV": 6,
-        "MCU_FAMILY": "KINETIS",
-        "MCU_SERIES": "KL2x",
-        "MCU_LDSCRIPT": "MKL26Z64",
-        "MCU_STARTUP": "kl2x",
-        "BOARD": "PJRC_TEENSY_LC"
-    },
-    "MK20DX128" : {
-        "MCU" : "cortex-m4",
-        "ARMV": 7,
-        "MCU_FAMILY": "KINETIS",
-        "MCU_SERIES": "K20x",
-        "MCU_LDSCRIPT": "MK20DX128",
-        "MCU_STARTUP": "k20x5",
-        "BOARD": "PJRC_TEENSY_3"
-    },
-    "MK20DX256" : {
-        "MCU" : "cortex-m4",
-        "ARMV": 7,
-        "MCU_FAMILY": "KINETIS",
-        "MCU_SERIES": "K20x",
-        "MCU_LDSCRIPT": "MK20DX256",
-        "MCU_STARTUP": "k20x7",
-        "BOARD": "PJRC_TEENSY_3_1"
-    },
-    "STM32F303" : {
-        "MCU" : "cortex-m4",
-        "ARMV": 7,
-        "MCU_FAMILY": "STM32",
-        "MCU_SERIES": "STM32F3xx",
-        "MCU_LDSCRIPT": "STM32F303xC",
-        "MCU_STARTUP": "stm32f3xx",
-        "BOARD": "GENERIC_STM32_F303XC",
-        "USE_FPU": true,
-        "UF2_FAMILY": "STM32F3",
-        "STM32_BOOTLOADER_ADDRESS": "0x1FFFD800"
-    }
-}

cmake/AddKeyboard.cmake

@@ -1,83 +0,0 @@
-include(ResolveKeyboard)
-include(ValidateJson)
-include(ResolveToolchain)
-
-macro(add_keyboard KEYBOARD_FOLDER KEYMAP_FOLDER)  
-  # not entirely sure why this is necessary
-  # set(TEMP_PATH ${KEYBOARD_FOLDER})
-  # cmake_path(IS_RELATIVE TEMP_PATH IS_KEYBOARD_FOLDER_RELATIVE)
-  # if(${IS_KEYBOARD_FOLDER_RELATIVE})
-  #   set(KEYBOARD_FOLDER_ABS ${CMAKE_SOURCE_DIR}/keyboards/${KEYBOARD_FOLDER})
-  #   if(NOT EXISTS ${KEYBOARD_FOLDER_ABS})
-  #     # message(FATAL_ERROR "Keyboard does not exist in QMK - try using an absolute path to the keyboard folder")
-  #     resolve_keyboard(${KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
-  #   endif()
-  # else()
-  #   set(KEYBOARD_FOLDER_ABS ${KEYBOARD_FOLDER})
-  #   if(NOT EXISTS ${KEYBOARD_FOLDER_ABS})
-  #     message(FATAL_ERROR "Absolute path to keyboard does not exist")
-  #   endif()
-  # endif()
- 
-  resolve_keyboard(${KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
-
-  set(TEMP_PATH ${KEYBOARD_FOLDER})
-  cmake_path(IS_RELATIVE TEMP_PATH IS_KEYBOARD_FOLDER_RELATIVE)
-  
-  set(TEMP_PATH ${KEYMAP_FOLDER})
-  cmake_path(IS_RELATIVE TEMP_PATH IS_KEYMAP_FOLDER_RELATIVE)
-  if(${IS_KEYMAP_FOLDER_RELATIVE})
-    set(KEYMAP_NAME ${KEYMAP_FOLDER})
-  else()
-    if(WIN32)
-      set(KEYMAP_NAME $ENV{USERNAME})
-    else()
-      set(KEYMAP_NAME $ENV{USE})
-    endif()
-  endif()
-
-  # find the right toolchain
-
-  # not sure we need to validate here
-  validate_json(${KEYBOARD_FOLDER_ABS}/info.json keyboard JSON_STRING)
-
-  string(JSON PROCESSOR GET ${JSON_STRING} processor)
-  resolve_toolchain(${PROCESSOR} TOOLCHAIN)
-
-  string(JSON KEYBOARD_NAME GET ${JSON_STRING} keyboard_name)
-  if(${IS_KEYBOARD_FOLDER_RELATIVE})
-    string(MAKE_C_IDENTIFIER ${KEYBOARD_FOLDER} KEYBOARD_SLUG)
-  else()
-    string(MAKE_C_IDENTIFIER ${KEYBOARD_NAME} KEYBOARD_SLUG)
-  endif()
-  string(JSON MANUFACTURER GET ${JSON_STRING} manufacturer)
-  set(TARGET_NAME "${KEYBOARD_SLUG}_${KEYMAP_NAME}")
-  ExternalProject_Add(${TARGET_NAME}
-    SOURCE_DIR ${CMAKE_SOURCE_DIR}
-    # PREFIX ${CMAKE_SOURCE_DIR}/build/keyboards/${KEYBOARD_FOLDER}
-    TMP_DIR ${CMAKE_SOURCE_DIR}/build/tmp
-    DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/build/download
-    BINARY_DIR ${CMAKE_SOURCE_DIR}/build/keyboards/${TARGET_NAME}
-    STAMP_DIR ${CMAKE_SOURCE_DIR}/build/stamp
-    LOG_DIR ${CMAKE_SOURCE_DIR}/build/log
-    INSTALL_DIR ${CMAKE_SOURCE_DIR}/build/install
-    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/${TARGET_NAME}${QMK_EXTENSION} ${CMAKE_SOURCE_DIR}/${TARGET_NAME}${QMK_EXTENSION}
-    # this seems to work well for all systems so far - not sure if it'd be useful to customize
-    CMAKE_GENERATOR "Unix Makefiles"
-    CMAKE_ARGS 
-      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/toolchains/${TOOLCHAIN}.cmake
-      -DQMK_KEYBOARD=${KEYBOARD_SLUG}
-      -DQMK_KEYBOARD_FOLDER=${KEYBOARD_FOLDER}
-      -DQMK_KEYMAP_FOLDER=${KEYMAP_FOLDER}
-      -DTARGET_NAME=${TARGET_NAME}
-  )
-  ExternalProject_Add_Step(${TARGET_NAME} copy_compile_commands
-    DEPENDEES configure
-    DEPENDERS build
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/keyboards/${TARGET_NAME}/compile_commands.json ${CMAKE_SOURCE_DIR}/compile_commands.json
-    # BYPRODUCTS ${CMAKE_SOURCE_DIR}/compile_commands.json
-    ALWAYS TRUE
-  )
-  
-# file(APPEND "${CMAKE_SOURCE_DIR}/build/targets" "${TARGET_NAME}|${KEYBOARD_NAME} with ${KEYMAP_FOLDER}|${KEYBOARD_FOLDER}|Made by: ${MANUFACTURER}\n")
-endmacro(add_keyboard)

cmake/ConfigureKeyboard.cmake

@@ -1,44 +0,0 @@
-cmake_minimum_required(VERSION 3.20)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-
-include(ResolveKeyboard)
-include(ValidateJSON)
-
-resolve_keyboard(${QMK_KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
-validate_json(${KEYBOARD_FOLDER_ABS}/info.json keyboard JSON_STRING)
-
-if(NOT DEFINED QMK_KEYMAP_FOLDER)
-    set(QMK_KEYMAP_FOLDER default)
-endif()
-
-set(TEMP_PATH ${QMK_KEYBOARD_FOLDER})
-cmake_path(IS_RELATIVE TEMP_PATH IS_KEYBOARD_FOLDER_RELATIVE)
-
-set(TEMP_PATH ${QMK_KEYMAP_FOLDER})
-cmake_path(IS_RELATIVE TEMP_PATH IS_KEYMAP_FOLDER_RELATIVE)
-
-if(${IS_KEYMAP_FOLDER_RELATIVE})
-  set(KEYMAP_NAME ${QMK_KEYMAP_FOLDER})
-else()
-  if(WIN32)
-    set(KEYMAP_NAME $ENV{USERNAME})
-  else()
-    set(KEYMAP_NAME $ENV{USE})
-  endif()
-endif()  
-
-string(JSON KEYBOARD_NAME GET ${JSON_STRING} keyboard_name)
-
-if(${IS_KEYBOARD_FOLDER_RELATIVE})
-    string(MAKE_C_IDENTIFIER ${QMK_KEYBOARD_FOLDER} KEYBOARD_SLUG)
-else()
-    string(MAKE_C_IDENTIFIER ${KEYBOARD_NAME} KEYBOARD_SLUG)
-endif()
-
-string(JSON MANUFACTURER GET ${JSON_STRING} manufacturer)
-
-set(TARGET_NAME "${KEYBOARD_SLUG}_${KEYMAP_NAME}")
-file(APPEND "${CMAKE_SOURCE_DIR}/build/targets" "${TARGET_NAME}|${KEYBOARD_NAME} with ${QMK_KEYMAP_FOLDER}|${QMK_KEYBOARD_FOLDER}:${QMK_KEYMAP_FOLDER}|Made by: ${MANUFACTURER}\n")
-
-message(STATUS "Added keyboard '${QMK_KEYBOARD_FOLDER}' with keymap '${QMK_KEYMAP_FOLDER}'")

cmake/FindARMToolchain.cmake

@@ -1,14 +0,0 @@
-macro(find_arm_toolchain)
-    find_toolchain(arm-none-eabi TOOLCHAIN_ROOT)
-
-    if(NOT TOOLCHAIN_ROOT)
-        include(GetARMToolchain)
-        find_toolchain(arm-none-eabi TOOLCHAIN_ROOT)
-    endif()
-
-    if(NOT TOOLCHAIN_ROOT)
-        message(FATAL_ERROR "ARM Toolchain could not be found")
-    endif()
-
-    message(STATUS "ARM toolchain found: ${TOOLCHAIN_ROOT}")
-endmacro()

cmake/FindAVRToolchain.cmake

@@ -1,20 +0,0 @@
-macro(find_avr_toolchain)
-    find_toolchain(avr TOOLCHAIN_ROOT)
-
-    if(NOT TOOLCHAIN_ROOT)
-        include(GetAVRToolchain)
-        find_toolchain(avr TOOLCHAIN_ROOT)
-    endif()
-
-    find_program(DFU_PROGRAMMER NAMES dfu-programmer PATHS ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/)
-    if(${DFU_PROGRAMMER} STREQUAL "DFU_PROGRAMMER-NOTFOUND")
-        include(GetDfuProgrammer)
-        find_program(DFU_PROGRAMMER NAMES dfu-programmer PATHS ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/)
-    endif()
-
-    if(NOT TOOLCHAIN_ROOT)
-        message(FATAL_ERROR "AVR Toolchain could not be found")
-    endif()
-
-    message(STATUS "AVR toolchain found: ${TOOLCHAIN_ROOT}")
-endmacro()

cmake/Findchibios.cmake

@@ -1,282 +0,0 @@
-include(ParseMakefile)
-
-# STM32F303
-
-set(MCU "cortex-m4")
-set(ARMV 7)
-set(MCU_FAMILY "STM32")
-set(MCU_SERIES "STM32F3xx")
-string(TOUPPER ${MCU_SERIES} MCU_SERIES_UPPER)
-set(MCU_LDSCRIPT "STM32F303xC")
-set(MCU_STARTUP "stm32f3xx")
-set(BOARD "GENERIC_STM32_F303XC")
-set(USE_FPU TRUE)
-set(UF2_FAMILY "STM32F3")
-set(STM32_BOOTLOADER_ADDRESS 0x1FFFD800)
-set(EEPROM_DRIVER "wear_leveling" FORCE)
-set(WEAR_LEVELING_DRIVER "embedded_flash" FORCE)
-
-target_compile_definitions(qmk PUBLIC
-  QMK_MCU_FAMILY_${MCU_FAMILY}
-  QMK_MCU_SERIES_${MCU_SERIES_UPPER}
-)
-
-target_compile_options(qmk PUBLIC
-    -march=armv7-m
-)
-
-target_compile_definitions(qmk PUBLIC
-    MCU_${MCU_FAMILY}
-    __ARM_ARCH_7M__
-)
-
-# platforms/chibios/platform.mk
-
-if(NOT DEFINED USE_PROCESS_STACKSIZE)
-    set(USE_PROCESS_STACKSIZE 0x800)
-endif()
-
-if(NOT DEFINED USE_EXCEPTIONS_STACKSIZE)
-    set(USE_EXCEPTIONS_STACKSIZE 0x400)
-endif()
-
-target_link_options(qmk PUBLIC
-    -Wl,--defsym=__process_stack_size__=${USE_PROCESS_STACKSIZE},--defsym=__main_stack_size__=${USE_EXCEPTIONS_STACKSIZE}
-)
-
-if(NOT DEFINED MCU_PORT_NAME)
-    set(MCU_PORT_NAME ${MCU_FAMILY})
-endif()
-set(MCU_ARCH ${MCU})
-if(NOT DEFINED CHIBIOS_PORT)
-    set(CHIBIOS_PORT "ARMv${ARMV}-M")
-endif()
-if(NOT DEFINED PLATFORM_NAME)
-    set(PLATFORM_NAME platform)
-endif()
-
-set(CHIBIOS ${CMAKE_SOURCE_DIR}/lib/chibios)
-set(CHIBIOS_CONTRIB ${CMAKE_SOURCE_DIR}/lib/chibios-contrib)
-
-# port*.mk
-include(chibios/ports/${CHIBIOS_PORT})
-
-# platform.mk
-include(chibios/ports/${MCU_SERIES})
-
-# startup_*.mk - might need to convert these
-find_file(STARTUP_MK startup_${MCU_STARTUP}.mk
-    ${CHIBIOS}/os/common/ports/ARMCMx/compilers/GCC/mk
-    ${CHIBIOS}/os/common/startup/ARMCMx/compilers/GCC/mk
-    ${CHIBIOS_CONTRIB}/os/common/startup/ARMCMx/compilers/GCC/mk
-)
-get_filename_component(STARTUP_DIR ${STARTUP_MK} DIRECTORY)
-ParseMakefile(${STARTUP_MK})
-target_sources(qmk PUBLIC ${STARTUPSRC})
-target_sources(qmk PUBLIC ${STARTUPASM})
-target_include_directories(qmk PUBLIC ${STARTUPINC})
-
-# board paths - we should just standardize these
-find_path(BOARD_PATH
-NAMES 
-    boards/${BOARD}/board.mk 
-    board/board.mk
-PATHS
-    ${QMK_KEYBOARD_FOLDER}/boards/${BOARD}
-    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}
-    ${CHIBIOS}/os/hal/
-    ${CHIBIOS_CONTRIB}/os/hal/
-)
-# if(EXISTS ${BOARD_PATH}/rules.mk)
-#     ParseMakefile(${BOARD_PATH}/rules.mk)
-# endif()
-
-if(EXISTS ${BOARD_PATH}/configs/config.h)
-target_precompile_headers(qmk PUBLIC
-    ${BOARD_PATH}/configs/config.h
-)
-endif()
-
-if(EXISTS ${BOARD_PATH}/configs/post_config.h)
-    target_precompile_headers(qmk PUBLIC
-        ${BOARD_PATH}/configs/post_config.h
-    )
-endif()
-
-find_file(BOARD_MK board.mk
-    ${BOARD_PATH}/boards/${BOARD}
-    ${BOARD_PATH}/board
-)
-ParseMakefile(${BOARD_MK})
-
-target_sources(qmk PUBLIC ${BOARDSRC})
-target_include_directories(qmk PUBLIC ${BOARDINC})
-
-# allow board.c to be overriden
-file(RELATIVE_PATH INIT_HOOK_RELATIVE ${CMAKE_BINARY_DIR}
-    "${CMAKE_SOURCE_DIR}/tmk_core/protocol/chibios/init_hooks.h")
-set_source_files_properties(${BOARDSRC} TARGET_DIRECTORY qmk PROPERTIES 
-    # COMPILE_OPTIONS "-include ../../../tmk_core/protocol/chibios/init_hooks.h"
-    COMPILE_OPTIONS "-include ${INIT_HOOK_RELATIVE}"
-)
-
-# bootloader
-if(DEFINED STM32_BOOTLOADER_ADDRESS)
-    target_compile_definitions(qmk PUBLIC STM32_BOOTLOADER_ADDRESS=${STM32_BOOTLOADER_ADDRESS})
-endif()
-if(DEFINED WB32_BOOTLOADER_ADDRESS)
-    target_compile_definitions(qmk PUBLIC WB32_BOOTLOADER_ADDRESS=${WB32_BOOTLOADER_ADDRESS})
-endif()
-
-find_file(BOOTLOADER_DEFS_H bootloader_defs.h
-    ${QMK_KEYBOARD_FOLDER}
-    ${QMK_KEYBOARD_FOLDER}/boards/${BOARD}
-    ${BOARD_PATH}/configs
-)
-if(EXISTS ${BOOTLOADER_DEFS_H})
-    target_compile_options(qmk PUBLIC -include ${BOOTLOADER_DEFS_H})
-endif()
-
-# chconf directories
-find_path(CHCONFDIR chconf.h
-    ${QMK_KEYBOARD_FOLDER}
-    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}/configs
-    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/common/configs
-)
-target_include_directories(qmk PUBLIC ${CHCONFDIR})
-
-# halconf directories
-find_path(HALCONFDIR halconf.h
-    ${QMK_KEYBOARD_FOLDER}
-    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}/configs
-    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/common/configs
-)
-target_include_directories(qmk PUBLIC ${HALCONFDIR})
-
-# linker script
-find_file(LDSCRIPT ${MCU_LDSCRIPT}.ld
-    ${QMK_KEYBOARD_FOLDER}/ld
-    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}/ld
-    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/common/ld
-    ${STARTUPLD}
-    ${STARTUPLD_CONTRIB}
-)
-get_filename_component(LDSCRIPT_PATH ${LDSCRIPT} DIRECTORY)
-target_link_options(qmk PUBLIC
-    -T ${LDSCRIPT}
-    -L ${LDSCRIPT_PATH}
-)
-
-# os/hal/hal.mk
-target_sources(qmk PUBLIC
-    ${CHIBIOS}/os/hal/src/hal.c
-    ${CHIBIOS}/os/hal/src/hal_st.c
-    ${CHIBIOS}/os/hal/src/hal_buffers.c
-    ${CHIBIOS}/os/hal/src/hal_queues.c
-    ${CHIBIOS}/os/hal/src/hal_flash.c
-    ${CHIBIOS}/os/hal/src/hal_mmcsd.c
-    ${CHIBIOS}/os/hal/src/hal_adc.c
-    ${CHIBIOS}/os/hal/src/hal_can.c
-    ${CHIBIOS}/os/hal/src/hal_crypto.c
-    ${CHIBIOS}/os/hal/src/hal_dac.c
-    ${CHIBIOS}/os/hal/src/hal_efl.c
-    ${CHIBIOS}/os/hal/src/hal_gpt.c
-    ${CHIBIOS}/os/hal/src/hal_i2c.c
-    ${CHIBIOS}/os/hal/src/hal_i2s.c
-    ${CHIBIOS}/os/hal/src/hal_icu.c
-    ${CHIBIOS}/os/hal/src/hal_mac.c
-    ${CHIBIOS}/os/hal/src/hal_mmc_spi.c
-    ${CHIBIOS}/os/hal/src/hal_pal.c
-    ${CHIBIOS}/os/hal/src/hal_pwm.c
-    ${CHIBIOS}/os/hal/src/hal_rtc.c
-    ${CHIBIOS}/os/hal/src/hal_sdc.c
-    ${CHIBIOS}/os/hal/src/hal_serial.c
-    ${CHIBIOS}/os/hal/src/hal_serial_usb.c
-    ${CHIBIOS}/os/hal/src/hal_sio.c
-    ${CHIBIOS}/os/hal/src/hal_spi.c
-    ${CHIBIOS}/os/hal/src/hal_trng.c
-    ${CHIBIOS}/os/hal/src/hal_uart.c
-    ${CHIBIOS}/os/hal/src/hal_usb.c
-    ${CHIBIOS}/os/hal/src/hal_wdg.c
-    ${CHIBIOS}/os/hal/src/hal_wspi.c
-)
-target_include_directories(qmk PUBLIC
-    ${CHIBIOS}/os/hal/include
-)
-
-# os/hal/osal/rt-nil/osal.mk
-target_sources(qmk PUBLIC
-    ${CHIBIOS}/os/hal/osal/rt-nil/osal.c
-)
-target_include_directories(qmk PUBLIC
-    ${CHIBIOS}/os/hal/osal/rt-nil
-)
-
-# os/rt/rt.mk
-target_sources(qmk PUBLIC
-    ${CHIBIOS}/os/rt/src/chsys.c
-    ${CHIBIOS}/os/rt/src/chrfcu.c
-    ${CHIBIOS}/os/rt/src/chdebug.c
-    ${CHIBIOS}/os/rt/src/chtrace.c
-    ${CHIBIOS}/os/rt/src/chvt.c
-    ${CHIBIOS}/os/rt/src/chschd.c
-    ${CHIBIOS}/os/rt/src/chinstances.c
-    ${CHIBIOS}/os/rt/src/chthreads.c
-    ${CHIBIOS}/os/rt/src/chsys.c
-    ${CHIBIOS}/os/rt/src/chrfcu.c
-    ${CHIBIOS}/os/rt/src/chdebug.c
-    ${CHIBIOS}/os/rt/src/chtrace.c
-    ${CHIBIOS}/os/rt/src/chvt.c
-    ${CHIBIOS}/os/rt/src/chschd.c
-    ${CHIBIOS}/os/rt/src/chinstances.c
-    ${CHIBIOS}/os/rt/src/chthreads.c
-    ${CHIBIOS}/os/rt/src/chtm.c
-    ${CHIBIOS}/os/rt/src/chstats.c
-    ${CHIBIOS}/os/rt/src/chregistry.c
-    ${CHIBIOS}/os/rt/src/chsem.c
-    ${CHIBIOS}/os/rt/src/chmtx.c
-    ${CHIBIOS}/os/rt/src/chcond.c
-    ${CHIBIOS}/os/rt/src/chevents.c
-    ${CHIBIOS}/os/rt/src/chmsg.c
-    ${CHIBIOS}/os/rt/src/chdynamic.c
-)
-target_include_directories(qmk PUBLIC
-    ${CHIBIOS}/os/rt/include
-)
-
-# os/oslib/oslib.mk
-target_sources(qmk PUBLIC
-    ${CHIBIOS}/os/oslib/src/chmboxes.c
-    ${CHIBIOS}/os/oslib/src/chmemcore.c
-    ${CHIBIOS}/os/oslib/src/chmemheaps.c
-    ${CHIBIOS}/os/oslib/src/chmempools.c
-    ${CHIBIOS}/os/oslib/src/chpipes.c
-    ${CHIBIOS}/os/oslib/src/chobjcaches.c
-    ${CHIBIOS}/os/oslib/src/chdelegates.c
-    ${CHIBIOS}/os/oslib/src/chfactory.c
-)
-target_include_directories(qmk PUBLIC
-    ${CHIBIOS}/os/oslib/include
-)
-
-# os/hal/lib/streams/streams.mk
-target_sources(qmk PUBLIC
-    ${CHIBIOS}/os/hal/lib/streams/chprintf.c
-    ${CHIBIOS}/os/hal/lib/streams/chscanf.c
-    ${CHIBIOS}/os/hal/lib/streams/memstreams.c
-    ${CHIBIOS}/os/hal/lib/streams/nullstreams.c
-    ${CHIBIOS}/os/hal/lib/streams/bufstreams.c
-)
-target_include_directories(qmk PUBLIC
-    ${CHIBIOS}/os/hal/lib/streams
-)
-
-# resume platform.mk
-target_sources(qmk PUBLIC
-    ${CHIBIOS}/os/various/syscalls.c
-)
-target_include_directories(qmk PUBLIC
-    ${CHIBIOS}/os/license
-    ${CHIBIOS}/os/oslib/include
-    ${CHIBIOS}/os/various
-)

cmake/Findlufa.cmake

@@ -1,27 +0,0 @@
-include(UpdateSubmodule)
-update_submodule(lib/lufa)
-set(LUFA_PATH ${CMAKE_SOURCE_DIR}/lib/lufa)
-set(LUFA_ROOT_PATH ${LUFA_PATH}/LUFA)
-target_sources(qmk PUBLIC
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/USBController_${ARCH}.c
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/USBInterrupt_${ARCH}.c
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/ConfigDescriptors.c
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/Events.c
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/USBTask.c
-    ${LUFA_ROOT_PATH}/Drivers/USB/Class/Common/HIDParser.c
-
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Host_${ARCH}.c
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Pipe_${ARCH}.c
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/PipeStream_${ARCH}.c
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/HostStandardReq.c
-
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Device_${ARCH}.c
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Endpoint_${ARCH}.c
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/EndpointStream_${ARCH}.c
-    ${LUFA_ROOT_PATH}/Drivers/USB/Core/DeviceStandardReq.c
-    ${LUFA_PATH}/LUFA/Drivers/USB/USB.h
-)
-target_include_directories(qmk PUBLIC ${LUFA_PATH})
-# target_link_libraries(lufa ${QMK_TARGET})
-# target_link_libraries(lufa tmk_core_protocol)
-# target_link_libraries(lufa tmk_core_protocol_lufa)

cmake/GetARMToolchain.cmake

@@ -1,24 +0,0 @@
-message("Downloading gcc-arm-none-eabi")
-if(WIN32)
-file(DOWNLOAD
-    https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-win32.zip?rev=8f4a92e2ec2040f89912f372a55d8cf3&hash=8A9EAF77EF1957B779C59EADDBF2DAC118170BBF
-    ${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-win32.zip
-    EXPECTED_HASH MD5=2bc8f0c4c4659f8259c8176223eeafc1
-    SHOW_PROGRESS
-)
-file(ARCHIVE_EXTRACT
-    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-win32.zip
-    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
-)
-elseif(UNIX)
-file(DOWNLOAD
-    https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2?rev=78196d3461ba4c9089a67b5f33edf82a&hash=D484B37FF37D6FC3597EBE2877FB666A41D5253B
-    ${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-x86_64-linux.tar.bz2
-    EXPECTED_HASH MD5=3fe3d8bb693bd0a6e4615b6569443d0d
-    SHOW_PROGRESS
-)
-file(ARCHIVE_EXTRACT
-    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-x86_64-linux.tar.bz2
-    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
-)
-endif()

cmake/GetAVRToolchain.cmake

@@ -1,24 +0,0 @@
-message("Downloading avr-gcc")
-if(WIN32)
-file(DOWNLOAD
-    https://github.com/ZakKemble/avr-gcc-build/releases/download/v12.1.0-1/avr-gcc-12.1.0-x64-windows.zip
-    ${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-windows.zip
-    EXPECTED_HASH SHA256=e921a964fdeaedbe963352d0f26c6520a0a3eb8effc6ff232f3824b06c4ea0e2
-    SHOW_PROGRESS
-)
-file(ARCHIVE_EXTRACT
-    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-windows.zip
-    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
-)
-elseif(UNIX)
-file(DOWNLOAD
-    https://github.com/ZakKemble/avr-gcc-build/releases/download/v12.1.0-1/avr-gcc-12.1.0-x64-linux.tar.bz2
-    ${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-linux.tar.bz2
-    EXPECTED_HASH SHA256=feb034f4b85237032da8bac1f03765af5ebc4a8939b69bed57ff31bc482ca1a6
-    SHOW_PROGRESS
-)
-file(ARCHIVE_EXTRACT
-    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-linux.tar.bz2
-    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
-)
-endif()

cmake/GetDfuProgrammer.cmake

@@ -1,22 +0,0 @@
-message("Downloading dfu-programmer")
-if(WIN32)
-file(DOWNLOAD
-    https://github.com/dfu-programmer/dfu-programmer/releases/download/v1.0.0/dfu-programmer-x64-1.0.0.7z
-    ${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-x64-1.0.0.7z
-    SHOW_PROGRESS
-)
-file(ARCHIVE_EXTRACT
-    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-x64-1.0.0.7z
-    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/
-)
-elseif(UNIX)
-file(DOWNLOAD
-    https://github.com/dfu-programmer/dfu-programmer/releases/download/v1.0.0/dfu-programmer-linux-1.0.0.7z
-    ${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-linux-1.0.0.7z
-    SHOW_PROGRESS
-)
-file(ARCHIVE_EXTRACT
-    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-linux-1.0.0.7z
-    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/
-)
-endif()

cmake/GetKeymaps.cmake

@@ -1,51 +0,0 @@
-cmake_minimum_required(VERSION 3.20)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-
-include(ResolveKeyboard)
-include(ValidateJson)
-
-set(QMK_KEYBOARDS_FOLDER "${CMAKE_SOURCE_DIR}/keyboards")
-set(CMAKE_MESSAGE_INDENT "")
-
-resolve_keyboard(${QMK_KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
-validate_json(${KEYBOARD_FOLDER_ABS}/info.json keyboard JSON_STR)
-cmake_path(IS_PREFIX QMK_KEYBOARDS_FOLDER "${KEYBOARD_FOLDER_ABS}" IS_KEYBOARDS_FOLDER)
-
-file(WRITE "${CMAKE_SOURCE_DIR}/build/keyboard_keymaps" "")
-if(${IS_KEYBOARDS_FOLDER})
-    file(RELATIVE_PATH RELATIVE_KEYBOARD_FOLDER ${QMK_KEYBOARDS_FOLDER} ${KEYBOARD_FOLDER_ABS})
-    while(NOT ${RELATIVE_KEYBOARD_FOLDER} STREQUAL "")  
-        file(GLOB KEYMAPS "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/keymaps/*/keymap.c")
-        foreach(KEYMAP ${KEYMAPS})
-            file(RELATIVE_PATH KEYMAP_C "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/keymaps" "${KEYMAP}")
-            get_filename_component(KEYMAP_FOLDER ${KEYMAP_C} DIRECTORY)
-            # message(STATUS "${KEYMAP_FOLDER}")
-            file(APPEND "${CMAKE_SOURCE_DIR}/build/keyboard_keymaps" "${KEYMAP_FOLDER}\n")
-        endforeach()
-        get_filename_component(RELATIVE_KEYBOARD_FOLDER ${RELATIVE_KEYBOARD_FOLDER} DIRECTORY)
-    endwhile()
-else()
-    if(EXISTS "${KEYBOARD_FOLDER_ABS}/keymap.c")
-        set(${KEYMAP_C_STR} "${KEYBOARD_FOLDER_ABS}/keymap.c" PARENT_SCOPE)
-    elseif(EXISTS "${KEYBOARD_FOLDER_ABS}/keymaps/${KEYMAP_FOLDER}/keymap.c")
-        set(${KEYMAP_C_STR} "${KEYBOARD_FOLDER_ABS}/keymaps/${KEYMAP_FOLDER}/keymap.c" PARENT_SCOPE)
-    endif()
-endif()
-
-string(JSON COMMUNITY_LAYOUTS ERROR_VARIABLE NO_COMMUNITY_LAYOUTS GET ${JSON_STR} community_layouts)
-
-if(${NO_COMMUNITY_LAYOUTS} STREQUAL "NOTFOUND")
-    string(JSON NUM_LAYOUTS LENGTH ${COMMUNITY_LAYOUTS})
-    math(EXPR MAX "${NUM_LAYOUTS} - 1")
-    foreach(IDX RANGE ${MAX})
-        string(JSON LAYOUT GET ${COMMUNITY_LAYOUTS} ${IDX})
-        file(GLOB KEYMAPS "${CMAKE_SOURCE_DIR}/layouts/community/${LAYOUT}/*/keymap.c")
-        foreach(KEYMAP ${KEYMAPS})
-            file(RELATIVE_PATH KEYMAP_C "${CMAKE_SOURCE_DIR}/layouts/community/${LAYOUT}" "${KEYMAP}")
-            get_filename_component(KEYMAP_FOLDER ${KEYMAP_C} DIRECTORY)
-            # message(STATUS "${KEYMAP_FOLDER}")
-            file(APPEND "${CMAKE_SOURCE_DIR}/build/keyboard_keymaps" "${KEYMAP_FOLDER}\n")
-        endforeach()
-    endforeach()
-endif()

cmake/ParseHeader.cmake

@@ -1,64 +0,0 @@
-# Simple CMake utility to read variables from MK files
-# - Gets contents from given file (name or path)
-# - Parses the assignment statements
-# - Makes the same assignments in the PARENT_SCOPE
-
-if(POLICY CMP0007)
-    cmake_policy(SET CMP0007 NEW)
-endif()
-
-function(ParseHeader HeaderFile Prefix)
-    _ParseHeader(${HeaderFile} ${Prefix})
-endfunction()
-
-macro(_ParseHeader HeaderFile Prefix)
-    message(CHECK_START "Parsing Header")
-    list(APPEND CMAKE_MESSAGE_INDENT "  ")
-    message(STATUS "Reading \"${HeaderFile}\"")
-
-    file(READ "${HeaderFile}" FileContents)
-    string(REGEX REPLACE "/\\*.*\\*/" "" FileContents ${FileContents})
-    # replace the \ newlines with spaces
-    string(REGEX REPLACE "\\\\\r?\n *" " " FileContents ${FileContents})
-    # turn each line into an item in a list
-    string(REGEX REPLACE "\r?\n" ";" FileLines ${FileContents})
-    list(REMOVE_ITEM FileLines "")
-
-    foreach(line ${FileLines})
-        # remove comments from the ends of each line
-        string(REGEX REPLACE "//.*" "" line ${line})
-
-        # remove now-empty lines
-        if("${line}" STREQUAL "")
-            continue()
-        endif()
-
-        # try to process includes, if the file exists
-        if(line MATCHES "^#include \"(.+)\"")
-            set(INCLUDED_HEADER ${CMAKE_MATCH_1})
-            if(EXISTS ${INCLUDED_HEADER})
-                _ParseHeader("${INCLUDED_HEADER}" ${Prefix})
-            else()
-                message(STATUS "Could not read ${INCLUDED_HEADER}")
-            endif()
-            continue()
-        endif()
-        
-        # array
-        if(line MATCHES "#define ([A-Za-z0-9_]+) {(.*)}")
-            set(VARIABLE_NAME ${CMAKE_MATCH_1})
-            set(VARIABLE_VALUE ${CMAKE_MATCH_2})
-            set(${Prefix}${VARIABLE_NAME} ${VARIABLE_VALUE})
-        endif()
-
-        # regular variable
-        if(line MATCHES "#define ([A-Za-z0-9_]+) (.*)")
-            set(VARIABLE_NAME ${CMAKE_MATCH_1})
-            set(VARIABLE_VALUE ${CMAKE_MATCH_2})
-            set(${Prefix}${VARIABLE_NAME} ${VARIABLE_VALUE})
-        endif()
-    endforeach()
-
-    list(POP_BACK CMAKE_MESSAGE_INDENT)
-    message(CHECK_PASS "Complete")
-endmacro()

cmake/ParseMakefile.cmake

@@ -1,98 +0,0 @@
-# Simple CMake utility to read variables from MK files
-# - Gets contents from given file (name or path)
-# - Parses the assignment statements
-# - Makes the same assignments in the PARENT_SCOPE
-
-if(POLICY CMP0007)
-    cmake_policy(SET CMP0007 NEW)
-endif()
-
-function(ParseMakefile MKFile)
-    _ParseMakefile(${MKFile} ${ARGN})
-endfunction()
-
-macro(_ParseMakefile MKFile)
-    message(CHECK_START "Parsing Makefile")
-    list(APPEND CMAKE_MESSAGE_INDENT "  ")
-    message(STATUS "Reading \"${MKFile}\"")
-
-    file(READ "${MKFile}" FileContents)
-    # replace the \ newlines with spaces
-    string(REGEX REPLACE "\\\\\r?\n *" " " FileContents ${FileContents})
-    # turn each line into an item in a list
-    string(REGEX REPLACE "\r?\n" ";" FileLines ${FileContents})
-    list(REMOVE_ITEM FileLines "")
-
-    foreach(line ${FileLines})
-        # remove comments from the ends of each line
-        string(REGEX REPLACE "#.*" "" line ${line})
-
-        # remove now-empty lines
-        if("${line}" STREQUAL "")
-            continue()
-        endif()
-
-        # try to process includes, if the file exists
-        if(line MATCHES "^-?include (.+)$")
-            set(MAKE_CHILD ${CMAKE_MATCH_1})
-            if(EXISTS ${MAKE_CHILD})
-                _ParseMakefile("${MAKE_CHILD}" ${ARGN})
-            else()
-                message(STATUS "Could not read ${MAKE_CHILD}")
-            endif()
-            continue()
-        endif()
-
-        # turn the assignment into a list with the first item being the variable name
-        string(REPLACE "=" ";" line_split ${line})
-        list(LENGTH line_split count)
-
-        if(count LESS 2)
-            message(STATUS "Skipping ${line}")
-            continue()
-        endif()
-
-        list(GET line_split -1 value)
-        string(STRIP ${value} value)
-        # separate_arguments(value)
-        # string(REPLACE " " ";" value ${value})
-        list(REMOVE_AT line_split -1)
-
-        foreach(var_name ${line_split})
-            string(STRIP ${var_name} var_name)
-            # replace $(?) with the variable ? from cmake
-            if(value MATCHES "\\$\\(([^\\(\\)]+)\\)")
-                set(MAKE_VARIABLE "${CMAKE_MATCH_1}")
-                string(REPLACE "$(${MAKE_VARIABLE})" "${${MAKE_VARIABLE}}" value ${value})
-            endif()
-
-            # look for +, assuming it used to be +=
-            if(${var_name} MATCHES "([^ \\+]+) *\\+")
-                message(STATUS "Appending \"${CMAKE_MATCH_1}\" with \"${value}\"")
-                # read parent variable in local & append
-                set(LOCAL_${CMAKE_MATCH_1} ${CMAKE_MATCH_1})
-                # APPEND accepts spaces between values
-                list(APPEND LOCAL_${CMAKE_MATCH_1} ${value})
-                set(${CMAKE_MATCH_1} ${LOCAL_${CMAKE_MATCH_1}})
-                set(${CMAKE_MATCH_1} ${LOCAL_${CMAKE_MATCH_1}} PARENT_SCOPE)
-            else()
-                # set needs ; between elements to be considered a list
-                string(REGEX REPLACE " +" ";" value ${value})
-                # try to find variable in cache and FORCE wtih INTERNAL if it exists
-                if(DEFINED CACHE${${var_name}})
-                    message(STATUS "Caching \"${var_name}\" to \"${value}\"")
-                    # set locally so replacement still work
-                    set(${var_name} ${value})
-                    set(${var_name} ${value} CACHE INTERNAL "")
-                else()
-                    message(STATUS "Setting \"${var_name}\" to \"${value}\"")
-                    set(${var_name} ${value})
-                    set(${var_name} ${value} PARENT_SCOPE)
-                endif()
-            endif()
-        endforeach()
-    endforeach()
-
-    list(POP_BACK CMAKE_MESSAGE_INDENT)
-    message(CHECK_PASS "Complete")
-endmacro()

cmake/ProcessKeyboard.cmake

@@ -1,78 +0,0 @@
-include(ParseMakefile)
-include(Utils)
-
-macro(process_keyboard)
-    message(CHECK_START "Processing keyboard")
-    list(APPEND CMAKE_MESSAGE_INDENT "  ")
-
-    validate_json(${QMK_KEYBOARD_FOLDER_ABS}/info.json keyboard QMK_KEYBOARD_INFO_JSON_STRING)
-
-    # process rules from info.json
-    file(READ ${CMAKE_SOURCE_DIR}/data/mappings/info_rules.hjson JSON_STRING)
-    string(JSON MAPPING_LENGTH LENGTH ${JSON_STRING})
-    math(EXPR MAX "${MAPPING_LENGTH} - 1")
-    foreach(IDX RANGE ${MAX})
-        string(JSON RULE_KEY MEMBER ${JSON_STRING} ${IDX})
-        # string(JSON INFO_KEY GET ${JSON_STRING} ${RULE_KEY} info_key)
-        json_get_with_default(INFO_KEY ${JSON_STRING} _ ${RULE_KEY} info_key)
-        string(REPLACE "." " " INFO_KEYS ${INFO_KEY})
-        string(JSON RULE_VALUE ERROR_VARIABLE RULE_KEY_NOT_FOUND GET ${QMK_KEYBOARD_INFO_JSON_STRING} ${INFO_KEYS})
-        if(${RULE_KEY_NOT_FOUND} STREQUAL "NOTFOUND")
-            json_get_with_default(VALUE_TYPE ${JSON_STRING} raw ${RULE_KEY} value_type)
-            if(${VALUE_TYPE} STREQUAL "list")
-                string(JSON NUM_VALUES LENGTH ${RULE_VALUE})
-                math(EXPR MAX "${NUM_VALUES} - 1")
-                foreach(IDX RANGE ${MAX})
-                    string(JSON VALUE GET ${RULE_VALUE} ${IDX})
-                    list(APPEND ${RULE_KEY} ${VALUE})
-                endforeach()
-                message(STATUS "Found rule '${INFO_KEY}': '${${RULE_KEY}}' assigned to '${RULE_KEY}'")
-            else()
-                set(${RULE_KEY} ${RULE_VALUE})
-                message(STATUS "Found rule '${INFO_KEY}': '${RULE_VALUE}' assigned to '${RULE_KEY}'")
-            endif()
-        endif()
-    endforeach()
-
-    # process definitions from info.json
-    file(READ ${CMAKE_SOURCE_DIR}/data/mappings/info_config.hjson JSON_STRING)
-    string(JSON MAPPING_LENGTH LENGTH ${JSON_STRING})
-    math(EXPR MAX "${MAPPING_LENGTH} - 1")
-    foreach(IDX RANGE ${MAX})
-        string(JSON CONFIG_KEY MEMBER ${JSON_STRING} ${IDX})
-        json_get_with_default(INFO_KEY ${JSON_STRING} _ ${CONFIG_KEY} info_key)
-        string(REPLACE "." ";" INFO_KEYS ${INFO_KEY})
-        # string(JSON CONFIG_VALUE ERROR_VARIABLE CONFIG_KEY_NOT_FOUND GET ${QMK_KEYBOARD_INFO_JSON_STRING} ${INFO_KEYS})
-        json_get_with_default(CONFIG_VALUE ${QMK_KEYBOARD_INFO_JSON_STRING} NOTFOUND ${INFO_KEYS})
-        if(NOT CONFIG_VALUE STREQUAL "NOTFOUND")
-            set(${CONFIG_KEY} ${CONFIG_VALUE})
-            json_get_with_default(VALUE_TYPE ${JSON_STRING} raw ${CONFIG_KEY} value_type)
-            if(${VALUE_TYPE} STREQUAL "str")
-                add_compile_definitions(${CONFIG_KEY}="${CONFIG_VALUE}")
-                message(STATUS "Found definition '${INFO_KEY}': '\"${CONFIG_VALUE}\"' assigned to '${CONFIG_KEY}'")
-            elseif(${VALUE_TYPE} STREQUAL "bcd_version")
-                string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" VERSION_MATCH ${CONFIG_VALUE})
-                set(VERSION_MAJOR ${CMAKE_MATCH_1})
-                set(VERSION_MINOR ${CMAKE_MATCH_2})
-                set(VERSION_PATCH ${CMAKE_MATCH_3})
-                math(EXPR BCD_VERSION "${VERSION_MAJOR} * 10000 + ${VERSION_MINOR} * 100 + ${VERSION_PATCH}" OUTPUT_FORMAT HEXADECIMAL)
-                add_compile_definitions(${CONFIG_KEY}=${BCD_VERSION})
-                message(STATUS "Found definition '${INFO_KEY}': '${BCD_VERSION}' assigned to '${CONFIG_KEY}'")
-            else()
-                add_compile_definitions(${CONFIG_KEY}=${CONFIG_VALUE})
-                message(STATUS "Found definition '${INFO_KEY}': '${CONFIG_VALUE}' assigned to '${CONFIG_KEY}'")
-            endif()
-        endif()
-    endforeach()
-
-    string(JSON KEYBOARD_NAME GET ${QMK_KEYBOARD_INFO_JSON_STRING} keyboard_name)
-    string(JSON MANUFACTURER GET ${QMK_KEYBOARD_INFO_JSON_STRING} manufacturer)
-    string(JSON URL GET ${QMK_KEYBOARD_INFO_JSON_STRING} url)
-    string(JSON QMK_MCU GET ${QMK_KEYBOARD_INFO_JSON_STRING} processor)
-
-    list(POP_BACK CMAKE_MESSAGE_INDENT)
-    message(CHECK_PASS "info.json validated and loaded")
-
-
-    ParseMakefile(${QMK_KEYBOARD_FOLDER_ABS}/rules.mk)
-endmacro()