X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Favrf.c;fp=src%2Fflash%2Fnor%2Favrf.c;h=aa864590907eb04a23f24416270cf10b2d36756e;hp=178567e6b4fceb90d2bf26519c8e6bb9fcc85a19;hb=a708b6d25ec72c6de57ff42bdc6c0b4d52a69388;hpb=85dc63011378c0a8112f99e3a02fa971f96bbc05;ds=sidebyside

diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c
index 178567e6b4..aa86459090 100644
--- a/src/flash/nor/avrf.c
+++ b/src/flash/nor/avrf.c
@@ -142,6 +142,7 @@ static int avr_jtagprg_chiperase(struct avr_common *avr)
 }
 
 static int avr_jtagprg_writeflashpage(struct avr_common *avr,
+	const bool ext_addressing,
 	const uint8_t *page_buf,
 	uint32_t buf_size,
 	uint32_t addr,
@@ -152,6 +153,13 @@ static int avr_jtagprg_writeflashpage(struct avr_common *avr,
 	avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_PROG_COMMANDS);
 	avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x2310, AVR_JTAG_REG_ProgrammingCommand_Len);
 
+	/* load extended high byte */
+	if (ext_addressing)
+		avr_jtag_senddat(avr->jtag_info.tap,
+			NULL,
+			0x0b00 | ((addr >> 17) & 0xFF),
+			AVR_JTAG_REG_ProgrammingCommand_Len);
+
 	/* load addr high byte */
 	avr_jtag_senddat(avr->jtag_info.tap,
 		NULL,
@@ -238,6 +246,7 @@ static int avrf_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t o
 	struct target *target = bank->target;
 	struct avr_common *avr = target->arch_info;
 	uint32_t cur_size, cur_buffer_size, page_size;
+	bool ext_addressing;
 
 	if (bank->target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
@@ -258,6 +267,11 @@ static int avrf_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t o
 	if (ERROR_OK != avr_jtagprg_enterprogmode(avr))
 		return ERROR_FAIL;
 
+	if (bank->size > 0x20000)
+		ext_addressing = true;
+	else
+		ext_addressing = false;
+
 	cur_size = 0;
 	while (count > 0) {
 		if (count > page_size)
@@ -265,6 +279,7 @@ static int avrf_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t o
 		else
 			cur_buffer_size = count;
 		avr_jtagprg_writeflashpage(avr,
+			ext_addressing,
 			buffer + cur_size,
 			cur_buffer_size,
 			offset + cur_size,