mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-13 03:20:00 +03:00
Don't bundle flash drivers and flash fs/tools together. (#12252)
Flash drivers need to be able to be compiled in without flashfs/flash tools.
This commit is contained in:
parent
1b6208d63d
commit
5e16ddb01b
1 changed files with 3 additions and 4 deletions
|
@ -234,6 +234,9 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef USE_FLASH
|
#ifdef USE_FLASH
|
||||||
|
#define USE_FLASH_TOOLS
|
||||||
|
#define USE_FLASHFS
|
||||||
|
#endif
|
||||||
|
|
||||||
#if (defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25Q128FV)) && !defined(USE_FLASH_M25P16)
|
#if (defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25Q128FV)) && !defined(USE_FLASH_M25P16)
|
||||||
#define USE_FLASH_M25P16
|
#define USE_FLASH_M25P16
|
||||||
|
@ -249,12 +252,8 @@
|
||||||
|
|
||||||
#if defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M) || defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25Q128FV)
|
#if defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M) || defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25Q128FV)
|
||||||
#define USE_FLASH_CHIP
|
#define USE_FLASH_CHIP
|
||||||
#define USE_FLASH_TOOLS
|
|
||||||
#define USE_FLASHFS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // USE_FLASH
|
|
||||||
|
|
||||||
#ifndef USE_FLASH_CHIP
|
#ifndef USE_FLASH_CHIP
|
||||||
#undef USE_FLASH_TOOLS
|
#undef USE_FLASH_TOOLS
|
||||||
#undef USE_FLASHFS
|
#undef USE_FLASHFS
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue