On 06/01/2011 07:06, Øyvind Harboe wrote:
Merged.
Thanks!
Sorry only just catching up with the list - made a couple of tweaks that
make things a bit safer and allow fallback for other targets, eg. mips.
Cheers
Spen
From aa61a3b3d8b6acad19050987835ec05f3d298bdb Mon Sep 17 00:00:00 2001
From: Spencer Oliver <[email protected]>
Date: Thu, 6 Jan 2011 10:35:59 +0000
Subject: [PATCH 2/2] cfi: use safer arch detection
Signed-off-by: Spencer Oliver <[email protected]>
---
src/flash/nor/cfi.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index b55e669..4fc800d 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -29,6 +29,7 @@
#include "cfi.h"
#include "non_cfi.h"
#include <target/arm.h>
+#include <target/arm7_9_common.h>
#include <target/armv7m.h>
#include <helper/binarybuffer.h>
#include <target/algorithm.h>
@@ -1644,18 +1645,23 @@ static int cfi_spansion_write_block(struct flash_bank
*bank, uint8_t *buffer,
0xeafffffe /* b 8204 <sp_8_done>
*/
};
- if(strcmp("cortex_m3", target_type_name(target)) == 0) /* Cortex-M3
target */
+ if (is_armv7m(target_to_armv7m(target))) /* Cortex-M3 target */
{
armv4_5_info.common_magic = ARMV7M_COMMON_MAGIC;
armv4_5_info.core_mode = ARMV7M_MODE_HANDLER;
armv4_5_info.core_state = ARM_STATE_ARM;
}
- else /* right now is only armv4_5 target */
+ else if (is_arm7_9(target_to_arm7_9(target)))
{
armv4_5_info.common_magic = ARM_COMMON_MAGIC;
armv4_5_info.core_mode = ARM_MODE_SVC;
armv4_5_info.core_state = ARM_STATE_ARM;
}
+ else
+ {
+ /* fallback to slow writes */
+ return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+ }
int target_code_size;
const uint32_t *target_code_src;
--
1.7.1
From 7351eecf6a6f1bf271c581f7f75525c3f9f44039 Mon Sep 17 00:00:00 2001
From: Spencer Oliver <[email protected]>
Date: Thu, 6 Jan 2011 10:35:02 +0000
Subject: [PATCH 1/2] loader: update loader src for armv7-m arch
Signed-off-by: Spencer Oliver <[email protected]>
---
contrib/loaders/checksum/armv7m_crc.s | 2 +-
contrib/loaders/flash/armv7m_cfi_span_16.s | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/contrib/loaders/checksum/armv7m_crc.s
b/contrib/loaders/checksum/armv7m_crc.s
index e50db0a..4a1e8b4 100644
--- a/contrib/loaders/checksum/armv7m_crc.s
+++ b/contrib/loaders/checksum/armv7m_crc.s
@@ -26,7 +26,7 @@
.text
.syntax unified
- .cpu cortex-m3
+ .arch armv7-m
.thumb
.thumb_func
diff --git a/contrib/loaders/flash/armv7m_cfi_span_16.s
b/contrib/loaders/flash/armv7m_cfi_span_16.s
index 7a9923f..ee3aa57 100644
--- a/contrib/loaders/flash/armv7m_cfi_span_16.s
+++ b/contrib/loaders/flash/armv7m_cfi_span_16.s
@@ -21,10 +21,12 @@
***************************************************************************/
.text
- .arm
- .arch armv4
+ .syntax unified
+ .arch armv7-m
+ .thumb
+ .thumb_func
- .section .init
+ .align 2
/* input parameters - */
/* R0 = source address */
--
1.7.1
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
