[PoC 193/241] global: Migrate CONFIG_SPI_FLASH_SIZE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 include/configs/beaver.h      | 2 +-
 include/configs/cardhu.h      | 2 +-
 include/configs/cei-tk1-som.h | 2 +-
 include/configs/dalmore.h     | 2 +-
 include/configs/jetson-tk1.h  | 2 +-
 include/configs/nyan-big.h    | 2 +-
 include/configs/p2371-0000.h  | 2 +-
 include/configs/p2371-2180.h  | 2 +-
 include/configs/p2571.h       | 2 +-
 include/configs/p3450-0000.h  | 2 +-
 include/configs/tec-ng.h      | 2 +-
 include/configs/venice2.h     | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 6b5f650811b8..1a540c9f7122 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -22,7 +22,7 @@
 
 /* SPI */
 #define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 35c5a4f12261..0a5eaf03d9a5 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -26,7 +26,7 @@
 
 /* SPI */
 #define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 55e2d744c4a0..3aaed94e15cb 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -23,7 +23,7 @@
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 24cf554649ba..39e1aded3730 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -20,7 +20,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index b846889541c7..d3bb6d760376 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -21,7 +21,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index baa452156ecd..fbba4ca701db 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -19,7 +19,7 @@
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index ecd0405d297b..dd756a5056c8 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -20,7 +20,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 7f942888e74d..10b36e6a1657 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -20,7 +20,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 50cddb4a4acb..6578350990d7 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -20,7 +20,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index ec1a8634e718..34ab82fe1173 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -24,7 +24,7 @@
 	func(DHCP, dhcp, na)
 
 /* Environment at end of QSPI, in the VER partition */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #define BOARD_EXTRA_ENV_SETTINGS \
 	"preboot=if test -e mmc 1:1 /u-boot-preboot.scr; then " \
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 098796637010..6566dc170ff6 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -20,7 +20,7 @@
 
 /* SPI */
 #define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index b2dc04a975ad..1cf493a50373 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -21,7 +21,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 371a292a17de..c1e6c9cc89bc 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -202,7 +202,7 @@ CFG_SOCRATES
 CFG_SPI_ADDR
 CFG_SPI_BOOTING
 CFG_SPI_FLASH_QUAD
-CONFIG_SPI_FLASH_SIZE
+CFG_SPI_FLASH_SIZE
 CONFIG_SPI_HALF_DUPLEX
 CONFIG_SPI_N25Q256A_RESET
 CONFIG_STACKBASE
-- 
2.25.1