From 80c2d384bb511baf595785479ac17d66ac9b6b00 Mon Sep 17 00:00:00 2001
From: Juha Niskanen <juha.niskanen@haltian.com>
Date: Tue, 2 May 2017 15:21:06 +0300
Subject: [PATCH] STM32L4: flash: update override config macros and add
 FLASH_CONFIG_B

---
 arch/arm/src/stm32l4/stm32l4_flash.h | 78 +++++++++++++++++++---------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_flash.h b/arch/arm/src/stm32l4/stm32l4_flash.h
index 96bd6135d9..c29a8d35a5 100644
--- a/arch/arm/src/stm32l4/stm32l4_flash.h
+++ b/arch/arm/src/stm32l4/stm32l4_flash.h
@@ -41,42 +41,72 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
+/* Flash size is known from the chip selection:
+ *
+ *   When CONFIG_STM32L4_FLASH_OVERRIDE_DEFAULT is set the
+ *   CONFIG_STM32L4_FLASH_CONFIG_x selects the default FLASH size based on the chip
+ *   part number. This value can be overridden with CONFIG_STM32L4_FLASH_OVERRIDE_x
+ *
+ *   Parts STM32L4xxE have 512Kb of FLASH
+ *   Parts STM32L4xxG have 1024Kb of FLASH
+ *
+ *   N.B. Only Single bank mode is supported
+ */
+
 #define _K(x) ((x)*1024)
 
-#if !defined(CONFIG_STM32L4_FLASH_CONFIG_DEFAULT) && \
+#if !defined(CONFIG_STM32L4_FLASH_OVERRIDE_DEFAULT) && \
+    !defined(CONFIG_STM32L4_FLASH_OVERRIDE_B) && \
+    !defined(CONFIG_STM32L4_FLASH_OVERRIDE_C) && \
+    !defined(CONFIG_STM32L4_FLASH_OVERRIDE_E) && \
+    !defined(CONFIG_STM32L4_FLASH_OVERRIDE_G) && \
+    !defined(CONFIG_STM32L4_FLASH_CONFIG_B) && \
     !defined(CONFIG_STM32L4_FLASH_CONFIG_C) && \
     !defined(CONFIG_STM32L4_FLASH_CONFIG_E) && \
     !defined(CONFIG_STM32L4_FLASH_CONFIG_G)
-#  define CONFIG_STM32L4_FLASH_CONFIG_DEFAULT
+#  define CONFIG_STM32L4_FLASH_OVERRIDE_E
+#  warning "Flash size not defined defaulting to 512KiB (E)"
 #endif
 
-#if defined(CONFIG_STM32L4_FLASH_CONFIG_DEFAULT)
-#  define STM32L4_FLASH_NPAGES        512
-#  define STM32L4_FLASH_PAGESIZE      2048
-#endif /* CONFIG_STM32L4_FLASH_CONFIG_DEFAULT */
+/* Override of the Flash has been chosen */
 
-/* Override of the Flash Has been Chosen */
-
-#if !defined(CONFIG_STM32L4_FLASH_CONFIG_DEFAULT)
-
-/* Define the Valid Configuration the F1 and F3  */
-
-#  if defined(CONFIG_STM32L4_FLASH_CONFIG_C) /* 256 kB */
-#    define STM32L4_FLASH_NPAGES      128
-#    define STM32L4_FLASH_PAGESIZE    2048
-#  elif defined(CONFIG_STM32L4_FLASH_CONFIG_E) /* 512 kB */
-#    define STM32L4_FLASH_NPAGES      256
-#    define STM32L4_FLASH_PAGESIZE    2048
-#  elif defined(CONFIG_STM32L4_FLASH_CONFIG_G) /* 1 MB */
-#    define STM32L4_FLASH_NPAGES      512
-#    define STM32L4_FLASH_PAGESIZE    2048
-#  else
+#if !defined(CONFIG_STM32L4_FLASH_OVERRIDE_DEFAULT)
+#  undef CONFIG_STM32L4_FLASH_CONFIG_B
+#  undef CONFIG_STM32L4_FLASH_CONFIG_C
+#  undef CONFIG_STM32L4_FLASH_CONFIG_E
+#  undef CONFIG_STM32L4_FLASH_CONFIG_G
+#  if defined(CONFIG_STM32L4_FLASH_OVERRIDE_B)
+#    define CONFIG_STM32L4_FLASH_CONFIG_B
+#  elif defined(CONFIG_STM32L4_FLASH_OVERRIDE_C)
+#    define CONFIG_STM32L4_FLASH_CONFIG_C
+#  elif defined(CONFIG_STM32L4_FLASH_OVERRIDE_E)
+#    define CONFIG_STM32L4_FLASH_CONFIG_E
+#  elif defined(CONFIG_STM32L4_FLASH_OVERRIDE_G)
+#    define CONFIG_STM32L4_FLASH_CONFIG_G
 #  endif
 #endif
 
+/* Define the valid configuration  */
+
+#if defined(CONFIG_STM32L4_FLASH_CONFIG_B) /* 128 kB */
+#  define STM32L4_FLASH_NPAGES      64
+#  define STM32L4_FLASH_PAGESIZE    2048
+#elif defined(CONFIG_STM32L4_FLASH_CONFIG_C) /* 256 kB */
+#  define STM32L4_FLASH_NPAGES      128
+#  define STM32L4_FLASH_PAGESIZE    2048
+#elif defined(CONFIG_STM32L4_FLASH_CONFIG_E) /* 512 kB */
+#  define STM32L4_FLASH_NPAGES      256
+#  define STM32L4_FLASH_PAGESIZE    2048
+#elif defined(CONFIG_STM32L4_FLASH_CONFIG_G) /* 1 MB */
+#  define STM32L4_FLASH_NPAGES      512
+#  define STM32L4_FLASH_PAGESIZE    2048
+#else
+#  error "unknown flash configuration!"
+#endif
+
 #ifdef STM32L4_FLASH_PAGESIZE
 #  define STM32L4_FLASH_SIZE            (STM32L4_FLASH_NPAGES * STM32L4_FLASH_PAGESIZE)
-#endif /* def STM32L4_FLASH_PAGESIZE */
+#endif
 
 /* Register Offsets *****************************************************************/
 
@@ -128,7 +158,7 @@
 #  define FLASH_ACR_LATENCY_3     (3 << FLASH_ACR_LATENCY_SHIFT)    /* 011: Three wait states            <=64  <=26 */
 #  define FLASH_ACR_LATENCY_4     (4 << FLASH_ACR_LATENCY_SHIFT)    /* 100: Four wait states             <=80  <=26 */
 
-#define FLASH_ACR_PRFTEN            (1 << 8)  /* Bit 8:  Pprefetch enable */
+#define FLASH_ACR_PRFTEN            (1 << 8)  /* Bit 8:  Prefetch enable */
 #define FLASH_ACR_ICEN              (1 << 9)  /* Bit 9:  Instruction cache enable */
 #define FLASH_ACR_DCEN              (1 << 10) /* Bit 10: Data cache enable */
 #define FLASH_ACR_ICRST             (1 << 11) /* Bit 11: Instruction cache reset */