[U-Boot] [PATCH] spi: Fix flag collision for SST_WP

Simon Glass sjg at chromium.org
Wed Nov 26 20:30:29 CET 2014


At present SECT_4K is the same as SST_WP so we cannot tell these apart. Fix
this so that the table in sf_params.c can be used correctly.

Reported-by: Jens Rottmann <Jens.Rottmann at adlinktech.com>
Signed-off-by: Simon Glass <sjg at chromium.org>
---

 drivers/mtd/spi/sf_internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index 5b7670c..1d6a138 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -38,6 +38,7 @@ enum {
 	SECT_32K	= 1 << 1,
 	E_FSR		= 1 << 2,
 	WR_QPP		= 1 << 3,
+	SST_WP		= 1 << 4,	/* Supports AAI word program */
 };
 
 #define SPI_FLASH_3B_ADDR_LEN		3
@@ -101,7 +102,6 @@ enum {
 
 /* SST specific */
 #ifdef CONFIG_SPI_FLASH_SST
-# define SST_WP		0x01	/* Supports AAI word program */
 # define CMD_SST_BP		0x02    /* Byte Program */
 # define CMD_SST_AAI_WP	0xAD	/* Auto Address Incr Word Program */
 
-- 
2.2.0.rc0.207.ga3a616c



More information about the U-Boot mailing list