Updated STM32L1xx ST header files and related changes.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8166 35acf78f-673a-0410-8e92-d51de3d6d3f4

6 files changed, 45 insertions, 9 deletions

diff --git a/os/hal/boards/ST_NUCLEO_L152RE/board.h b/os/hal/boards/ST_NUCLEO_L152RE/board.h
index 776b88863..c06ac69f5 100644
--- a/os/hal/boards/ST_NUCLEO_L152RE/board.h
+++ b/os/hal/boards/ST_NUCLEO_L152RE/board.h
@@ -27,7 +27,6 @@
 #define BOARD_ST_NUCLEO_L152RE

 #define BOARD_NAME                  "STMicroelectronics NUCLEO-L152RE"

 

-

 /*

  * Board oscillators-related settings.

  * NOTE: HSE not fitted.

@@ -45,7 +44,7 @@
 /*

  * MCU type as defined in the ST header file stm32l1xx.h.

  */

-#define STM32L1XX_MD

+#define STM32L152xE

 

 /*

  * IO pins assignments.

diff --git a/os/hal/boards/ST_NUCLEO_L152RE/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO_L152RE/cfg/board.chcfg
index 9d3aa869c..0e34e62b2 100644
--- a/os/hal/boards/ST_NUCLEO_L152RE/cfg/board.chcfg
+++ b/os/hal/boards/ST_NUCLEO_L152RE/cfg/board.chcfg
@@ -11,7 +11,7 @@
   <board_name>STMicroelectronics NUCLEO-L152RE</board_name>
   <board_id>ST_NUCLEO_L152RE</board_id>
   <board_functions></board_functions>
-  <subtype>STM32L1XX_HD</subtype>
+  <subtype>STM32L152xE</subtype>
   <clocks
      HSEFrequency="0"
      HSEBypass="true"
diff --git a/os/hal/boards/ST_STM32L_DISCOVERY/board.h b/os/hal/boards/ST_STM32L_DISCOVERY/board.h
index 9bd47bee6..ccad0145c 100644
--- a/os/hal/boards/ST_STM32L_DISCOVERY/board.h
+++ b/os/hal/boards/ST_STM32L_DISCOVERY/board.h
@@ -27,7 +27,6 @@
 #define BOARD_ST_STM32L_DISCOVERY

 #define BOARD_NAME                  "ST STM32L-Discovery"

 

-

 /*

  * Board oscillators-related settings.

  * NOTE: HSE not fitted.

@@ -45,7 +44,7 @@
 /*

  * MCU type as defined in the ST header file stm32l1xx.h.

  */

-#define STM32L1XX_MD

+#define STM32L152xB

 

 /*

  * IO pins assignments.

diff --git a/os/hal/boards/ST_STM32L_DISCOVERY/cfg/board.chcfg b/os/hal/boards/ST_STM32L_DISCOVERY/cfg/board.chcfg
index 6b7e01085..1e6440077 100644
--- a/os/hal/boards/ST_STM32L_DISCOVERY/cfg/board.chcfg
+++ b/os/hal/boards/ST_STM32L_DISCOVERY/cfg/board.chcfg
@@ -11,7 +11,7 @@
   <board_name>ST STM32L-Discovery</board_name>
   <board_id>ST_STM32L_DISCOVERY</board_id>
   <board_functions></board_functions>
-  <subtype>STM32L1XX_MD</subtype>
+  <subtype>STM32L152xB</subtype>
   <clocks
      HSEFrequency="0"
      HSEBypass="true"
diff --git a/os/hal/ports/STM32/STM32L1xx/hal_lld.h b/os/hal/ports/STM32/STM32L1xx/hal_lld.h
index 93f6e02bc..b9795f391 100644
--- a/os/hal/ports/STM32/STM32L1xx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32L1xx/hal_lld.h
@@ -24,6 +24,13 @@
  *          - STM32_HSE_BYPASS (optionally).

  *          .

  *          One of the following macros must also be defined:

+ *          - STM32L100xB, STM32L100xBA, STM32L100xC.

+ *          - STM32L151xB, STM32L151xBA, STM32L151xC, STM32L151xCA,

+ *            STM32L151xD, STM32L151xDX, STM32L151xE.

+ *          - STM32L152xB, STM32L152xBA, STM32L152xC, STM32L152xCA,

+ *            STM32L152xD, STM32L152xDX, STM32L152xE.

+ *          - STM32L162xC, STM32L162xCA, STM32L162xD, STM32L162xDX,

+ *            STM32L162xE.

  *          - STM32L1XX_MD for Ultra Low Power Medium-density devices.

  *          - STM32L1XX_MDP for Ultra Low Power Medium-density Plus devices.

  *          - STM32L1XX_HD for Ultra Low Power High-density devices.

@@ -46,13 +53,22 @@
  * @name    Platform identification

  * @{

  */

-#if defined(STM32L1XX_MD) || defined(__DOXYGEN__)

+#if defined(STM32L100xB) || defined(STM32L151xB) ||                         \

+    defined(STM32L152xB) || defined(__DOXYGEN__)

 #define PLATFORM_NAME           "STM32L1xx Ultra Low Power Medium Density"

 

-#elif defined(STM32L1XX_MDP)

+#elif defined(STM32L100xBA) || defined(STM32L100xC)  ||                     \

+      defined(STM32L151xBA) || defined(STM32L151xC)  ||                     \

+      defined(STM32L151xCA) || defined(STM32L152xBA) ||                     \

+      defined(STM32L152xC)  || defined(STM32L152xCA) ||                     \

+      defined(STM32L162xC)  || defined(STM32L162xCA)

 #define PLATFORM_NAME           "STM32L1xx Ultra Low Power Medium Density Plus"

 

-#elif defined(STM32L1XX_HD)

+#elif defined(STM32L151xD)  || defined(STM32L151xDX) ||                     \

+      defined(STM32L151xE)  || defined(STM32L152xD)  ||                     \

+      defined(STM32L152xDX) || defined(STM32L152xE)  ||                     \

+      defined(STM32L162xD)  || defined(STM32L162xDX) ||                     \

+      defined(STM32L162xE)

 #define PLATFORM_NAME           "STM32L1xx Ultra Low Power High Density"

 

 #else

diff --git a/os/hal/ports/STM32/STM32L1xx/stm32_registry.h b/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
index f04dff789..49e0e3ece 100644
--- a/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
@@ -25,6 +25,28 @@
 #ifndef _STM32_REGISTRY_H_

 #define _STM32_REGISTRY_H_

 

+#if defined(STM32L100xB) || defined(STM32L151xB) ||                         \

+    defined(STM32L152xB) || defined(__DOXYGEN__)

+#define STM32L1XX_MD

+

+#elif defined(STM32L100xBA) || defined(STM32L100xC)  ||                     \

+      defined(STM32L151xBA) || defined(STM32L151xC)  ||                     \

+      defined(STM32L151xCA) || defined(STM32L152xBA) ||                     \

+      defined(STM32L152xC)  || defined(STM32L152xCA) ||                     \

+      defined(STM32L162xC)  || defined(STM32L162xCA)

+#define STM32L1XX_MDP

+

+#elif defined(STM32L151xD)  || defined(STM32L151xDX) ||                     \

+      defined(STM32L151xE)  || defined(STM32L152xD)  ||                     \

+      defined(STM32L152xDX) || defined(STM32L152xE)  ||                     \

+      defined(STM32L162xD)  || defined(STM32L162xDX) ||                     \

+      defined(STM32L162xE)

+#define STM32L1XX_HD

+

+#else

+#error "STM32L1xx device not specified"

+#endif

+

 /*===========================================================================*/

 /* Platform capabilities.                                                    */

 /*===========================================================================*/