Merge remote-tracking branch 'upstream/develop'

5 files changed, 4 insertions, 4 deletions

diff --git a/platforms/chibios/drivers/eeprom/eeprom_teensy.c b/platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.c
index c8777febde..6468cbf3fa 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_teensy.c
+++ b/platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.c
@@ -1,7 +1,7 @@
 #include <ch.h>
 #include <hal.h>
 
-#include "eeprom_teensy.h"
+#include "eeprom_kinetis_flexram.h"
 #include "eeconfig.h"
 
 /*************************************/
diff --git a/platforms/chibios/drivers/eeprom/eeprom_teensy.h b/platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.h
index 9a14a1fa79..9a14a1fa79 100755
--- a/platforms/chibios/drivers/eeprom/eeprom_teensy.h
+++ b/platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.h
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32.c b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.c
index 1a354dc213..a81fe3353c 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_stm32.c
+++ b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.c
@@ -22,8 +22,8 @@
 #include <stdbool.h>
 #include "util.h"
 #include "debug.h"
-#include "eeprom_stm32.h"
-#include "flash_stm32.h"
+#include "eeprom_legacy_emulated_flash.h"
+#include "legacy_flash_ops.h"
 
 /*
  * We emulate eeprom by writing a snapshot compacted view of eeprom contents,
@@ -132,7 +132,7 @@
  *
  */
 
-#include "eeprom_stm32_defs.h"
+#include "eeprom_legacy_emulated_flash_defs.h"
 /* These bits are used for optimizing encoding of bytes, 0 and 1 */
 #define FEE_WORD_ENCODING 0x8000
 #define FEE_VALUE_NEXT 0x6000
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32.h b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.h
index 8fcfb556b8..8fcfb556b8 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_stm32.h
+++ b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.h
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32_defs.h b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash_defs.h
index 57d0440330..57d0440330 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_stm32_defs.h
+++ b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash_defs.h