From 58f43634bd001bc8c1b6c0ac087d3b385d0b35ed Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Wed, 12 Jun 2019 14:39:11 +0200 Subject: [PATCH] Declare eepromData for all builds that require it, rather than having the target.c define it. --- src/main/config/config_streamer.c | 9 +++++++++ src/main/target/SITL/target.c | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/config/config_streamer.c b/src/main/config/config_streamer.c index 0ad3dc8a63..af7638379a 100644 --- a/src/main/config/config_streamer.c +++ b/src/main/config/config_streamer.c @@ -27,6 +27,15 @@ #include "config/config_streamer.h" +#if !defined(EEPROM_IN_FLASH) +#if defined(EEPROM_IN_RAM) && defined(PERSISTENT) +PERSISTENT uint8_t eepromData[EEPROM_SIZE]; +#else +uint8_t eepromData[EEPROM_SIZE]; +#endif +#endif + + #if defined(STM32H750xx) && !(defined(EEPROM_IN_EXTERNAL_FLASH) || defined(EEPROM_IN_RAM) || defined(EEPROM_IN_SDCARD)) #error "STM32750xx only has one flash page which contains the bootloader, no spare flash pages available, use external storage for persistent config or ram for target testing" #endif diff --git a/src/main/target/SITL/target.c b/src/main/target/SITL/target.c index 0930108a22..b353321213 100644 --- a/src/main/target/SITL/target.c +++ b/src/main/target/SITL/target.c @@ -468,7 +468,6 @@ char _Min_Stack_Size; // fake EEPROM static FILE *eepromFd = NULL; -uint8_t eepromData[EEPROM_SIZE]; void FLASH_Unlock(void) { if (eepromFd != NULL) {