diff options
| author | Andreas Färber <afaerber@suse.de> | 2015-11-29 04:15:57 +0100 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2016-05-22 15:50:49 +0100 |
| commit | 18f7a2d07274d59c1e676455eae48a8aa450c761 (patch) | |
| tree | 55b9c0c7d3837d3ed5fe1ddcec864b347bfdaf86 /contrib | |
| parent | e0ba93d018aef12b8e5ccbfe3e7a6fed06eb7258 (diff) | |
| download | riscv-openocd-18f7a2d07274d59c1e676455eae48a8aa450c761.zip riscv-openocd-18f7a2d07274d59c1e676455eae48a8aa450c761.tar.gz riscv-openocd-18f7a2d07274d59c1e676455eae48a8aa450c761.tar.bz2 | |
armv4_5: Integrate build of erase check code
Add rules to build armv4_5_erase_check.inc, and convert the code to
target endianness the least intrusive way.
Drop an unused word from the assembler sources to make the ARM bytecode
fully match that of armv4_5.c and to not break ARMv4 assumptions.
This completes the build rules for contrib/loaders/erase_check directory.
Change-Id: I36be7a944e26142088195fa3fb072d4e577bf328
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-on: http://openocd.zylin.com/3135
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/loaders/erase_check/Makefile | 11 | ||||
| -rw-r--r-- | contrib/loaders/erase_check/armv4_5_erase_check.inc | 3 | ||||
| -rw-r--r-- | contrib/loaders/erase_check/armv4_5_erase_check.s | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/contrib/loaders/erase_check/Makefile b/contrib/loaders/erase_check/Makefile index 32b7517..cd4d322 100644 --- a/contrib/loaders/erase_check/Makefile +++ b/contrib/loaders/erase_check/Makefile @@ -4,7 +4,16 @@ ARM_CROSS_COMPILE ?= arm-none-eabi- ARM_AS ?= $(ARM_CROSS_COMPILE)as ARM_OBJCOPY ?= $(ARM_CROSS_COMPILE)objcopy -arm: armv7m_erase_check.inc armv7m_0_erase_check.inc +arm: armv4_5_erase_check.inc armv7m_erase_check.inc armv7m_0_erase_check.inc + +armv4_5_%.elf: armv4_5_%.s + $(ARM_AS) $< -o $@ + +armv4_5_%.bin: armv4_5_%.elf + $(ARM_OBJCOPY) -Obinary $< $@ + +armv4_5_%.inc: armv4_5_%.bin + $(BIN2C) < $< > $@ armv7m_%.elf: armv7m_%.s $(ARM_AS) $< -o $@ diff --git a/contrib/loaders/erase_check/armv4_5_erase_check.inc b/contrib/loaders/erase_check/armv4_5_erase_check.inc new file mode 100644 index 0000000..f7f8ddf --- /dev/null +++ b/contrib/loaders/erase_check/armv4_5_erase_check.inc @@ -0,0 +1,3 @@ +/* Autogenerated with ../../../src/helper/bin2char.sh */ +0x01,0x30,0xd0,0xe4,0x03,0x20,0x02,0xe0,0x01,0x10,0x51,0xe2,0xfb,0xff,0xff,0x1a, +0x70,0x00,0x20,0xe1, diff --git a/contrib/loaders/erase_check/armv4_5_erase_check.s b/contrib/loaders/erase_check/armv4_5_erase_check.s index 6d075a9..6c7d27f 100644 --- a/contrib/loaders/erase_check/armv4_5_erase_check.s +++ b/contrib/loaders/erase_check/armv4_5_erase_check.s @@ -36,6 +36,4 @@ loop: end: bkpt #0 -CRC32XOR: .word 0x04c11db7 - .end |