diff options
author | fauxpark <fauxpark@gmail.com> | 2021-02-25 16:04:53 +1100 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2021-02-25 16:04:53 +1100 |
commit | 23fd1aee00c762b1e9496795ad595325be82a956 (patch) | |
tree | 4b6a68d6015f6a730f8c15baf7103010f0f8ad56 /quantum | |
parent | 23ef327e118307d276677d30e3fda064ace6713b (diff) | |
parent | 39694d5eb0b7e48e06f9544600041fbbedfff956 (diff) | |
download | qmk_firmware-23fd1aee00c762b1e9496795ad595325be82a956.tar.gz qmk_firmware-23fd1aee00c762b1e9496795ad595325be82a956.zip |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'quantum')
-rw-r--r-- | quantum/mcu_selection.mk | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/quantum/mcu_selection.mk b/quantum/mcu_selection.mk index 81c467c65..f7329fc4d 100644 --- a/quantum/mcu_selection.mk +++ b/quantum/mcu_selection.mk | |||
@@ -400,9 +400,6 @@ ifneq (,$(filter $(MCU),atmega32a)) | |||
400 | # calculate timings. Do NOT tack on a 'UL' at the end, this will be done | 400 | # calculate timings. Do NOT tack on a 'UL' at the end, this will be done |
401 | # automatically to create a 32-bit value in your source code. | 401 | # automatically to create a 32-bit value in your source code. |
402 | F_CPU ?= 12000000 | 402 | F_CPU ?= 12000000 |
403 | |||
404 | # unsupported features for now | ||
405 | NO_SUSPEND_POWER_DOWN ?= yes | ||
406 | endif | 403 | endif |
407 | 404 | ||
408 | ifneq (,$(filter $(MCU),atmega328p)) | 405 | ifneq (,$(filter $(MCU),atmega328p)) |
@@ -417,9 +414,6 @@ ifneq (,$(filter $(MCU),atmega328p)) | |||
417 | # calculate timings. Do NOT tack on a 'UL' at the end, this will be done | 414 | # calculate timings. Do NOT tack on a 'UL' at the end, this will be done |
418 | # automatically to create a 32-bit value in your source code. | 415 | # automatically to create a 32-bit value in your source code. |
419 | F_CPU ?= 16000000 | 416 | F_CPU ?= 16000000 |
420 | |||
421 | # unsupported features for now | ||
422 | NO_SUSPEND_POWER_DOWN ?= yes | ||
423 | endif | 417 | endif |
424 | 418 | ||
425 | ifneq (,$(filter $(MCU),atmega328)) | 419 | ifneq (,$(filter $(MCU),atmega328)) |
@@ -434,10 +428,6 @@ ifneq (,$(filter $(MCU),atmega328)) | |||
434 | # calculate timings. Do NOT tack on a 'UL' at the end, this will be done | 428 | # calculate timings. Do NOT tack on a 'UL' at the end, this will be done |
435 | # automatically to create a 32-bit value in your source code. | 429 | # automatically to create a 32-bit value in your source code. |
436 | F_CPU ?= 16000000 | 430 | F_CPU ?= 16000000 |
437 | |||
438 | # unsupported features for now | ||
439 | NO_UART ?= yes | ||
440 | NO_SUSPEND_POWER_DOWN ?= yes | ||
441 | endif | 431 | endif |
442 | 432 | ||
443 | ifneq (,$(filter $(MCU),attiny85)) | 433 | ifneq (,$(filter $(MCU),attiny85)) |
@@ -449,7 +439,4 @@ ifneq (,$(filter $(MCU),attiny85)) | |||
449 | # calculate timings. Do NOT tack on a 'UL' at the end, this will be done | 439 | # calculate timings. Do NOT tack on a 'UL' at the end, this will be done |
450 | # automatically to create a 32-bit value in your source code. | 440 | # automatically to create a 32-bit value in your source code. |
451 | F_CPU ?= 16500000 | 441 | F_CPU ?= 16500000 |
452 | |||
453 | # unsupported features for now | ||
454 | NO_SUSPEND_POWER_DOWN ?= yes | ||
455 | endif | 442 | endif |