aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/clueboard
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2019-11-15 13:25:40 +1100
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2019-11-14 18:25:40 -0800
commitf98750de6edf97559ed53be4b5b5c1b4851acf3e (patch)
treed555bc93b4beedc78f6d4a615e2b45a6d324aca8 /keyboards/clueboard
parentc19e4da8af6954c70760ef3803fbf729d007c1d8 (diff)
downloadfirmware-f98750de6edf97559ed53be4b5b5c1b4851acf3e.tar.gz
firmware-f98750de6edf97559ed53be4b5b5c1b4851acf3e.tar.bz2
firmware-f98750de6edf97559ed53be4b5b5c1b4851acf3e.zip
[Core] Cleanup rules.mk for F303 keyboards (#7306)
* Cleanup rules.mk for F303 keyboards * Fix small typo
Diffstat (limited to 'keyboards/clueboard')
-rw-r--r--keyboards/clueboard/60/rules.mk44
-rw-r--r--keyboards/clueboard/66/rev4/rules.mk20
-rw-r--r--keyboards/clueboard/66_hotswap/gen1/rules.mk46
-rw-r--r--keyboards/clueboard/california/rules.mk1
4 files changed, 17 insertions, 94 deletions
diff --git a/keyboards/clueboard/60/rules.mk b/keyboards/clueboard/60/rules.mk
index a0927025b..a9151b87d 100644
--- a/keyboards/clueboard/60/rules.mk
+++ b/keyboards/clueboard/60/rules.mk
@@ -1,41 +1,5 @@
-# project specific files
-SRC = led.c
-LAYOUTS += 60_ansi 60_ansi_split_bs_rshift 60_iso
-
-## chip/board settings
-# - the next two should match the directories in
-# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
-MCU_FAMILY = STM32
-MCU_SERIES = STM32F3xx
-
-# Linker script to use
-# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
-# or <this_dir>/ld/
-MCU_LDSCRIPT = STM32F303xC
-
-# Startup code to use
-# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
-MCU_STARTUP = stm32f3xx
-
-# Board: it should exist either in <chibios>/os/hal/boards/
-# or <this_dir>/boards
-BOARD = GENERIC_STM32_F303XC
-
-# Cortex version
-MCU = cortex-m4
-
-# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
-ARMV = 7
-
-USE_FPU = yes
-
-# Vector table for application
-# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
-OPT_DEFS =
-
-# Options to pass to dfu-util when flashing
-DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
-DFU_SUFFIX_ARGS = -p DF11 -v 0483
+# MCU name
+MCU = STM32F303
# Build Options
# comment out to disable the options.
@@ -48,3 +12,7 @@ CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # USB Nkey Rollover
AUDIO_ENABLE = yes
+
+# project specific files
+SRC = led.c
+LAYOUTS += 60_ansi 60_ansi_split_bs_rshift 60_iso
diff --git a/keyboards/clueboard/66/rev4/rules.mk b/keyboards/clueboard/66/rev4/rules.mk
index 4d20ff2e9..ef7989aa0 100644
--- a/keyboards/clueboard/66/rev4/rules.mk
+++ b/keyboards/clueboard/66/rev4/rules.mk
@@ -1,19 +1,5 @@
-LAYOUTS = 66_ansi 66_iso
-
-## chip/board settings
-MCU_FAMILY = STM32
-MCU_SERIES = STM32F3xx
-MCU_LDSCRIPT = STM32F303xC
-MCU_STARTUP = stm32f3xx
-BOARD = GENERIC_STM32_F303XC
-MCU = cortex-m4
-ARMV = 7
-USE_FPU = yes
-OPT_DEFS =
-
-# Options to pass to dfu-util when flashing
-DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
-DFU_SUFFIX_ARGS = -p DF11 -v 0483
+# MCU name
+MCU = STM32F303
# Build Options
# comment out to disable the options.
@@ -31,3 +17,5 @@ MIDI_ENABLE = no # MIDI controls
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = yes
+
+LAYOUTS = 66_ansi 66_iso
diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk
index 326912a34..50f140def 100644
--- a/keyboards/clueboard/66_hotswap/gen1/rules.mk
+++ b/keyboards/clueboard/66_hotswap/gen1/rules.mk
@@ -1,43 +1,5 @@
-# project specific files
-SRC = led.c
-LAYOUTS += 66_ansi
-
-## chip/board settings
-# - the next two should match the directories in
-# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
-MCU_FAMILY = STM32
-MCU_SERIES = STM32F3xx
-
-# Linker script to use
-# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
-# or <this_dir>/ld/
-MCU_LDSCRIPT = STM32F303xC
-
-# Startup code to use
-# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
-MCU_STARTUP = stm32f3xx
-
-# Board: it should exist either in <chibios>/os/hal/boards/
-# or <this_dir>/boards
-BOARD = GENERIC_STM32_F303XC
-
-# Cortex version
-MCU = cortex-m4
-
-# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
-ARMV = 7
-
-USE_FPU = yes
-
-# Vector table for application
-# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
-# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB
-# OPT_DEFS = -DCORTEX_VTOR_INIT=0x08005000
-OPT_DEFS =
-
-# Options to pass to dfu-util when flashing
-DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
-DFU_SUFFIX_ARGS = -p DF11 -v 0483
+# MCU name
+MCU = STM32F303
# LED Configuration
LED_MATRIX_ENABLE = IS31FL3731
@@ -57,3 +19,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover
#CUSTOM_MATRIX = yes # Custom matrix file
AUDIO_ENABLE = yes
# SERIAL_LINK_ENABLE = yes
+
+# project specific files
+SRC = led.c
+LAYOUTS += 66_ansi
diff --git a/keyboards/clueboard/california/rules.mk b/keyboards/clueboard/california/rules.mk
index e9362ffb7..e96afd813 100644
--- a/keyboards/clueboard/california/rules.mk
+++ b/keyboards/clueboard/california/rules.mk
@@ -1,3 +1,4 @@
+# MCU name
MCU = STM32F303
## Features