[WIP] flash/nor/{,jtag}spi.c: fix for flashing AFCv3

Author: guilhermerc

src/flash/nor/jtagspi.c

@@ -609,7 +609,8 @@ static int jtagspi_sector_erase(struct flash_bank *bank, unsigned int sector)
 		return retval;
 
 	/* ATXP032/064/128 use always 4-byte addresses except for 0x03 read */
-	unsigned int addr_len = info->always_4byte ? 4 : info->addr_len;
+	//unsigned int addr_len = info->always_4byte ? 4 : info->addr_len;
+	unsigned int addr_len = 3;
 
 	retval = jtagspi_cmd(bank, info->dev.erase_cmd, fill_addr(bank->sectors[sector].offset, addr_len, addr),
 			addr_len, NULL, 0);
@@ -731,7 +732,8 @@ static int jtagspi_page_write(struct flash_bank *bank, const uint8_t *buffer, ui
 		return retval;
 
 	/* ATXP032/064/128 use always 4-byte addresses except for 0x03 read */
-	unsigned int addr_len = ((info->dev.read_cmd != 0x03) && info->always_4byte) ? 4 : info->addr_len;
+	//unsigned int addr_len = ((info->dev.read_cmd != 0x03) && info->always_4byte) ? 4 : info->addr_len;
+	unsigned int addr_len = 3;
 
 	retval = jtagspi_cmd(bank, info->dev.pprog_cmd, fill_addr(offset, addr_len, addr),
 		addr_len, (uint8_t *) buffer, count);

src/flash/nor/spi.c

@@ -119,7 +119,7 @@ const struct flash_device flash_devices[] = {
 	FLASH_ID("micron n25q032",      0x03, 0xeb, 0x02, 0xd8, 0xc7, 0x0016ba20, 0x100, 0x10000, 0x400000),
 	FLASH_ID("micron n25q064",      0x03, 0xeb, 0x02, 0xd8, 0xc7, 0x0017ba20, 0x100, 0x10000, 0x800000),
 	FLASH_ID("micron n25q128",      0x03, 0xeb, 0x02, 0xd8, 0xc7, 0x0018ba20, 0x100, 0x10000, 0x1000000),
-	FLASH_ID("micron n25q256 3v",   0x13, 0xec, 0x12, 0xdc, 0xc7, 0x0019ba20, 0x100, 0x10000, 0x2000000),
+	FLASH_ID("micron n25q256 3v",   0x13, 0xec, 0x02, 0xd8, 0xc7, 0x0019ba20, 0x100, 0x10000, 0x2000000),
 	FLASH_ID("micron n25q256 1.8v", 0x13, 0xec, 0x12, 0xdc, 0xc7, 0x0019bb20, 0x100, 0x10000, 0x2000000),
 	FLASH_ID("micron mt25ql512",    0x13, 0xec, 0x12, 0xdc, 0xc7, 0x0020ba20, 0x100, 0x10000, 0x4000000),
 	FLASH_ID("micron mt25ql01",     0x13, 0xec, 0x12, 0xdc, 0xc7, 0x0021ba20, 0x100, 0x10000, 0x8000000),