Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix build failures caused by #12947. (#15019)

Browse source 
* Fix build failures caused by #12947. Unknown if this actually works.

* qmk format-c
This commit is contained in:
Nick Brassel 2021-11-02 21:18:33 +11:00 committed by GitHub
parent 699e69bec5
commit 0ecd4926b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tmk_core/common/chibios/eeprom_teensy.c
View file

@ -44,7 +44,7 @@
#define F_CPU KINETIS_SYSCLK_FREQUENCY #define F_CPU KINETIS_SYSCLK_FREQUENCY
static int kinetis_hsrun_disable(void) { static inline int kinetis_hsrun_disable(void) {
#if defined(MK66F18) #if defined(MK66F18)
if (SMC->PMSTAT == SMC_PMSTAT_HSRUN) { if (SMC->PMSTAT == SMC_PMSTAT_HSRUN) {
// First, reduce the CPU clock speed, but do not change // First, reduce the CPU clock speed, but do not change
@ -102,7 +102,7 @@ static int kinetis_hsrun_disable(void) {
return 0; return 0;
} }
static int kinetis_hsrun_enable(void) { static inline int kinetis_hsrun_enable(void) {
#if defined(MK66F18) #if defined(MK66F18)
if (SMC->PMSTAT == SMC_PMSTAT_RUN) { if (SMC->PMSTAT == SMC_PMSTAT_RUN) {
// Turn HSRUN mode on // Turn HSRUN mode on
@ -234,7 +234,7 @@ void eeprom_initialize(void) {
// FlexRAM is configured as traditional RAM // FlexRAM is configured as traditional RAM
// We need to reconfigure for EEPROM usage // We need to reconfigure for EEPROM usage
kinetis_hsrun_disable(); kinetis_hsrun_disable();
FTFL->FCCOB0 = FTFE_FCCOB0_CCOBn_SET(0x80); // PGMPART = Program Partition Command FTFL->FCCOB0 = 0x80; // PGMPART = Program Partition Command
FTFL->FCCOB3 = 0; FTFL->FCCOB3 = 0;
FTFL->FCCOB4 = EEESPLIT | EEESIZE; FTFL->FCCOB4 = EEESPLIT | EEESIZE;
FTFL->FCCOB5 = EEPARTITION; FTFL->FCCOB5 = EEPARTITION;