kinetis : Added Kinetis-K Series MDM-AP ID.

[openocd.git] / src / flash / nor / kinetis.c

diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index 42677a385c6482bf45d71f4c6c3443cdfab75acd..e8917c7d32c2ff4cf8418a9510e4a5ea0ba78a7e 100644 (file)
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -298,6 +298,11 @@ COMMAND_HANDLER(kinetis_mdm_mass_erase)
        struct cortex_m_common *cortex_m = target_to_cm(target);
        struct adiv5_dap *dap = cortex_m->armv7m.arm.dap;
 
+       if (!dap) {
+               LOG_ERROR("Cannot perform mass erase with a high-level adapter");
+               return ERROR_FAIL;
+       }
+
        int retval;
        const uint8_t original_ap = dap->ap_current;
 
@@ -364,7 +369,8 @@ COMMAND_HANDLER(kinetis_mdm_mass_erase)
 }
 
 static const uint32_t kinetis_known_mdm_ids[] = {
-       0x001C0020,     /* KL26Z */
+       0x001C0000,     /* Kinetis-K Series */
+       0x001C0020,     /* Kinetis-L/M/V/E Series */
 };
 
 /*
@@ -379,6 +385,11 @@ COMMAND_HANDLER(kinetis_check_flash_security_status)
        struct cortex_m_common *cortex_m = target_to_cm(target);
        struct adiv5_dap *dap = cortex_m->armv7m.arm.dap;
 
+       if (!dap) {
+               LOG_WARNING("Cannot check flash security status with a high-level adapter");
+               return ERROR_OK;
+       }
+
        uint32_t val;
        int retval;
        const uint8_t origninal_ap = dap->ap_current;