From ea6680ab271e82117515258f6e256b498ecfe26a Mon Sep 17 00:00:00 2001 From: fauxpark Date: Fri, 15 Nov 2019 13:25:40 +1100 Subject: [Core] Cleanup rules.mk for F303 keyboards (#7306) * Cleanup rules.mk for F303 keyboards * Fix small typo --- keyboards/planck/ez/rules.mk | 9 ++++----- quantum/mcu_selection.mk | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index e8a7f3115c..f09072672e 100644 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -1,8 +1,5 @@ -# project specific files -LAYOUTS += ortho_4x12 - -# Cortex version -MCU = STM32F303 +# MCU name +MCU = STM32F303 # Build Options # comment out to disable the options. @@ -22,3 +19,5 @@ RGBLIGHT_ENABLE = no # SERIAL_LINK_ENABLE = yes ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = IS31FL3737 + +LAYOUTS += ortho_4x12 diff --git a/quantum/mcu_selection.mk b/quantum/mcu_selection.mk index 5102010c7b..6815a0d8a5 100644 --- a/quantum/mcu_selection.mk +++ b/quantum/mcu_selection.mk @@ -7,15 +7,15 @@ ifneq ($(findstring STM32F303, $(MCU)),) # Linker script to use # - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ - # or /ld/ + # or /ld/ MCU_LDSCRIPT ?= STM32F303xC # Startup code to use # - it should exist in /os/common/startup/ARMCMx/compilers/GCC/mk/ MCU_STARTUP ?= stm32f3xx - # Board: it should exist either in /os/hal/boards/ - # or /boards + # Board: it should exist either in /os/hal/boards/, + # /boards/, or drivers/boards/ BOARD ?= GENERIC_STM32_F303XC # Cortex version @@ -27,7 +27,7 @@ ifneq ($(findstring STM32F303, $(MCU)),) USE_FPU = yes # Vector table for application - # 0x00000000-0x00001000 area is occupied by bootlaoder.*/ + # 0x00000000-0x00001000 area is occupied by bootloader.*/ # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB # OPT_DEFS = -DCORTEX_VTOR_INIT=0x08005000 -- cgit v1.2.3