Merge pull request #1019 from Hoohaha/bugfix/fix_target_kinetis_attribute_error

target_kinetis: ensure AP#0 is MEM_AP to avoid AttributeError

Author: flit

pyocd/target/builtin/target_MKL28Z512xxx7.py

@@ -1,4 +1,5 @@
 # pyOCD debugger
+# Copyright (c) 2020 NXP
 # Copyright (c) 2006-2013,2018 Arm Limited
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -205,8 +206,11 @@ def create_init_sequence(self):
     def create_kl28_aps(self):
         """! @brief Set the fixed list of valid AP numbers for KL28."""
         self.dp.valid_aps = [0, 1, 2]
-        
+
     def detect_dual_core(self):
+        if not isinstance(self.aps[0], ap.MEM_AP):
+            return
+
         # Check if this is the dual core part.
         sdid = self.aps[0].read_memory(SIM_SDID)
         keyattr = (sdid & SIM_SDID_KEYATTR_MASK) >> SIM_SDID_KEYATTR_SHIFT
@@ -217,6 +221,8 @@ def detect_dual_core(self):
             self.memory_map = self.DUAL_MAP
 
     def post_connect_hook(self):
+        if not isinstance(self.aps[0], ap.MEM_AP):
+            return
         # Disable ROM vector table remapping.
         self.aps[0].write32(RCM_MR, RCM_MR_BOOTROM_MASK)
 

pyocd/target/family/target_kinetis.py

@@ -1,4 +1,5 @@
 # pyOCD debugger
+# Copyright (c) 2020 NXP
 # Copyright (c) 2006-2018 Arm Limited
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -117,8 +118,10 @@ def check_flash_security(self):
             canAccess = False
         else:
             try:
-                for attempt in range(ACCESS_TEST_ATTEMPTS):
-                    self.aps[0].read32(CortexM.DHCSR)
+                # Ensure to use AP#0 as a MEM_AP
+                if isinstance(self.aps[0], ap.MEM_AP):
+                    for attempt in range(ACCESS_TEST_ATTEMPTS):
+                        self.aps[0].read32(CortexM.DHCSR)
             except exceptions.TransferError:
                 LOG.debug("Access test failed with fault")
                 canAccess = False
@@ -157,7 +160,7 @@ def check_flash_security(self):
 
                 # Assert that halt on connect was forced above. Reset will stay asserted
                 # until halt on connect is executed.
-#                 assert self._force_halt_on_connect
+                # assert self._force_halt_on_connect
 
                 isLocked = False
             else: