[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openocd-development
Subject:    [OpenOCD-devel] [PATCH]: 6085aa5 armv7m: Integrate build of erase check code
From:       gerrit () openocd ! org (gerrit)
Date:       2015-11-29 3:34:46
Message-ID: 20151129033446.41BC219808D5 () mail ! openocd ! org
[Download RAW message or body]

This is an automated email from Gerrit.

Andreas Färber (afaerber@suse.de) just uploaded a new patch set to Gerrit, which you \
can find at http://openocd.zylin.com/3134

-- gerrit

commit 6085aa59ca19dafc026120906b1bd72519f303e5
Author: Andreas Färber <afaerber@suse.de>
Date:   Sun Nov 29 03:35:51 2015 +0100

    armv7m: Integrate build of erase check code
    
    Instead of documenting the file path as a comment and inline-commenting
    the THUMB bytecode, include the hex array via preprocessor.
    
    This assures the path is actually up-to-date and facilitates updating
    the code.
    
    Change-Id: Ieb0a7cd0bc14882ac96750f524616d9768a0c6f5
    Signed-off-by: Andreas Färber <afaerber@suse.de>

diff --git a/contrib/loaders/erase_check/armv7m_erase_check.inc \
b/contrib/loaders/erase_check/armv7m_erase_check.inc new file mode 100644
index 0000000..1fe25cd
--- /dev/null
+++ b/contrib/loaders/erase_check/armv7m_erase_check.inc
@@ -0,0 +1,2 @@
+/* Autogenerated with ../../../src/helper/bin2char.sh */
+0x03,0x78,0x01,0x30,0x1a,0x40,0x01,0x39,0xfa,0xd1,0x00,0xbe,
diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 15de8cd..52b394c 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -769,16 +769,8 @@ int armv7m_blank_check_memory(struct target *target,
 	struct armv7m_algorithm armv7m_info;
 	int retval;
 
-	/* see contrib/loaders/erase_check/armv7m_erase_check.s for src */
-
 	static const uint8_t erase_check_code[] = {
-		/* loop: */
-		0x03, 0x78,		/* ldrb	r3, [r0] */
-		0x01, 0x30,		/* adds	r0, #1 */
-		0x1A, 0x40,		/* ands	r2, r2, r3 */
-		0x01, 0x39,		/* subs	r1, r1, #1 */
-		0xFA, 0xD1,		/* bne	loop */
-		0x00, 0xBE		/* bkpt	#0 */
+#include "../../contrib/loaders/erase_check/armv7m_erase_check.inc"
 	};
 
 	/* make sure we have a working area */

-- 

------------------------------------------------------------------------------
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel


[prev in list] [next in list] [prev in thread] [next in thread]