From f8c9b57fd6f7c923a03ab85e9ae596d91be4bcf2 Mon Sep 17 00:00:00 2001
From: cs8425 <cs8425@gmail.com>
Date: Fri, 8 Sep 2017 00:12:12 +0800
Subject: [PATCH] fix cli crash on get, dump, diff on SITL

---
 make/mcu/SITL.mk                  |  1 -
 src/main/config/config_eeprom.c   |  6 +-----
 src/main/config/config_streamer.c |  2 ++
 src/main/target/SITL/target.c     |  6 ------
 src/main/target/SITL/target.h     | 11 ++++++++++-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/make/mcu/SITL.mk b/make/mcu/SITL.mk
index 242b42450e..90210fa1a0 100644
--- a/make/mcu/SITL.mk
+++ b/make/mcu/SITL.mk
@@ -25,7 +25,6 @@ MCU_EXCLUDES = \
             drivers/dma.c \
             drivers/pwm_output.c \
             drivers/timer.c \
-            drivers/light_led.c \
             drivers/system.c \
             drivers/rcc.c \
             drivers/serial_escserial.c \
diff --git a/src/main/config/config_eeprom.c b/src/main/config/config_eeprom.c
index f784725e0d..702e15eeb6 100644
--- a/src/main/config/config_eeprom.c
+++ b/src/main/config/config_eeprom.c
@@ -33,11 +33,7 @@
 
 #include "drivers/system.h"
 
-#ifdef EEPROM_IN_RAM
-extern uint8_t eepromData[EEPROM_SIZE];
-# define __config_start (*eepromData)
-# define __config_end (*ARRAYEND(eepromData))
-#else
+#ifndef EEPROM_IN_RAM
 extern uint8_t __config_start;   // configured via linker script when building binaries.
 extern uint8_t __config_end;
 #endif
diff --git a/src/main/config/config_streamer.c b/src/main/config/config_streamer.c
index 14c800d906..1fb05a0350 100644
--- a/src/main/config/config_streamer.c
+++ b/src/main/config/config_streamer.c
@@ -23,8 +23,10 @@
 
 #include "config/config_streamer.h"
 
+#ifndef EEPROM_IN_RAM
 extern uint8_t __config_start;   // configured via linker script when building binaries.
 extern uint8_t __config_end;
+#endif
 
 #if !defined(FLASH_PAGE_SIZE)
 // F1
diff --git a/src/main/target/SITL/target.c b/src/main/target/SITL/target.c
index 22738ba6a7..70d2d872dc 100644
--- a/src/main/target/SITL/target.c
+++ b/src/main/target/SITL/target.c
@@ -254,12 +254,6 @@ void systemResetToBootloader(void) {
     exit(0);
 }
 
-// drivers/light_led.c
-void ledInit(const statusLedConfig_t *statusLedConfig) {
-    UNUSED(statusLedConfig);
-    printf("[led]Init...\n");
-}
-
 void timerInit(void) {
     printf("[timer]Init...\n");
 }
diff --git a/src/main/target/SITL/target.h b/src/main/target/SITL/target.h
index 0ab64e0821..9bb9b4a327 100644
--- a/src/main/target/SITL/target.h
+++ b/src/main/target/SITL/target.h
@@ -35,7 +35,7 @@
 // file name to save config
 #define EEPROM_FILENAME "eeprom.bin"
 #define EEPROM_IN_RAM
-#define EEPROM_SIZE     8192
+#define EEPROM_SIZE     32768
 
 #define U_ID_0 0
 #define U_ID_1 1
@@ -137,6 +137,15 @@
 
 uint32_t SystemCoreClock;
 
+#ifdef EEPROM_IN_RAM
+extern uint8_t eepromData[EEPROM_SIZE];
+#define __config_start (*eepromData)
+#define __config_end (*ARRAYEND(eepromData))
+#else
+extern uint8_t __config_start;   // configured via linker script when building binaries.
+extern uint8_t __config_end;
+#endif
+
 #define UNUSED(x) (void)(x)
 
 typedef enum