flash Kinetis: fix mdm check_security regression in JTAG mode

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

diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index d02918b493cf82cfe58f4101c19818b734ac1f0d..0b738e2db2a1c8ff24aba37f14d59f3e9ae7189f 100644 (file)
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -609,6 +609,9 @@ COMMAND_HANDLER(kinetis_check_flash_security_status)
                return ERROR_OK;
        }
 
                return ERROR_OK;
        }
 

+       if (!dap->ops)
+               return ERROR_OK;        /* too early to check, in JTAG mode ops may not be initialised */
+

        uint32_t val;
        int retval;
 
        uint32_t val;
        int retval;
 


@@ -623,7 +626,7 @@ COMMAND_HANDLER(kinetis_check_flash_security_status)
        }
 
        if (val == 0)
        }
 
        if (val == 0)

-               return ERROR_OK;
+               return ERROR_OK;        /* dap not yet initialised */

 
        bool found = false;
        for (size_t i = 0; i < ARRAY_SIZE(kinetis_known_mdm_ids); i++) {
 
        bool found = false;
        for (size_t i = 0; i < ARRAY_SIZE(kinetis_known_mdm_ids); i++) {