NXP: Kinetis board updates (#1038)

mathias-arm · web-flow · commit 06fa0a9ca76a · 2023-08-05T17:55:02.000-05:00
- Add FRDM-K32L3A6
- Add TWR-KV58F
- Remove FRDM-K32W042
diff --git a/projects.yaml b/projects.yaml
@@ -318,14 +318,18 @@ projects:
         - *module_if
         - *module_hic_k20dx
         - records/board/twrkl28z72m.yaml
+    k20dx_twrkv58f220m_if:
+        - *module_if
+        - *module_hic_k20dx
+        - records/board/twrkv58f220m.yaml
     k20dx_xdot_l151_if:
         - *module_if
         - *module_hic_k20dx
         - records/board/xDot-L151.yaml
-    k26f_frdmk32w042_if:
+    k26f_frdmk32l3a6_if:
         - *module_if
         - *module_hic_k26f
-        - records/board/frdmk32w042.yaml
+        - records/board/frdmk32l3a6.yaml
     kl26z_artemis_dk_if:
         - *module_if
         - *module_hic_kl26z
diff --git a/records/board/frdmk32l3a6.yaml b/records/board/frdmk32l3a6.yaml
@@ -0,0 +1,7 @@
+common:
+    sources:
+        board:
+            - source/board/frdmk32l3a6.c
+        family:
+            - source/family/freescale/k32l3a6/target.c
+            - source/family/freescale/target_reset_k32_series.c
diff --git a/records/board/frdmk32w042.yaml b/records/board/frdmk32w042.yaml
diff --git a/records/board/twrkv58f220m.yaml b/records/board/twrkv58f220m.yaml
@@ -0,0 +1,7 @@
+common:
+    sources:
+        board:
+            - source/board/twrkv58f.c
+        family:
+            - source/family/freescale/kv58f/target.c
+            - source/family/freescale/target_reset_Vseries.c
diff --git a/records/family/all_family.yaml b/records/family/all_family.yaml
@@ -5,6 +5,7 @@ common:
             - source/family/freescale/target_reset_Lseries.c
             - source/family/freescale/target_reset_mimxrt.c
             - source/family/freescale/target_reset_rapid_iot.c
+            - source/family/freescale/target_reset_k32_series.c
             - source/family/nordic/target_reset_nrf51.c
             - source/family/nordic/target_reset_nrf52.c
             - source/family/realtek/target_reset_realtek_rtl8195am.c
diff --git a/records/family/nxp_kinetis_vseries.yaml b/records/family/nxp_kinetis_vseries.yaml
@@ -0,0 +1,4 @@
+common:
+    sources:
+        target:
+            - source/target/freescale/target_reset_Vseries.c
diff --git a/source/board/frdmk20dx.c b/source/board/frdmk20dx.c
@@ -26,6 +26,9 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0230",
     .family_id = kNXP_KinetisK_FamilyID,
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "K20D50M",
+    .daplink_target_url = "http://www.nxp.com/frdm-k20d50m",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
     .board_name = "FRDM-K20D50M",
diff --git a/source/board/frdmk22f.c b/source/board/frdmk22f.c
@@ -26,6 +26,9 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0231",
     .family_id = kNXP_KinetisK_FamilyID,
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-K22FD",
+    .daplink_target_url = "http://www.nxp.com/frdm-k22f",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
     .board_name = "FRDM-K22F",
diff --git a/source/board/frdmk32l3a6.c b/source/board/frdmk32l3a6.c
@@ -1,6 +1,6 @@
 /**
- * @file    frdmk32w042.c
- * @brief   board ID for the NXP FRDM-K32W042 board
+ * @file    frdmk32l3a6.c
+ * @brief   board ID for the NXP FRDM-K32L3A6 board
  *
  * DAPLink Interface Firmware
  * Copyright (c) 2017-2019, ARM Limited, All Rights Reserved
@@ -24,11 +24,13 @@
 
 const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
-    .board_id = "0225",
-    .family_id = kNXP_KinetisK32W_FamilyID,
+    .board_id = "0237",
+    .family_id = kNXP_KinetisK32_FamilyID,
     .flags = kEnablePageErase,
     .daplink_url_name =   "PRODINFOHTM",
-    .daplink_drive_name = "K32W042",
-    .daplink_target_url = "http://www.nxp.com/frdm-k32w042",
+    .daplink_drive_name = "K32L3A6",
+    .daplink_target_url = "http://www.nxp.com/frdm-k32l3a6",
     .target_cfg = &target_device,
+    .board_vendor = "NXP",
+    .board_name = "FRDM-K32L3A6",
 };
diff --git a/source/board/frdmk64f.c b/source/board/frdmk64f.c
@@ -28,6 +28,9 @@ const board_info_t g_board_info = {
     .family_id = kNXP_KinetisK_FamilyID,
     .flags = kEnablePageErase,
     .target_cfg = &target_device,
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-K64FD",
+    .daplink_target_url = "http://www.nxp.com/frdm-k64f",
     .board_vendor = "NXP",
     .board_name = "FRDM-K64F",
 };
diff --git a/source/board/frdmk82f.c b/source/board/frdmk82f.c
@@ -26,8 +26,8 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0217",
     .family_id = kNXP_KinetisK_FamilyID,
-    .daplink_url_name =       "PRODINFOHTM",
-    .daplink_drive_name = 	"FRDM-K82FD",
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-K82FD",
     .daplink_target_url = "http://www.nxp.com/frdm-k82f",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
diff --git a/source/board/frdmke15z.c b/source/board/frdmke15z.c
@@ -26,8 +26,8 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0213",
     .family_id = kNXP_KinetisL_FamilyID,
-    .daplink_url_name =       "PRODINFOHTM",
-    .daplink_drive_name = 		"FRDM-KE15ZD",
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KE15ZD",
     .daplink_target_url = "http://www.nxp.com/frdm-ke15z",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
diff --git a/source/board/frdmkl02z.c b/source/board/frdmkl02z.c
@@ -26,6 +26,9 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0204",
     .family_id = kNXP_KinetisL_FamilyID,
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KL02ZD",
+    .daplink_target_url = "http://www.nxp.com/frdm-kl02z",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
     .board_name = "FRDM-KL02Z",
diff --git a/source/board/frdmkl03z.c b/source/board/frdmkl03z.c
@@ -26,5 +26,10 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0207",
     .family_id = kNXP_KinetisL_FamilyID,
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KL03ZD",
+    .daplink_target_url = "http://www.nxp.com/frdm-kl03z",
     .target_cfg = &target_device,
+    .board_vendor = "NXP",
+    .board_name = "FRDM-KL03Z",
 };
diff --git a/source/board/frdmkl05z.c b/source/board/frdmkl05z.c
@@ -26,6 +26,9 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0210",
     .family_id = kNXP_KinetisL_FamilyID,
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KL05ZD",
+    .daplink_target_url = "http://www.nxp.com/frdm-kl05z",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
     .board_name = "FRDM-KL05Z",
diff --git a/source/board/frdmkl25z.c b/source/board/frdmkl25z.c
@@ -26,6 +26,9 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0200",
     .family_id = kNXP_KinetisL_FamilyID,
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KL25ZD",
+    .daplink_target_url = "http://www.nxp.com/frdm-kl25z",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
     .board_name = "FRDM-KL25Z",
diff --git a/source/board/frdmkl26z.c b/source/board/frdmkl26z.c
@@ -26,6 +26,9 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0260",
     .family_id = kNXP_KinetisL_FamilyID,
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KL26ZD",
+    .daplink_target_url = "http://www.nxp.com/frdm-kl26z",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
     .board_name = "FRDM-KL26Z",
diff --git a/source/board/frdmkl27z.c b/source/board/frdmkl27z.c
@@ -26,8 +26,8 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0261",
     .family_id = kNXP_KinetisL_FamilyID,
-    .daplink_url_name =       "PRODINFOHTM",
-    .daplink_drive_name = 	"FRDM-KL27ZD",
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KL27ZD",
     .daplink_target_url = "http://www.nxp.com/frdm-kl27z",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
diff --git a/source/board/frdmkl28z.c b/source/board/frdmkl28z.c
@@ -26,8 +26,8 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0205",
     .family_id = kNXP_KinetisL_FamilyID,
-    .daplink_url_name =       "PRODINFOHTM",
-    .daplink_drive_name = 	"FRDM-KL28ZD",
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KL28ZD",
     .daplink_target_url = "http://www.nxp.com/frdm-kl28z",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
diff --git a/source/board/frdmkl43z.c b/source/board/frdmkl43z.c
@@ -26,8 +26,8 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0262",
     .family_id = kNXP_KinetisL_FamilyID,
-    .daplink_url_name =       "PRODINFOHTM",
-    .daplink_drive_name = 	"FRDM-KL43ZD",
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KL43ZD",
     .daplink_target_url = "http://www.nxp.com/frdm-kl43z",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
diff --git a/source/board/frdmkl46z.c b/source/board/frdmkl46z.c
@@ -26,6 +26,9 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0220",
     .family_id = kNXP_KinetisL_FamilyID,
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KL46ZD",
+    .daplink_target_url = "http://www.nxp.com/frdm-kl46z",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
     .board_name = "FRDM-KL46Z",
diff --git a/source/board/frdmkl82z.c b/source/board/frdmkl82z.c
@@ -26,8 +26,8 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0218",
     .family_id = kNXP_KinetisL_FamilyID,
-    .daplink_url_name =       "PRODINFOHTM",
-    .daplink_drive_name = 	"FRDM-KL82Z",
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KL82Z",
     .daplink_target_url = "http://www.nxp.com/frdm-kl82z",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
diff --git a/source/board/frdmkw24d.c b/source/board/frdmkw24d.c
@@ -26,8 +26,8 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0250",
     .family_id = kNXP_KinetisK_FamilyID,
-    .daplink_url_name =       "PRODINFOHTM",
-    .daplink_drive_name = 	"FRDM-KW24D",
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KW24D",
     .daplink_target_url = "http://www.nxp.com/frdm-kw24d",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
diff --git a/source/board/frdmkw41z.c b/source/board/frdmkw41z.c
@@ -26,8 +26,8 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0201",
     .family_id = kNXP_KinetisL_FamilyID,
-    .daplink_url_name =       "PRODINFOHTM",
-    .daplink_drive_name = 	"FRDM-KW41Z",
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "FRDM-KW41Z",
     .daplink_target_url = "http://www.nxp.com/frdm-kw41z",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
diff --git a/source/board/k20dx_bl.c b/source/board/k20dx_bl.c
@@ -59,8 +59,8 @@ const target_family_descriptor_t *g_target_family = NULL;
 const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0000",
-    .daplink_url_name =       "HELP_FAQHTM",
-    .daplink_drive_name = 		"MAINTENANCE",
+    .daplink_url_name =   "HELP_FAQHTM",
+    .daplink_drive_name = "MAINTENANCE",
     .daplink_target_url = "https://daplink.io",
     .target_cfg = &target_device,
 };
diff --git a/source/board/kl26z_bl.c b/source/board/kl26z_bl.c
@@ -58,8 +58,8 @@ const target_family_descriptor_t *g_target_family = NULL;
 const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0000",
-    .daplink_url_name =       "HELP_FAQHTM",
-    .daplink_drive_name =       "MAINTENANCE",
+    .daplink_url_name =   "HELP_FAQHTM",
+    .daplink_drive_name = "MAINTENANCE",
     .daplink_target_url = "https://daplink.io",
     .target_cfg = &target_device,
 };
diff --git a/source/board/kl27z_bl.c b/source/board/kl27z_bl.c
@@ -58,8 +58,8 @@ const target_family_descriptor_t *g_target_family = NULL;
 const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0000",
-    .daplink_url_name =       "HELP_FAQHTM",
-    .daplink_drive_name =       "MAINTENANCE",
+    .daplink_url_name =   "HELP_FAQHTM",
+    .daplink_drive_name = "MAINTENANCE",
     .daplink_target_url = "https://daplink.io",
     .target_cfg = &target_device,
 };
diff --git a/source/board/kl27z_microbit_bl.c b/source/board/kl27z_microbit_bl.c
@@ -61,8 +61,8 @@ const target_family_descriptor_t *g_target_family = NULL;
 const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = BOARD_ID_MB_2_DEFAULT,
-    .daplink_url_name =       "HELP_FAQHTM",
-    .daplink_drive_name =       "MAINTENANCE",
+    .daplink_url_name =   "HELP_FAQHTM",
+    .daplink_drive_name = "MAINTENANCE",
     .daplink_target_url = "https://microbit.org/device/?id=@B&v=@V&bl=1",
     .target_cfg = &target_device,
 };
diff --git a/source/board/twrke18f.c b/source/board/twrke18f.c
@@ -26,8 +26,8 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0206",
     .family_id = kNXP_KinetisK_FamilyID,
-    .daplink_url_name =       "PRODINFOHTM",
-    .daplink_drive_name = 	"TWR-KE18FD",
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "TWR-KE18FD",
     .daplink_target_url = "http://www.nxp.com/twr-ke18f",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
diff --git a/source/board/twrkl28z72m.c b/source/board/twrkl28z72m.c
@@ -26,8 +26,8 @@ const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0203",
     .family_id = kNXP_KinetisL_FamilyID,
-    .daplink_url_name =       "PRODINFOHTM",
-    .daplink_drive_name = 	"TWR-KL28ZD",
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "TWR-KL28ZD",
     .daplink_target_url = "http://www.nxp.com/twr-kl28z72m",
     .target_cfg = &target_device,
     .board_vendor = "NXP",
diff --git a/source/board/twrkv58f.c b/source/board/twrkv58f.c
@@ -0,0 +1,36 @@
+/**
+ * @file    twrkv58f.c
+ * @brief   board ID for the NXP TWR-KV58F220M board
+ *
+ * DAPLink Interface Firmware
+ * Copyright (c) 2009-2019, ARM Limited, All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "target_board.h"
+#include "target_family.h"
+
+const board_info_t g_board_info = {
+    .info_version = kBoardInfoVersion,
+    .board_id = "0330",
+    .family_id = kNXP_KinetisV_FamilyID,
+    .flags = kEnablePageErase,
+    .daplink_url_name =   "PRODINFOHTM",
+    .daplink_drive_name = "KV58F220M",
+    .daplink_target_url = "http://www.nxp.com/twr-kv58f220m",
+    .target_cfg = &target_device,
+    .board_vendor = "NXP",
+    .board_name = "TWR-KV58F220M",
+};
diff --git a/source/daplink/cmsis-dap/debug_cm.h b/source/daplink/cmsis-dap/debug_cm.h
@@ -94,6 +94,7 @@
 #define CSW_MSTRCORE   0x00000000  // Master Type: Core
 #define CSW_MSTRDBG    0x20000000  // Master Type: Debug
 #define CSW_RESERVED   0x01000000  // Reserved Value
+#define CSW_SPROT      0x40000000  // SProt
 
 // Core Debug Register Address Offsets
 #define DBG_OFS        0x0DF0      // Debug Register Offset inside NVIC
diff --git a/source/family/freescale/k32l3a6/flash_blob.c b/source/family/freescale/k32l3a6/flash_blob.c
diff --git a/source/family/freescale/k32l3a6/target.c b/source/family/freescale/k32l3a6/target.c
diff --git a/source/family/freescale/k32w042/flash_blob.c b/source/family/freescale/k32w042/flash_blob.c
diff --git a/source/family/freescale/kv58f/flash_blob.c b/source/family/freescale/kv58f/flash_blob.c
diff --git a/source/family/freescale/kv58f/target.c b/source/family/freescale/kv58f/target.c
diff --git a/source/family/freescale/target_reset_Vseries.c b/source/family/freescale/target_reset_Vseries.c
diff --git a/source/family/freescale/target_reset_k32_series.c b/source/family/freescale/target_reset_k32_series.c
diff --git a/source/target/target_family.c b/source/target/target_family.c
diff --git a/source/target/target_family.h b/source/target/target_family.h
diff --git a/test/info.py b/test/info.py

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +common:
 +    sources:
 +        target:
 +            - source/target/freescale/target_reset_Vseries.c