diff --git a/src/drivers/spi/adesto.c b/src/drivers/spi/adesto.c
index 52a74f97bd..d286bd66f6 100644
--- a/src/drivers/spi/adesto.c
+++ b/src/drivers/spi/adesto.c
@@ -93,9 +93,9 @@ static int adesto_write(const struct spi_flash *flash, u32 offset, size_t len,
 	u8 cmd[4];
 
 	page_size = 1 << stm->params->l2_page_size;
-	byte_addr = offset % page_size;
 
 	for (actual = 0; actual < len; actual += chunk_len) {
+		byte_addr = offset % page_size;
 		chunk_len = min(len - actual, page_size - byte_addr);
 		chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len);
 
@@ -127,7 +127,6 @@ static int adesto_write(const struct spi_flash *flash, u32 offset, size_t len,
 			goto out;
 
 		offset += chunk_len;
-		byte_addr = 0;
 	}
 
 #if CONFIG_DEBUG_SPI_FLASH
diff --git a/src/drivers/spi/atmel.c b/src/drivers/spi/atmel.c
index feb1a6d1fd..39cc95e609 100644
--- a/src/drivers/spi/atmel.c
+++ b/src/drivers/spi/atmel.c
@@ -121,9 +121,9 @@ static int atmel_write(const struct spi_flash *flash, u32 offset, size_t len,
 	u8 cmd[4];
 
 	page_size = 1 << stm->params->l2_page_size;
-	byte_addr = offset % page_size;
 
 	for (actual = 0; actual < len; actual += chunk_len) {
+		byte_addr = offset % page_size;
 		chunk_len = min(len - actual, page_size - byte_addr);
 		chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len);
 
@@ -155,7 +155,6 @@ static int atmel_write(const struct spi_flash *flash, u32 offset, size_t len,
 			goto out;
 
 		offset += chunk_len;
-		byte_addr = 0;
 	}
 
 #if CONFIG_DEBUG_SPI_FLASH
diff --git a/src/drivers/spi/eon.c b/src/drivers/spi/eon.c
index f6db9e377c..eb71c6216e 100644
--- a/src/drivers/spi/eon.c
+++ b/src/drivers/spi/eon.c
@@ -91,9 +91,9 @@ static int eon_write(const struct spi_flash *flash,
 	u8 cmd[4];
 
 	page_size = 1 << eon->params->page_size;
-	byte_addr = offset % page_size;
 
 	for (actual = 0; actual < len; actual += chunk_len) {
+		byte_addr = offset % page_size;
 		chunk_len = min(len - actual, page_size - byte_addr);
 		chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len);
 
@@ -128,7 +128,6 @@ static int eon_write(const struct spi_flash *flash,
 		}
 
 		offset += chunk_len;
-		byte_addr = 0;
 	}
 
 #if CONFIG_DEBUG_SPI_FLASH
diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c
index 84d19a6073..ed3d8bf074 100644
--- a/src/drivers/spi/gigadevice.c
+++ b/src/drivers/spi/gigadevice.c
@@ -132,9 +132,9 @@ static int gigadevice_write(const struct spi_flash *flash, u32 offset,
 	u8 cmd[4];
 
 	page_size = 1 << stm->params->l2_page_size;
-	byte_addr = offset % page_size;
 
 	for (actual = 0; actual < len; actual += chunk_len) {
+		byte_addr = offset % page_size;
 		chunk_len = min(len - actual, page_size - byte_addr);
 		chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len);
 
@@ -169,7 +169,6 @@ static int gigadevice_write(const struct spi_flash *flash, u32 offset,
 			goto out;
 
 		offset += chunk_len;
-		byte_addr = 0;
 	}
 
 #if CONFIG_DEBUG_SPI_FLASH
diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c
index 0e3d028b9c..6d143efe2d 100644
--- a/src/drivers/spi/macronix.c
+++ b/src/drivers/spi/macronix.c
@@ -160,9 +160,9 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len,
 	u8 cmd[4];
 
 	page_size = mcx->params->page_size;
-	byte_addr = offset % page_size;
 
 	for (actual = 0; actual < len; actual += chunk_len) {
+		byte_addr = offset % page_size;
 		chunk_len = min(len - actual, page_size - byte_addr);
 		chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len);
 
@@ -194,7 +194,6 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len,
 			break;
 
 		offset += chunk_len;
-		byte_addr = 0;
 	}
 
 #if CONFIG_DEBUG_SPI_FLASH
diff --git a/src/drivers/spi/spansion.c b/src/drivers/spi/spansion.c
index 091f7ae460..7f57d21e14 100644
--- a/src/drivers/spi/spansion.c
+++ b/src/drivers/spi/spansion.c
@@ -205,7 +205,6 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len,
 			const void *buf)
 {
 	struct spansion_spi_flash *spsn = to_spansion_spi_flash(flash);
-	unsigned long page_addr;
 	unsigned long byte_addr;
 	unsigned long page_size;
 	size_t chunk_len;
@@ -214,16 +213,16 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len,
 	u8 cmd[4];
 
 	page_size = spsn->params->page_size;
-	page_addr = offset / page_size;
-	byte_addr = offset % page_size;
 
 	for (actual = 0; actual < len; actual += chunk_len) {
+		byte_addr = offset % page_size;
 		chunk_len = min(len - actual, page_size - byte_addr);
+		chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len);
 
 		cmd[0] = CMD_S25FLXX_PP;
-		cmd[1] = page_addr >> 8;
-		cmd[2] = page_addr;
-		cmd[3] = byte_addr;
+		cmd[1] = (offset >> 16) & 0xff;
+		cmd[2] = (offset >> 8) & 0xff;
+		cmd[3] = offset & 0xff;
 
 #if CONFIG_DEBUG_SPI_FLASH
 		printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
@@ -248,8 +247,7 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len,
 		if (ret)
 			break;
 
-		page_addr++;
-		byte_addr = 0;
+		offset += chunk_len;
 	}
 
 #if CONFIG_DEBUG_SPI_FLASH
diff --git a/src/drivers/spi/sst.c b/src/drivers/spi/sst.c
index 70999a6652..e5714540ff 100644
--- a/src/drivers/spi/sst.c
+++ b/src/drivers/spi/sst.c
@@ -171,7 +171,6 @@ static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len,
 	u8 cmd[4];
 
 	page_size = 256;
-	byte_addr = offset % page_size;
 
 	/* If the data is not word aligned, write out leading single byte */
 	actual = offset % 2;
@@ -193,6 +192,7 @@ static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len,
 	cmd[3] = offset;
 
 	for (actual = 0; actual < len; actual += chunk_len) {
+		byte_addr = offset % page_size;
 		chunk_len = min(len - actual, page_size - byte_addr);
 		chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len);
 
@@ -224,7 +224,6 @@ static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len,
 			break;
 
 		offset += chunk_len;
-		byte_addr = 0;
 	}
 
 done:
diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c
index 93d545f396..79782e4808 100644
--- a/src/drivers/spi/stmicro.c
+++ b/src/drivers/spi/stmicro.c
@@ -189,9 +189,9 @@ static int stmicro_write(const struct spi_flash *flash,
 	u8 cmd[4];
 
 	page_size = stm->params->page_size;
-	byte_addr = offset % page_size;
 
 	for (actual = 0; actual < len; actual += chunk_len) {
+		byte_addr = offset % page_size;
 		chunk_len = min(len - actual, page_size - byte_addr);
 		chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len);
 
@@ -223,7 +223,6 @@ static int stmicro_write(const struct spi_flash *flash,
 			goto out;
 
 		offset += chunk_len;
-		byte_addr = 0;
 	}
 
 #if CONFIG_DEBUG_SPI_FLASH
diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c
index 74c6e81185..d071b9f28d 100644
--- a/src/drivers/spi/winbond.c
+++ b/src/drivers/spi/winbond.c
@@ -151,9 +151,9 @@ static int winbond_write(const struct spi_flash *flash, u32 offset, size_t len,
 	u8 cmd[4];
 
 	page_size = 1 << stm->params->l2_page_size;
-	byte_addr = offset % page_size;
 
 	for (actual = 0; actual < len; actual += chunk_len) {
+		byte_addr = offset % page_size;
 		chunk_len = min(len - actual, page_size - byte_addr);
 		chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len);
 
@@ -185,7 +185,6 @@ static int winbond_write(const struct spi_flash *flash, u32 offset, size_t len,
 			goto out;
 
 		offset += chunk_len;
-		byte_addr = 0;
 	}
 
 #if CONFIG_DEBUG_SPI_FLASH
diff --git a/src/soc/marvell/bg4cd/spi.c b/src/soc/marvell/bg4cd/spi.c
index 188a6bd483..f9faf9504a 100644
--- a/src/soc/marvell/bg4cd/spi.c
+++ b/src/soc/marvell/bg4cd/spi.c
@@ -19,3 +19,8 @@ int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave)
 {
 	return -1;
 }
+
+unsigned int spi_crop_chunk(unsigned int cmd_len, unsigned int buf_len)
+{
+	return buf_len;
+}