diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c
index 80e937a724..88ed2abda2 100644
--- a/src/drivers/spi/spi_flash.c
+++ b/src/drivers/spi/spi_flash.c
@@ -18,7 +18,7 @@
 #define ADDR_MOD 0
 #endif
 
-#define SPI_FLASH_EXIT_4BYTE_STAGE	\
+#define SPI_FIRST_STAGE	\
 	(ENV_INITIAL_STAGE || CONFIG(BOOT_DEVICE_MEMORY_MAPPED))
 
 static void spi_flash_addr(u32 addr, u8 *cmd)
@@ -564,12 +564,12 @@ int spi_flash_probe(unsigned int bus, unsigned int cs, struct spi_flash *flash)
 			CONFIG_ROM_SIZE);
 	}
 
-	if (CONFIG(SPI_FLASH_FORCE_4_BYTE_ADDR_MODE)) {
-		printk(BIOS_DEBUG, "SF: Force 4-byte addressing mode\n");
-		spi_flash_cmd(&flash->spi, CMD_FORCE_4BYTE_ADDR_MODE, NULL, 0);
+	if (CONFIG(SPI_FLASH_FORCE_4_BYTE_ADDR_MODE) && SPI_FIRST_STAGE) {
+		printk(BIOS_DEBUG, "SF: Entering 4-byte addressing mode\n");
+		spi_flash_cmd(&flash->spi, CMD_ENTER_4BYTE_ADDR_MODE, NULL, 0);
 	}
 
-	if (CONFIG(SPI_FLASH_EXIT_4_BYTE_ADDR_MODE) && SPI_FLASH_EXIT_4BYTE_STAGE) {
+	if (CONFIG(SPI_FLASH_EXIT_4_BYTE_ADDR_MODE) && SPI_FIRST_STAGE) {
 		printk(BIOS_DEBUG, "SF: Exiting 4-byte addressing mode\n");
 		spi_flash_cmd(&flash->spi, CMD_EXIT_4BYTE_ADDR_MODE, NULL, 0);
 	}
diff --git a/src/drivers/spi/spi_flash_internal.h b/src/drivers/spi/spi_flash_internal.h
index 163b6181b7..c20369cdf4 100644
--- a/src/drivers/spi/spi_flash_internal.h
+++ b/src/drivers/spi/spi_flash_internal.h
@@ -22,7 +22,7 @@
 #define CMD_READ_STATUS			0x05
 #define CMD_WRITE_ENABLE		0x06
 
-#define CMD_FORCE_4BYTE_ADDR_MODE	0xb7
+#define CMD_ENTER_4BYTE_ADDR_MODE	0xb7
 
 #define CMD_BLOCK_ERASE			0xD8