diff options
author | Ryan <fauxpark@gmail.com> | 2020-02-21 17:12:15 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-21 17:12:15 +1100 |
commit | 66d7fc34b2214282fd822f66abca0905ec5a1ffe (patch) | |
tree | b1bb470061f641e77bc6965612772e4eb31602c0 | |
parent | 81423cc8178e760a641655ec8d82ebf78c41c9ef (diff) | |
download | qmk_firmware-66d7fc34b2214282fd822f66abca0905ec5a1ffe.tar.gz qmk_firmware-66d7fc34b2214282fd822f66abca0905ec5a1ffe.zip |
Add Arm Teensys to mcu_selection.mk (#8026)
* Add Arm Teensys to mcu_selection.mk
* Roll back halfkeyboard keymap changes
* Remove extra newline
-rw-r--r-- | keyboards/ergodox_infinity/rules.mk | 44 | ||||
-rw-r--r-- | keyboards/handwired/onekey/teensy_32/rules.mk | 44 | ||||
-rw-r--r-- | keyboards/handwired/onekey/teensy_lc/rules.mk | 44 | ||||
-rw-r--r-- | keyboards/infinity60/rules.mk | 36 | ||||
-rw-r--r-- | keyboards/k_type/rules.mk | 43 | ||||
-rw-r--r-- | keyboards/whitefox/rules.mk | 40 | ||||
-rw-r--r-- | quantum/mcu_selection.mk | 82 |
7 files changed, 109 insertions, 224 deletions
diff --git a/keyboards/ergodox_infinity/rules.mk b/keyboards/ergodox_infinity/rules.mk index 329ea8b98..31bc20454 100644 --- a/keyboards/ergodox_infinity/rules.mk +++ b/keyboards/ergodox_infinity/rules.mk | |||
@@ -1,15 +1,5 @@ | |||
1 | # project specific files | 1 | # MCU name |
2 | SRC = matrix.c \ | 2 | MCU = MK20DX256 |
3 | led.c | ||
4 | |||
5 | ## chip/board settings | ||
6 | # - the next two should match the directories in | ||
7 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
8 | # - For Teensies, FAMILY = KINETIS and SERIES is either | ||
9 | # KL2x (LC) or K20x (3.0,3.1,3.2). | ||
10 | # - For Infinity KB, SERIES = K20x | ||
11 | MCU_FAMILY = KINETIS | ||
12 | MCU_SERIES = K20x | ||
13 | 3 | ||
14 | # Linker script to use | 4 | # Linker script to use |
15 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | 5 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ |
@@ -23,32 +13,6 @@ MCU_SERIES = K20x | |||
23 | # - MK20DX256BLDR8 for Infinity ErgoDox with Kiibohd bootloader | 13 | # - MK20DX256BLDR8 for Infinity ErgoDox with Kiibohd bootloader |
24 | MCU_LDSCRIPT = MK20DX256BLDR8 | 14 | MCU_LDSCRIPT = MK20DX256BLDR8 |
25 | 15 | ||
26 | # Startup code to use | ||
27 | # - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
28 | # - STARTUP = | ||
29 | # - kl2x for Teensy LC | ||
30 | # - k20x5 for Teensy 3.0 and Infinity 60% | ||
31 | # - k20x7 for Teensy 3.1, 3.2 and Infinity ErgoDox | ||
32 | MCU_STARTUP = k20x7 | ||
33 | |||
34 | # Board: it should exist either in <chibios>/os/hal/boards/ | ||
35 | # or <this_dir>/boards | ||
36 | # - BOARD = | ||
37 | # - PJRC_TEENSY_LC for Teensy LC | ||
38 | # - PJRC_TEENSY_3 for Teensy 3.0 | ||
39 | # - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 | ||
40 | # - MCHCK_K20 for Infinity KB | ||
41 | #BOARD = MCHCK_K20 | ||
42 | BOARD = PJRC_TEENSY_3_1 | ||
43 | |||
44 | # Cortex version | ||
45 | # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 | ||
46 | MCU = cortex-m4 | ||
47 | |||
48 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
49 | # I.e. 6 for Teensy LC; 7 for Teensy 3.x | ||
50 | ARMV = 7 | ||
51 | |||
52 | # Vector table for application | 16 | # Vector table for application |
53 | # 0x00000000-0x00001000 area is occupied by bootlaoder.*/ | 17 | # 0x00000000-0x00001000 area is occupied by bootlaoder.*/ |
54 | # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB | 18 | # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB |
@@ -92,4 +56,8 @@ LED_DRIVER = is31fl3731c | |||
92 | LED_WIDTH = 7 | 56 | LED_WIDTH = 7 |
93 | LED_HEIGHT = 7 | 57 | LED_HEIGHT = 7 |
94 | 58 | ||
59 | # project specific files | ||
60 | SRC = matrix.c \ | ||
61 | led.c | ||
62 | |||
95 | LAYOUTS = ergodox | 63 | LAYOUTS = ergodox |
diff --git a/keyboards/handwired/onekey/teensy_32/rules.mk b/keyboards/handwired/onekey/teensy_32/rules.mk index 2c411c0eb..c1b90d0d2 100644 --- a/keyboards/handwired/onekey/teensy_32/rules.mk +++ b/keyboards/handwired/onekey/teensy_32/rules.mk | |||
@@ -1,45 +1,5 @@ | |||
1 | ## chip/board settings | 1 | # MCU name |
2 | # - the next two should match the directories in | 2 | MCU = MK20DX256 |
3 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
4 | # - For Teensies, FAMILY = KINETIS and SERIES is either | ||
5 | # KL2x (LC) or K20x (3.0,3.1,3.2). | ||
6 | MCU_FAMILY = KINETIS | ||
7 | MCU_SERIES = K20x | ||
8 | |||
9 | # Linker script to use | ||
10 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
11 | # or <this_dir>/ld/ | ||
12 | # - NOTE: a custom ld script is needed for EEPROM on Teensy LC | ||
13 | # - LDSCRIPT = | ||
14 | # - MKL26Z64 for Teensy LC | ||
15 | # - MK20DX128 for Teensy 3.0 | ||
16 | # - MK20DX256 for Teensy 3.1 and 3.2 | ||
17 | MCU_LDSCRIPT = MK20DX256 | ||
18 | |||
19 | # Startup code to use | ||
20 | # - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
21 | # - STARTUP = | ||
22 | # - kl2x for Teensy LC | ||
23 | # - k20x5 for Teensy 3.0 | ||
24 | # - k20x7 for Teensy 3.1 and 3.2 | ||
25 | MCU_STARTUP = k20x7 | ||
26 | |||
27 | # Board: it should exist either in <chibios>/os/hal/boards/ | ||
28 | # or <this_dir>/boards | ||
29 | # - BOARD = | ||
30 | # - PJRC_TEENSY_LC for Teensy LC | ||
31 | # - PJRC_TEENSY_3 for Teensy 3.0 | ||
32 | # - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 | ||
33 | BOARD = PJRC_TEENSY_3_1 | ||
34 | |||
35 | # Cortex version | ||
36 | # Teensy LC is cortex-m0plus; Teensy 3.x are cortex-m4 | ||
37 | MCU = cortex-m4 | ||
38 | |||
39 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
40 | # I.e. 6 for Teensy LC; 7 for Teensy 3.x | ||
41 | ARMV = 7 | ||
42 | |||
43 | 3 | ||
44 | # Enter lower-power sleep mode when on the ChibiOS idle thread | 4 | # Enter lower-power sleep mode when on the ChibiOS idle thread |
45 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE | 5 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |
diff --git a/keyboards/handwired/onekey/teensy_lc/rules.mk b/keyboards/handwired/onekey/teensy_lc/rules.mk index 32ab07d9c..c30730725 100644 --- a/keyboards/handwired/onekey/teensy_lc/rules.mk +++ b/keyboards/handwired/onekey/teensy_lc/rules.mk | |||
@@ -1,45 +1,5 @@ | |||
1 | ## chip/board settings | 1 | # MCU name |
2 | # - the next two should match the directories in | 2 | MCU = MKL26Z64 |
3 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
4 | # - For Teensies, FAMILY = KINETIS and SERIES is either | ||
5 | # KL2x (LC) or K20x (3.0,3.1,3.2). | ||
6 | MCU_FAMILY = KINETIS | ||
7 | MCU_SERIES = KL2x | ||
8 | |||
9 | # Linker script to use | ||
10 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
11 | # or <this_dir>/ld/ | ||
12 | # - NOTE: a custom ld script is needed for EEPROM on Teensy LC | ||
13 | # - LDSCRIPT = | ||
14 | # - MKL26Z64 for Teensy LC | ||
15 | # - MK20DX128 for Teensy 3.0 | ||
16 | # - MK20DX256 for Teensy 3.1 and 3.2 | ||
17 | MCU_LDSCRIPT = MKL26Z64 | ||
18 | |||
19 | # Startup code to use | ||
20 | # - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
21 | # - STARTUP = | ||
22 | # - kl2x for Teensy LC | ||
23 | # - k20x5 for Teensy 3.0 | ||
24 | # - k20x7 for Teensy 3.1 and 3.2 | ||
25 | MCU_STARTUP = kl2x | ||
26 | |||
27 | # Board: it should exist either in <chibios>/os/hal/boards/ | ||
28 | # or <this_dir>/boards | ||
29 | # - BOARD = | ||
30 | # - PJRC_TEENSY_LC for Teensy LC | ||
31 | # - PJRC_TEENSY_3 for Teensy 3.0 | ||
32 | # - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 | ||
33 | BOARD = PJRC_TEENSY_LC | ||
34 | |||
35 | # Cortex version | ||
36 | # Teensy LC is cortex-m0plus; Teensy 3.x are cortex-m4 | ||
37 | MCU = cortex-m0plus | ||
38 | |||
39 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
40 | # I.e. 6 for Teensy LC; 7 for Teensy 3.x | ||
41 | ARMV = 6 | ||
42 | |||
43 | 3 | ||
44 | # Enter lower-power sleep mode when on the ChibiOS idle thread | 4 | # Enter lower-power sleep mode when on the ChibiOS idle thread |
45 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE | 5 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |
diff --git a/keyboards/infinity60/rules.mk b/keyboards/infinity60/rules.mk index f93766af9..579eab0f3 100644 --- a/keyboards/infinity60/rules.mk +++ b/keyboards/infinity60/rules.mk | |||
@@ -1,16 +1,5 @@ | |||
1 | # project specific files | 1 | # MCU name |
2 | SRC = matrix.c \ | 2 | MCU = MK20DX128 |
3 | led.c \ | ||
4 | led_controller.c | ||
5 | |||
6 | ## chip/board settings | ||
7 | # - the next two should match the directories in | ||
8 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
9 | # - For Teensies, FAMILY = KINETIS and SERIES is either | ||
10 | # KL2x (LC) or K20x (3.0,3.1,3.2). | ||
11 | # - For Infinity KB, SERIES = K20x | ||
12 | MCU_FAMILY = KINETIS | ||
13 | MCU_SERIES = K20x | ||
14 | 3 | ||
15 | # Linker script to use | 4 | # Linker script to use |
16 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | 5 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ |
@@ -23,14 +12,6 @@ MCU_SERIES = K20x | |||
23 | # - MK20DX128BLDR4 for Infinity with Kiibohd bootloader | 12 | # - MK20DX128BLDR4 for Infinity with Kiibohd bootloader |
24 | MCU_LDSCRIPT = MK20DX128BLDR4 | 13 | MCU_LDSCRIPT = MK20DX128BLDR4 |
25 | 14 | ||
26 | # Startup code to use | ||
27 | # - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
28 | # - STARTUP = | ||
29 | # - kl2x for Teensy LC | ||
30 | # - k20x5 for Teensy 3.0 and Infinity KB | ||
31 | # - k20x7 for Teensy 3.1 and 3.2 | ||
32 | MCU_STARTUP = k20x5 | ||
33 | |||
34 | # Board: it should exist either in <chibios>/os/hal/boards/ | 15 | # Board: it should exist either in <chibios>/os/hal/boards/ |
35 | # or <this_dir>/boards | 16 | # or <this_dir>/boards |
36 | # - BOARD = | 17 | # - BOARD = |
@@ -40,14 +21,6 @@ MCU_STARTUP = k20x5 | |||
40 | # - MCHCK_K20 for Infinity KB | 21 | # - MCHCK_K20 for Infinity KB |
41 | BOARD = MCHCK_K20 | 22 | BOARD = MCHCK_K20 |
42 | 23 | ||
43 | # Cortex version | ||
44 | # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 | ||
45 | MCU = cortex-m4 | ||
46 | |||
47 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
48 | # I.e. 6 for Teensy LC; 7 for Teensy 3.x | ||
49 | ARMV = 7 | ||
50 | |||
51 | # Vector table for application | 24 | # Vector table for application |
52 | # 0x00000000-0x00001000 area is occupied by bootlaoder.*/ | 25 | # 0x00000000-0x00001000 area is occupied by bootlaoder.*/ |
53 | # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB | 26 | # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB |
@@ -72,6 +45,11 @@ SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | |||
72 | NKRO_ENABLE = yes # USB Nkey Rollover | 45 | NKRO_ENABLE = yes # USB Nkey Rollover |
73 | CUSTOM_MATRIX = yes # Custom matrix file | 46 | CUSTOM_MATRIX = yes # Custom matrix file |
74 | 47 | ||
48 | # project specific files | ||
49 | SRC = matrix.c \ | ||
50 | led.c \ | ||
51 | led_controller.c | ||
52 | |||
75 | LAYOUTS = 60_ansi_split_bs_rshift | 53 | LAYOUTS = 60_ansi_split_bs_rshift |
76 | 54 | ||
77 | 55 | ||
diff --git a/keyboards/k_type/rules.mk b/keyboards/k_type/rules.mk index e53f316b9..56c4c606e 100644 --- a/keyboards/k_type/rules.mk +++ b/keyboards/k_type/rules.mk | |||
@@ -1,14 +1,5 @@ | |||
1 | # project specific files | 1 | # MCU name |
2 | SRC = matrix.c | 2 | MCU = MK20DX256 |
3 | |||
4 | ## chip/board settings | ||
5 | # - the next two should match the directories in | ||
6 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
7 | # - For Teensies, FAMILY = KINETIS and SERIES is either | ||
8 | # KL2x (LC) or K20x (3.0,3.1,3.2). | ||
9 | # - For Infinity KB, SERIES = K20x | ||
10 | MCU_FAMILY = KINETIS | ||
11 | MCU_SERIES = K20x | ||
12 | 3 | ||
13 | # Linker script to use | 4 | # Linker script to use |
14 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | 5 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ |
@@ -22,40 +13,12 @@ MCU_SERIES = K20x | |||
22 | # - MK20DX256BLDR8 for Infinity ErgoDox with Kiibohd bootloader | 13 | # - MK20DX256BLDR8 for Infinity ErgoDox with Kiibohd bootloader |
23 | MCU_LDSCRIPT = MK20DX256BLDR8 | 14 | MCU_LDSCRIPT = MK20DX256BLDR8 |
24 | 15 | ||
25 | # Startup code to use | ||
26 | # - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
27 | # - STARTUP = | ||
28 | # - kl2x for Teensy LC | ||
29 | # - k20x5 for Teensy 3.0 and Infinity KB | ||
30 | # - k20x7 for Teensy 3.1 and 3.2 | ||
31 | MCU_STARTUP = k20x7 | ||
32 | |||
33 | # Board: it should exist either in <chibios>/os/hal/boards/ | 16 | # Board: it should exist either in <chibios>/os/hal/boards/ |
34 | # or <this_dir>/boards | 17 | # or <this_dir>/boards |
35 | # - BOARD = | ||
36 | # - PJRC_TEENSY_LC for Teensy LC | ||
37 | # - PJRC_TEENSY_3 for Teensy 3.0 | ||
38 | # - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 | ||
39 | # - MCHCK_K20 for Infinity KB | ||
40 | |||
41 | # This board was copied from PJRC_TEENSY_3_1. The only difference should be a | 18 | # This board was copied from PJRC_TEENSY_3_1. The only difference should be a |
42 | # hack to ensure the watchdog has started before trying to disable it. | 19 | # hack to ensure the watchdog has started before trying to disable it. |
43 | BOARD = IC_TEENSY_3_1 | 20 | BOARD = IC_TEENSY_3_1 |
44 | 21 | ||
45 | # Cortex version | ||
46 | # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 | ||
47 | MCU = cortex-m4 | ||
48 | |||
49 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
50 | # I.e. 6 for Teensy LC; 7 for Teensy 3.x | ||
51 | ARMV = 7 | ||
52 | |||
53 | # Vector table for application | ||
54 | # 0x00000000-0x00001000 area is occupied by bootloader.*/ | ||
55 | # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB | ||
56 | #OPT_DEFS += -DCORTEX_VTOR_INIT=0x00002000 | ||
57 | OPT_DEFS = | ||
58 | |||
59 | DFU_ARGS = -d 1c11:b007 | 22 | DFU_ARGS = -d 1c11:b007 |
60 | DFU_SUFFIX_ARGS = -p b007 -v 1c11 | 23 | DFU_SUFFIX_ARGS = -p b007 -v 1c11 |
61 | 24 | ||
@@ -75,6 +38,8 @@ NKRO_ENABLE = yes # USB Nkey Rollover | |||
75 | CUSTOM_MATRIX = yes # Custom matrix file | 38 | CUSTOM_MATRIX = yes # Custom matrix file |
76 | DEBUG_ENABLE = yes | 39 | DEBUG_ENABLE = yes |
77 | 40 | ||
41 | # project specific files | ||
42 | SRC = matrix.c | ||
78 | 43 | ||
79 | # Enter lower-power sleep mode when on the ChibiOS idle thread | 44 | # Enter lower-power sleep mode when on the ChibiOS idle thread |
80 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE | 45 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |
diff --git a/keyboards/whitefox/rules.mk b/keyboards/whitefox/rules.mk index 27c3c3141..14507e9dd 100644 --- a/keyboards/whitefox/rules.mk +++ b/keyboards/whitefox/rules.mk | |||
@@ -1,15 +1,5 @@ | |||
1 | # project specific files | 1 | # MCU name |
2 | SRC = matrix.c \ | 2 | MCU = MK20DX256 |
3 | led.c | ||
4 | |||
5 | ## chip/board settings | ||
6 | # - the next two should match the directories in | ||
7 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
8 | # - For Teensies, FAMILY = KINETIS and SERIES is either | ||
9 | # KL2x (LC) or K20x (3.0,3.1,3.2). | ||
10 | # - For Infinity KB, SERIES = K20x | ||
11 | MCU_FAMILY = KINETIS | ||
12 | MCU_SERIES = K20x | ||
13 | 3 | ||
14 | # Linker script to use | 4 | # Linker script to use |
15 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | 5 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ |
@@ -23,14 +13,6 @@ MCU_SERIES = K20x | |||
23 | # - MK20DX256BLDR8 for Infinity ErgoDox with Kiibohd bootloader | 13 | # - MK20DX256BLDR8 for Infinity ErgoDox with Kiibohd bootloader |
24 | MCU_LDSCRIPT = MK20DX256BLDR8 | 14 | MCU_LDSCRIPT = MK20DX256BLDR8 |
25 | 15 | ||
26 | # Startup code to use | ||
27 | # - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
28 | # - STARTUP = | ||
29 | # - kl2x for Teensy LC | ||
30 | # - k20x5 for Teensy 3.0 and Infinity KB | ||
31 | # - k20x7 for Teensy 3.1 and 3.2 | ||
32 | MCU_STARTUP = k20x7 | ||
33 | |||
34 | # Board: it should exist either in <chibios>/os/hal/boards/ | 16 | # Board: it should exist either in <chibios>/os/hal/boards/ |
35 | # or <this_dir>/boards | 17 | # or <this_dir>/boards |
36 | # - BOARD = | 18 | # - BOARD = |
@@ -40,20 +22,6 @@ MCU_STARTUP = k20x7 | |||
40 | # - MCHCK_K20 for Infinity KB | 22 | # - MCHCK_K20 for Infinity KB |
41 | BOARD = IC_TEENSY_3_1 | 23 | BOARD = IC_TEENSY_3_1 |
42 | 24 | ||
43 | # Cortex version | ||
44 | # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 | ||
45 | MCU = cortex-m4 | ||
46 | |||
47 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
48 | # I.e. 6 for Teensy LC; 7 for Teensy 3.x | ||
49 | ARMV = 7 | ||
50 | |||
51 | # Vector table for application | ||
52 | # 0x00000000-0x00001000 area is occupied by bootlaoder.*/ | ||
53 | # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB | ||
54 | #OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000 | ||
55 | OPT_DEFS = | ||
56 | |||
57 | DFU_ARGS = -d 1c11:b007 | 25 | DFU_ARGS = -d 1c11:b007 |
58 | DFU_SUFFIX_ARGS = -p b007 -v 1c11 | 26 | DFU_SUFFIX_ARGS = -p b007 -v 1c11 |
59 | 27 | ||
@@ -75,6 +43,10 @@ BACKLIGHT_ENABLE = yes | |||
75 | BACKLIGHT_DRIVER = custom | 43 | BACKLIGHT_DRIVER = custom |
76 | VISUALIZER_ENABLE = yes | 44 | VISUALIZER_ENABLE = yes |
77 | 45 | ||
46 | # project specific files | ||
47 | SRC = matrix.c \ | ||
48 | led.c | ||
49 | |||
78 | LED_DRIVER = is31fl3731c | 50 | LED_DRIVER = is31fl3731c |
79 | LED_WIDTH = 16 | 51 | LED_WIDTH = 16 |
80 | LED_HEIGHT = 5 | 52 | LED_HEIGHT = 5 |
diff --git a/quantum/mcu_selection.mk b/quantum/mcu_selection.mk index f41a9e821..f15a4f58c 100644 --- a/quantum/mcu_selection.mk +++ b/quantum/mcu_selection.mk | |||
@@ -1,3 +1,85 @@ | |||
1 | ifneq ($(findstring MKL26Z64, $(MCU)),) | ||
2 | # Cortex version | ||
3 | MCU = cortex-m0plus | ||
4 | |||
5 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
6 | ARMV = 6 | ||
7 | |||
8 | ## chip/board settings | ||
9 | # - the next two should match the directories in | ||
10 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
11 | MCU_FAMILY = KINETIS | ||
12 | MCU_SERIES = KL2x | ||
13 | |||
14 | # Linker script to use | ||
15 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
16 | # or <keyboard_dir>/ld/ | ||
17 | # - NOTE: a custom ld script is needed for EEPROM on Teensy LC | ||
18 | MCU_LDSCRIPT ?= MKL26Z64 | ||
19 | |||
20 | # Startup code to use | ||
21 | # - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
22 | MCU_STARTUP ?= kl2x | ||
23 | |||
24 | # Board: it should exist either in <chibios>/os/hal/boards/, | ||
25 | # <keyboard_dir>/boards/, or drivers/boards/ | ||
26 | BOARD ?= PJRC_TEENSY_LC | ||
27 | endif | ||
28 | |||
29 | ifneq ($(findstring MK20DX128, $(MCU)),) | ||
30 | # Cortex version | ||
31 | MCU = cortex-m4 | ||
32 | |||
33 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
34 | ARMV = 7 | ||
35 | |||
36 | ## chip/board settings | ||
37 | # - the next two should match the directories in | ||
38 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
39 | MCU_FAMILY = KINETIS | ||
40 | MCU_SERIES = K20x | ||
41 | |||
42 | # Linker script to use | ||
43 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
44 | # or <keyboard_dir>/ld/ | ||
45 | MCU_LDSCRIPT ?= MK20DX128 | ||
46 | |||
47 | # Startup code to use | ||
48 | # - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
49 | MCU_STARTUP ?= k20x5 | ||
50 | |||
51 | # Board: it should exist either in <chibios>/os/hal/boards/, | ||
52 | # <keyboard_dir>/boards/, or drivers/boards/ | ||
53 | BOARD ?= PJRC_TEENSY_3 | ||
54 | endif | ||
55 | |||
56 | ifneq ($(findstring MK20DX256, $(MCU)),) | ||
57 | # Cortex version | ||
58 | MCU = cortex-m4 | ||
59 | |||
60 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
61 | ARMV = 7 | ||
62 | |||
63 | ## chip/board settings | ||
64 | # - the next two should match the directories in | ||
65 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
66 | MCU_FAMILY = KINETIS | ||
67 | MCU_SERIES = K20x | ||
68 | |||
69 | # Linker script to use | ||
70 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
71 | # or <keyboard_dir>/ld/ | ||
72 | MCU_LDSCRIPT ?= MK20DX256 | ||
73 | |||
74 | # Startup code to use | ||
75 | # - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
76 | MCU_STARTUP ?= k20x7 | ||
77 | |||
78 | # Board: it should exist either in <chibios>/os/hal/boards/, | ||
79 | # <keyboard_dir>/boards/, or drivers/boards/ | ||
80 | BOARD ?= PJRC_TEENSY_3_1 | ||
81 | endif | ||
82 | |||
1 | ifneq ($(findstring STM32F303, $(MCU)),) | 83 | ifneq ($(findstring STM32F303, $(MCU)),) |
2 | # Cortex version | 84 | # Cortex version |
3 | MCU = cortex-m4 | 85 | MCU = cortex-m4 |