X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm926ejs.c;h=4e77ff2e2eadf990b1324433c809e7a5a8674c2f;hb=e00a56bede4308426d17fda8cafacf7ddc82a238;hp=1e0a579028fe6e1c0baf35d7f06df1e59e9f04af;hpb=5c2f920cc792d40f449cf596b5729671d0414fa1;p=openocd.git

diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 1e0a579028..4e77ff2e2e 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -656,17 +656,6 @@ int arm926ejs_write_memory(struct target *target, uint32_t address,
 	return retval;
 }
 
-int arm926ejs_write_memory_opt(struct target *target, uint32_t address,
-	uint32_t size, uint32_t count, const uint8_t *buffer)
-{
-	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
-
-	if (size == 4 && count > 32 && arm7_9->bulk_write_memory)
-		return arm7_9->bulk_write_memory(target, address, count, buffer);
-	else
-		return arm926ejs_write_memory(target, address, size, count, buffer);
-}
-
 static int arm926ejs_write_phys_memory(struct target *target,
 		uint32_t address, uint32_t size,
 		uint32_t count, const uint8_t *buffer)
@@ -702,6 +691,7 @@ int arm926ejs_init_arch_info(struct target *target, struct arm926ejs_common *arm
 
 	arm7_9->post_debug_entry = arm926ejs_post_debug_entry;
 	arm7_9->pre_restore_context = arm926ejs_pre_restore_context;
+	arm7_9->write_memory = arm926ejs_write_memory;
 
 	arm926ejs->read_cp15 = arm926ejs_cp15_read;
 	arm926ejs->write_cp15 = arm926ejs_cp15_write;
@@ -819,7 +809,7 @@ struct target_type arm926ejs_target = {
 	.get_gdb_reg_list = arm_get_gdb_reg_list,
 
 	.read_memory = arm7_9_read_memory,
-	.write_memory = arm926ejs_write_memory_opt,
+	.write_memory = arm7_9_write_memory_opt,
 
 	.checksum_memory = arm_checksum_memory,
 	.blank_check_memory = arm_blank_check_memory,