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

diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c
index 109b48665d..de362cb809 100644
--- a/src/flash/nor/aduc702x.c
+++ b/src/flash/nor/aduc702x.c
@@ -23,11 +23,11 @@
 #include "config.h"
 #endif
 
-#include "flash.h"
-#include "armv4_5.h"
+#include "imp.h"
 #include <helper/binarybuffer.h>
-#include "time_support.h"
-#include "algorithm.h"
+#include <helper/time_support.h>
+#include <target/algorithm.h>
+#include <target/armv4_5.h>
 
 
 static int aduc702x_build_sector_list(struct flash_bank *bank);
@@ -241,9 +241,9 @@ static int aduc702x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32
 		}
 	}
 
-	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;
 
 	init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT);
 	init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);