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>
Reviewed-on: http://openocd.zylin.com/3134
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Andreas Färber 2015-11-29 03:35:51 +01:00 committed by Andreas Fritiofson
parent 7cf68a0f16
commit c3c15d2e07
2 changed files with 3 additions and 9 deletions

View File

@ -0,0 +1,2 @@
/* Autogenerated with ../../../src/helper/bin2char.sh */
0x03,0x78,0x01,0x30,0x1a,0x40,0x01,0x39,0xfa,0xd1,0x00,0xbe,

View File

@ -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 */