[PoC 033/241] global: Migrate CONFIG_FLASH_VERIFY to CFG

Tom Rini
2022-11-20T13:39:57Z

README | 2 +-
common/flash.c | 2 +-
include/configs/mccmon6.h | 2 +-
scripts/config_whitelist.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 0c8932425cad..02ae72e009ef 100644
--- a/README
+++ b/README
@@ -1486,7 +1486,7 @@ Configuration Settings:
digits and dots. Recommended value: 45 (9..1) for 80
column displays, 15 (3..1) for 40 column displays.

-- CONFIG_FLASH_VERIFY
+- CFG_FLASH_VERIFY
If defined, the content of the flash (destination) is compared
against the source after the write operation. An error message
will be printed when the contents are not identical.
diff --git a/common/flash.c b/common/flash.c
index 848f44e59dfd..5ca715efad2b 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -166,7 +166,7 @@ flash_write(char *src, ulong addr, ulong cnt)
src += len;
}

-#if defined(CONFIG_FLASH_VERIFY)
+#if defined(CFG_FLASH_VERIFY)
if (memcmp(src_orig, addr_orig, cnt_orig)) {
printf("\nVerify failed!\n");
return ERR_PROG_ERROR;
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 4be47e78d676..9b2777339a10 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -25,7 +25,7 @@

/* NOR 16-bit mode */
#define CFG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR
-#define CONFIG_FLASH_VERIFY
+#define CFG_FLASH_VERIFY

/* NOR Flash MTD */
#define CFG_SYS_FLASH_BANKS_LIST { (CFG_SYS_FLASH_BASE) }
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 16467a0bb8c9..8f68c6e736f6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -33,7 +33,7 @@ CFG_FLASH_OR_PRELIM
CFG_FLASH_SECTOR_SIZE
CFG_FLASH_SHOW_PROGRESS
CFG_FLASH_SPANSION_S29WS_N
-CONFIG_FLASH_VERIFY
+CFG_FLASH_VERIFY
CONFIG_FM_PLAT_CLK_DIV
CONFIG_FSL_CPLD
CONFIG_FSL_ESDHC_PIN_MUX
--
2.25.1