X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fflash%2Fnor%2Fstr7x.c;h=040097a0131a5caf9bfeae1b1fdaafad8cc63179;hb=0a1b7dcfc40385f09b5eb088cd97d6ff25a5816d;hp=4da3f07eef248384afe91f588a4911ecf52c2e5c;hpb=2958665f6b1239705a7dcc2b275810c394023f0f;p=openocd.git

diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c
index 4da3f07eef..040097a013 100644
--- a/src/flash/nor/str7x.c
+++ b/src/flash/nor/str7x.c
@@ -24,8 +24,9 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "str7x.h"
-#include "armv4_5.h"
+#include <target/arm.h>
 #include <helper/binarybuffer.h>
 #include <target/algorithm.h>
 
@@ -317,7 +318,7 @@ static int str7x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32_t
 	struct working_area *source;
 	uint32_t address = bank->base + offset;
 	struct reg_param reg_params[6];
-	struct armv4_5_algorithm armv4_5_info;
+	struct arm_algorithm armv4_5_info;
 	int retval = ERROR_OK;
 
 	uint32_t str7x_flash_write_code[] = {
@@ -370,9 +371,9 @@ static int str7x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32_t
 		}
 	}
 
-	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);