X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Flpc2900.c;h=1ef759e2b05bc5f7659f2831719e93c800a3e93b;hb=e51b9a4ac7afa0fde11690268ba88861e1000f60;hp=bb467c547b7dedc7b8edcd04d7383e5c98d88fa6;hpb=d1bc4375e99ce52b72988494f35beca364234bae;p=openocd.git

diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index bb467c547b..1ef759e2b0 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 "armv4_5.h"
-#include "algorithm.h"
+#include <target/algorithm.h>
+#include <target/armv4_5.h>
+#include <target/image.h>
 
 
 /* 1024 bytes */
@@ -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,