diff options
| author | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
| commit | 27fc28fd2ff52e079a5bc58d6aaea4c752420615 (patch) | |
| tree | 7ac943fb1ba4f430a7220efd18f66f6a77205c30 /platforms/chibios/drivers/flash | |
| parent | e736133392fe6427cfb995da0787337189828272 (diff) | |
| parent | 2709b6ed616f8012ff4cfd3ee69a822a8d188351 (diff) | |
Merge upstream master
Diffstat (limited to 'platforms/chibios/drivers/flash')
| -rw-r--r-- | platforms/chibios/drivers/flash/legacy_flash_ops.c (renamed from platforms/chibios/drivers/flash/flash_stm32.c) | 2 | ||||
| -rw-r--r-- | platforms/chibios/drivers/flash/legacy_flash_ops.h (renamed from platforms/chibios/drivers/flash/flash_stm32.h) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platforms/chibios/drivers/flash/flash_stm32.c b/platforms/chibios/drivers/flash/legacy_flash_ops.c index 59c77e0bc5..48de5c74dd 100644 --- a/platforms/chibios/drivers/flash/flash_stm32.c +++ b/platforms/chibios/drivers/flash/legacy_flash_ops.c @@ -17,7 +17,7 @@ */ #include <hal.h> -#include "flash_stm32.h" +#include "legacy_flash_ops.h" #if defined(STM32F1XX) # define FLASH_SR_WRPERR FLASH_SR_WRPRTERR diff --git a/platforms/chibios/drivers/flash/flash_stm32.h b/platforms/chibios/drivers/flash/legacy_flash_ops.h index 97f8ea7cfe..a59deae78d 100644 --- a/platforms/chibios/drivers/flash/flash_stm32.h +++ b/platforms/chibios/drivers/flash/legacy_flash_ops.h @@ -24,7 +24,7 @@ extern "C" { #include <stdint.h> -#ifdef FLASH_STM32_MOCKED +#ifdef LEGACY_FLASH_OPS_MOCKED extern uint8_t FlashBuf[MOCK_FLASH_SIZE]; #endif |