summaryrefslogtreecommitdiff
path: root/src/flash
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-12-07 14:54:13 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2009-12-07 14:57:44 -0800
commit0a1b7dcfc40385f09b5eb088cd97d6ff25a5816d (patch)
tree025315bb7ed2228175cb8d501f24b37582080cc9 /src/flash
parent0529c14bfeb113ee37f4d961f9309102d57a1e39 (diff)
downloadopenocd+libswd-0a1b7dcfc40385f09b5eb088cd97d6ff25a5816d.tar.gz
openocd+libswd-0a1b7dcfc40385f09b5eb088cd97d6ff25a5816d.tar.bz2
openocd+libswd-0a1b7dcfc40385f09b5eb088cd97d6ff25a5816d.tar.xz
openocd+libswd-0a1b7dcfc40385f09b5eb088cd97d6ff25a5816d.zip
ARM: use <target/arm.h> not armv4_5.h
Move most declarations in <target/armv4_5.h> to <target/arm.h> and update users. What's left in the older file is stuff that I think should be removed ... the old register cache access stuff, which makes it awkward to support microcontroller profile (Cortex-M) cores. The armv4_5_run_algorithm() declaration was moved too, even though it's not yet as generic as it probably ought to be. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/flash')
-rw-r--r--src/flash/nand/arm_io.c2
-rw-r--r--src/flash/nand/orion.c2
-rw-r--r--src/flash/nor/aduc702x.c2
-rw-r--r--src/flash/nor/cfi.c2
-rw-r--r--src/flash/nor/lpc2900.c2
-rw-r--r--src/flash/nor/str7x.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/flash/nand/arm_io.c b/src/flash/nand/arm_io.c
index 4c746757..0cd39c00 100644
--- a/src/flash/nand/arm_io.c
+++ b/src/flash/nand/arm_io.c
@@ -27,7 +27,7 @@
#include "core.h"
#include "arm_io.h"
#include <helper/binarybuffer.h>
-#include <target/armv4_5.h>
+#include <target/arm.h>
#include <target/algorithm.h>
diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c
index 01d4a082..b46ffaed 100644
--- a/src/flash/nand/orion.c
+++ b/src/flash/nand/orion.c
@@ -28,7 +28,7 @@
#include "imp.h"
#include "arm_io.h"
-#include <target/armv4_5.h>
+#include <target/arm.h>
struct orion_nand_controller
diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c
index 57018bb1..211b54e7 100644
--- a/src/flash/nor/aduc702x.c
+++ b/src/flash/nor/aduc702x.c
@@ -27,7 +27,7 @@
#include <helper/binarybuffer.h>
#include <helper/time_support.h>
#include <target/algorithm.h>
-#include <target/armv4_5.h>
+#include <target/arm.h>
static int aduc702x_build_sector_list(struct flash_bank *bank);
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 1ab93418..71270b99 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -26,7 +26,7 @@
#include "imp.h"
#include "cfi.h"
#include "non_cfi.h"
-#include <target/armv4_5.h>
+#include <target/arm.h>
#include <helper/binarybuffer.h>
#include <target/algorithm.h>
diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index ce74bbba..13dd731c 100644
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -26,7 +26,7 @@
#include "imp.h"
#include <helper/binarybuffer.h>
#include <target/algorithm.h>
-#include <target/armv4_5.h>
+#include <target/arm.h>
#include <target/image.h>
diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c
index ef693e95..040097a0 100644
--- a/src/flash/nor/str7x.c
+++ b/src/flash/nor/str7x.c
@@ -26,7 +26,7 @@
#include "imp.h"
#include "str7x.h"
-#include <target/armv4_5.h>
+#include <target/arm.h>
#include <helper/binarybuffer.h>
#include <target/algorithm.h>