From 7b80a441f5fe8d7bd53a6b5f350bfadfa8414399 Mon Sep 17 00:00:00 2001
From: jeromecoutant <jerome.coutant@st.com>
Date: Wed, 31 Mar 2021 10:24:07 +0200
Subject: [PATCH] STM32L4: update device_name

---
 targets/targets.json                     | 24 ++++++++++++------------
 tools/arm_pack_manager/aliases.json      | 24 ------------------------
 tools/arm_pack_manager/legacy-names.json | 15 +--------------
 3 files changed, 13 insertions(+), 50 deletions(-)

diff --git a/targets/targets.json b/targets/targets.json
index a26264fc32..4fb5ffbb0f 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -3562,7 +3562,7 @@
         "detect_code": [
             "0770"
         ],
-        "device_name": "STM32L432KC"
+        "device_name": "STM32L432KCUx"
     },
     "MCU_STM32L433xC": {
         "inherits": [
@@ -3586,7 +3586,7 @@
         "detect_code": [
             "0779"
         ],
-        "device_name": "STM32L433RC"
+        "device_name": "STM32L433RCTx"
     },
     "MCU_STM32L443xC": {
         "inherits": [
@@ -3613,7 +3613,7 @@
         "device_has_remove": [
             "LPTICKER"
         ],
-        "device_name": "STM32L443RC",
+        "device_name": "STM32L443RCTx",
         "detect_code": [
             "0458"
         ]
@@ -3666,7 +3666,7 @@
         "detect_code": [
             "0312"
         ],
-        "device_name": "STM32L471QG"
+        "device_name": "STM32L471QGIx"
     },
     "MCU_STM32L475xG": {
         "inherits": [
@@ -3712,7 +3712,7 @@
         "features": [
             "BLE"
         ],
-        "device_name": "STM32L475VG"
+        "device_name": "STM32L475VGTx"
     },
     "MCU_STM32L476xG": {
         "inherits": [
@@ -3743,7 +3743,7 @@
         "detect_code": [
             "0765"
         ],
-        "device_name": "STM32L476RG"
+        "device_name": "STM32L476RGTx"
     },
     "DISCO_L476VG": {
         "inherits": [
@@ -3762,7 +3762,7 @@
             "QSPI",
             "USBDEVICE"
         ],
-        "device_name": "STM32L476VG"
+        "device_name": "STM32L476VGTx"
     },
     "RHOMBIO_L476DMW1K": {
         "inherits": [
@@ -3777,7 +3777,7 @@
         "device_has_add": [
             "QSPI"
         ],
-        "device_name": "STM32L476VG"
+        "device_name": "STM32L476VGTx"
     },
     "MCU_STM32L486xG": {
         "inherits": [
@@ -3809,7 +3809,7 @@
         "detect_code": [
             "0827"
         ],
-        "device_name": "STM32L486RG"
+        "device_name": "STM32L486RGTx"
     },
     "ADV_WISE_1570": {
         "inherits": [
@@ -3824,7 +3824,7 @@
         "macros_add": [
             "WISE_1570"
         ],
-        "device_name": "STM32L486RG",
+        "device_name": "STM32L486RGTx",
         "OUTPUT_EXT": "hex"
     },
     "MCU_STM32L496xG": {
@@ -3867,7 +3867,7 @@
             "USBDEVICE",
             "QSPI"
         ],
-        "device_name": "STM32L496AG"
+        "device_name": "STM32L496AGIx"
     },
     "NUCLEO_L496ZG": {
         "inherits": [
@@ -3882,7 +3882,7 @@
         "device_has_add": [
             "USBDEVICE"
         ],
-        "device_name": "STM32L496ZG"
+        "device_name": "STM32L496ZGTx"
     },
     "NUCLEO_L496ZG_P": {
         "inherits": [
diff --git a/tools/arm_pack_manager/aliases.json b/tools/arm_pack_manager/aliases.json
index 013b2937a1..18fe4c9708 100644
--- a/tools/arm_pack_manager/aliases.json
+++ b/tools/arm_pack_manager/aliases.json
@@ -908,12 +908,6 @@
       "nRF51422_xxAA"
     ]
   },
-  "NUCLEO-L476RG": {
-    "name": "NUCLEO-L476RG",
-    "mounted_devices": [
-      "STM32L476RG"
-    ]
-  },
   "NuTiny-SDK-M051": {
     "name": "NuTiny-SDK-M051",
     "mounted_devices": [
@@ -1174,24 +1168,6 @@
       "SN32F70*B"
     ]
   },
-  "STM32L476G-EVAL": {
-    "name": "STM32L476G-EVAL",
-    "mounted_devices": [
-      "STM32L476ZG"
-    ]
-  },
-  "STM32L496G-Discovery": {
-    "name": "STM32L496G-Discovery",
-    "mounted_devices": [
-      "STM32L496AGIx"
-    ]
-  },
-  "STM32L4R9I-EVAL": {
-    "name": "STM32L4R9I-EVAL",
-    "mounted_devices": [
-      "STM32L4R9AIIx"
-    ]
-  },
   "TLE984x Eval.Board Rev1.4": {
     "name": "TLE984x Eval.Board Rev1.4",
     "mounted_devices": [
diff --git a/tools/arm_pack_manager/legacy-names.json b/tools/arm_pack_manager/legacy-names.json
index c46bb7fe0b..8cafee03f8 100644
--- a/tools/arm_pack_manager/legacy-names.json
+++ b/tools/arm_pack_manager/legacy-names.json
@@ -6,18 +6,5 @@
     "MKL43Z256xxx4": "MKL43Z256VLH4",
     "MKL46Z256xxx4": "MKL46Z256VLL4",
     "MKL82Z128xxx7": "MKL82Z128VLK7",
-    "R7S72103": "R7S72100",
-
-    "STM32L432KC": "STM32L432KCUx",
-    "STM32L433RC": "STM32L433RCTx",
-    "STM32L443RC": "STM32L443RCTx",
-    "STM32L471QG": "STM32L471QGIx",
-    "STM32L475VG": "STM32L475VGTx",
-    "STM32L476JG": "STM32L476JGYx",
-    "STM32L476RG": "STM32L476RGTx",
-    "STM32L476VG": "STM32L476VGTx",
-    "STM32L486RG": "STM32L486RGTx",
-    "STM32L496AG": "STM32L496AGIx",
-    "STM32L496ZG": "STM32L496ZGTx",
-    "STM32L4R5ZI": "STM32L4R5ZITx"
+    "R7S72103": "R7S72100"
 }