Merge remote-tracking branch 'qmk/master' into merge-2022-09-10
This commit is contained in:
commit
d4fa6703b8
9866 files changed
+143396
-44465
No files matched your search
@@ -31,4 +31,4 @@ CFLAGS += -fno-strict-aliasing
|
||||
|
||||
CXXFLAGS += $(COMPILEFLAGS)
|
||||
CXXFLAGS += -fno-exceptions
|
||||
CXXFLAGS += -std=gnu++11
|
||||
CXXFLAGS += $(CXXSTANDARD)
|
||||
@@ -11,7 +11,8 @@ eeprom_stm32_large_DEFS := $(eeprom_stm32_DEFS) \
|
||||
-DFEE_PAGE_COUNT=16
|
||||
|
||||
eeprom_stm32_INC := \
|
||||
$(PLATFORM_PATH)/chibios/
|
||||
$(PLATFORM_PATH)/chibios/drivers/eeprom/ \
|
||||
$(PLATFORM_PATH)/chibios/drivers/flash/
|
||||
eeprom_stm32_tiny_INC := $(eeprom_stm32_INC)
|
||||
eeprom_stm32_large_INC := $(eeprom_stm32_INC)
|
||||
|
||||
@@ -19,6 +20,6 @@ eeprom_stm32_SRC := \
|
||||
$(TOP_DIR)/drivers/eeprom/eeprom_driver.c \
|
||||
$(PLATFORM_PATH)/$(PLATFORM_KEY)/eeprom_stm32_tests.cpp \
|
||||
$(PLATFORM_PATH)/$(PLATFORM_KEY)/flash_stm32_mock.c \
|
||||
$(PLATFORM_PATH)/chibios/eeprom_stm32.c
|
||||
$(PLATFORM_PATH)/chibios/drivers/eeprom/eeprom_stm32.c
|
||||
eeprom_stm32_tiny_SRC := $(eeprom_stm32_SRC)
|
||||
eeprom_stm32_large_SRC := $(eeprom_stm32_SRC)
|
||||
Reference in new issue
Block a user