X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Flpc2900.c;h=13dd731c786e1777f09d981e0d8d1cc8915d6255;hb=3f18900b19f49a84ba9df56f2e089c255e610011;hp=cf746794f6932838c8b34abeed67a2fca5773d17;hpb=ddea03304310e1342ee127fc7e6507bbfb237ae4;p=openocd.git

diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index cf746794f6..13dd731c78 100644
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -23,11 +23,11 @@
 #endif
 
 
-#include "image.h"
-#include "flash.h"
+#include "imp.h"
 #include <helper/binarybuffer.h>
-#include <target/armv4_5.h>
 #include <target/algorithm.h>
+#include <target/arm.h>
+#include <target/image.h>
 
 
 /* 1024 bytes */
@@ -1302,7 +1302,7 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
 	if( warea )
 	{
 		struct reg_param reg_params[5];
-		struct armv4_5_algorithm armv4_5_info;
+		struct arm_algorithm armv4_5_info;
 
 		/* We can use target mode. Download the algorithm. */
 		retval = target_write_buffer( target,
@@ -1423,9 +1423,9 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
 			buf_set_u32(reg_params[4].value, 0, 32, FPTR_EN_T | prog_time);
 
 			/* Execute algorithm, assume breakpoint for last instruction */
-			armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
-			armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
-			armv4_5_info.core_state = ARMV4_5_STATE_ARM;
+			armv4_5_info.common_magic = ARM_COMMON_MAGIC;
+			armv4_5_info.core_mode = ARM_MODE_SVC;
+			armv4_5_info.core_state = ARM_STATE_ARM;
 
 			retval = target_run_algorithm(target, 0, NULL, 5, reg_params,
 				(warea->address) + buffer_size,