[PoC 192/241] global: Migrate CONFIG_SPI_FLASH_QUAD to CFG

Tom Rini
2022-11-20T14:22:16Z

include/configs/alt.h | 2 +-
include/configs/porter.h | 2 +-
include/configs/silk.h | 2 +-
include/configs/stout.h | 2 +-
scripts/config_whitelist.txt | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 45918c2af439..1b29420db63d 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -21,7 +21,7 @@
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)

/* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
+#define CFG_SPI_FLASH_QUAD

/* SH Ether */
#define CFG_SH_ETHER_USE_PORT 0
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 1526f470e8e1..65d5eb95739f 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -22,7 +22,7 @@
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (1024u * 1024 * 1024)

/* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
+#define CFG_SPI_FLASH_QUAD

/* SH Ether */
#define CFG_SH_ETHER_USE_PORT 0
diff --git a/include/configs/silk.h b/include/configs/silk.h
index c7346a356542..be73a7f01ace 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -22,7 +22,7 @@
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)

/* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
+#define CFG_SPI_FLASH_QUAD

/* SH Ether */
#define CFG_SH_ETHER_USE_PORT 0
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 910997e08c7e..d9b8ebf311d9 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -26,7 +26,7 @@
#define CFG_SCIF_A

/* SPI */
-#define CONFIG_SPI_FLASH_QUAD
+#define CFG_SPI_FLASH_QUAD

/* SH Ether */
#define CFG_SH_ETHER_USE_PORT 0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cb15aa3c8f4e..371a292a17de 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -201,7 +201,7 @@ CFG_SMP_PEN_ADDR
CFG_SOCRATES
CFG_SPI_ADDR
CFG_SPI_BOOTING
-CONFIG_SPI_FLASH_QUAD
+CFG_SPI_FLASH_QUAD
CONFIG_SPI_FLASH_SIZE
CONFIG_SPI_HALF_DUPLEX
CONFIG_SPI_N25Q256A_RESET
--
2.25.1