Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build failures caused by #12947. #15019

Merged
merged 2 commits into from
Nov 2, 2021
Merged

Fix build failures caused by #12947. #15019

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aec030
Fix build failures caused by #12947. Unknown if this actually works.
tzarc Nov 2, 2021
d57629b
qmk format-c
tzarc Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions tmk_core/common/chibios/eeprom_teensy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

#define F_CPU KINETIS_SYSCLK_FREQUENCY

static int kinetis_hsrun_disable(void) {
static inline int kinetis_hsrun_disable(void) {
#if defined(MK66F18)
if (SMC->PMSTAT == SMC_PMSTAT_HSRUN) {
// First, reduce the CPU clock speed, but do not change
Expand Down Expand Up @@ -102,7 +102,7 @@ static int kinetis_hsrun_disable(void) {
return 0;
}

static int kinetis_hsrun_enable(void) {
static inline int kinetis_hsrun_enable(void) {
#if defined(MK66F18)
if (SMC->PMSTAT == SMC_PMSTAT_RUN) {
// Turn HSRUN mode on
Expand Down Expand Up @@ -234,7 +234,7 @@ void eeprom_initialize(void) {
// FlexRAM is configured as traditional RAM
// We need to reconfigure for EEPROM usage
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->FCCOB4 = EEESPLIT | EEESIZE;
FTFL->FCCOB5 = EEPARTITION;
Expand Down