@@ -1477,7 +1477,7 @@ Configuration Settings:
- CONFIG_SYS_FLASH_USE_BUFFER_WRITE
Use buffered writes to flash.
-- CONFIG_FLASH_SPANSION_S29WS_N
+- CFG_FLASH_SPANSION_S29WS_N
s29ws-n MirrorBit flash has non-standard addresses for buffered
write commands.
@@ -991,7 +991,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp,
case CFI_CMDSET_AMD_EXTENDED:
flash_unlock_seq(info, sector);
-#ifdef CONFIG_FLASH_SPANSION_S29WS_N
+#ifdef CFG_FLASH_SPANSION_S29WS_N
offset = ((unsigned long)dst - info->start[sector]) >> shift;
#endif
flash_write_cmd(info, sector, offset, AMD_CMD_WRITE_TO_BUFFER);
@@ -93,7 +93,7 @@
* FLASH organization
*/
#ifdef CONFIG_SYS_FLASH_CFI
-# define CONFIG_FLASH_SPANSION_S29WS_N 1
+# define CFG_FLASH_SPANSION_S29WS_N 1
# define CFG_SYS_FLASH_SIZE 0x1000000 /* Max size that the board might have */
#endif
@@ -32,7 +32,7 @@ CFG_FLASH_BR_PRELIM
CFG_FLASH_OR_PRELIM
CFG_FLASH_SECTOR_SIZE
CFG_FLASH_SHOW_PROGRESS
-CONFIG_FLASH_SPANSION_S29WS_N
+CFG_FLASH_SPANSION_S29WS_N
CONFIG_FLASH_VERIFY
CONFIG_FM_PLAT_CLK_DIV
CONFIG_FSL_CPLD
Signed-off-by: Tom Rini <trini@konsulko.com> --- README | 2 +- drivers/mtd/cfi_flash.c | 2 +- include/configs/M53017EVB.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)