This is an automated email from Gerrit.

Paul Fertser (fercer...@gmail.com) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/2173

-- gerrit

commit 8ee8f5c5abdb30415ca105d9d5db97ca4497b9b5
Author: Paul Fertser <fercer...@gmail.com>
Date:   Sun Jun 15 18:33:30 2014 +0400

    flash/nor/kinetis: prevent segfaulting with an HLA
    
    HLAs do not provide direct DAP access, so the best we can do about it
    is skipping it.
    
    Change-Id: I877ef8fd2d86e40e7442a637cdba182cfd60e05a
    Signed-off-by: Paul Fertser <fercer...@gmail.com>

diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index 42677a3..6f47461 100644
--- 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;
 
@@ -379,6 +384,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;

-- 

------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to