aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/jm60
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-03-19 12:33:17 +1100
committerGitHub <noreply@github.com>2020-03-19 01:33:17 +0000
commit3a0f11eb277ab719b312547981a0b0db958fbc87 (patch)
tree50e954dfc5f4eb66141bce2e6d3c4f1ac9a78170 /keyboards/jm60
parentc2013f0b7c0289f582fd41f1276f174f7d9e3c17 (diff)
downloadfirmware-3a0f11eb277ab719b312547981a0b0db958fbc87.tar.gz
firmware-3a0f11eb277ab719b312547981a0b0db958fbc87.tar.bz2
firmware-3a0f11eb277ab719b312547981a0b0db958fbc87.zip
Set MCU for some F103 boards (#8459)
Diffstat (limited to 'keyboards/jm60')
-rw-r--r--keyboards/jm60/rules.mk45
1 files changed, 6 insertions, 39 deletions
diff --git a/keyboards/jm60/rules.mk b/keyboards/jm60/rules.mk
index ed6431b65..a513461fc 100644
--- a/keyboards/jm60/rules.mk
+++ b/keyboards/jm60/rules.mk
@@ -1,41 +1,9 @@
-# project specific files
-SRC = matrix.c \
- led.c
-
-## chip/board settings
-# - the next two should match the directories in
-# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
-MCU_FAMILY = STM32
-MCU_SERIES = STM32F1xx
+# MCU name
+MCU = STM32F103
-# Linker script to use
-# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
-# or <this_dir>/ld/
-# - NOTE: a custom ld script is needed for EEPROM on Teensy LC
MCU_LDSCRIPT = jm60_bootloader
-
-# Startup code to use
-# - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/
-MCU_STARTUP = stm32f1xx
-
-# Board: it should exist either in <chibios>/os/hal/boards/
-# or <this_dir>/boards
BOARD = JM60_BOARD
-# Cortex version
-# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4
-MCU = cortex-m3
-
-# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
-# I.e. 6 for Teensy LC; 7 for Teensy 3.x
-ARMV = 7
-
-# 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=0x00001000
-OPT_DEFS =
-
# Build Options
# comment out to disable the options.
#
@@ -51,10 +19,9 @@ CUSTOM_MATRIX = yes # Custom matrix file
BACKLIGHT_ENABLE = no
VISUALIZER_ENABLE = no
-#LED_DRIVER = is31fl3731c
-#LED_WIDTH = 16
-#LED_HEIGHT = 5
-
-
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# project specific files
+SRC = matrix.c \
+ led.c