[PoC 173/241] global: Migrate CONFIG_SCSI_DEV_LIST to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 drivers/scsi/scsi.c          | 4 ++--
 include/configs/ls1021aiot.h | 2 +-
 include/configs/ls1028ardb.h | 2 +-
 include/configs/ls1043ardb.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 3e769b0843f0..a020a7da23a5 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -18,8 +18,8 @@
 #include <dm/uclass-internal.h>
 
 #if !defined(CONFIG_DM_SCSI)
-# ifdef CONFIG_SCSI_DEV_LIST
-#  define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST
+# ifdef CFG_SCSI_DEV_LIST
+#  define SCSI_DEV_LIST CFG_SCSI_DEV_LIST
 # else
 #  ifdef CONFIG_SATA_ULI5288
 
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index cc6d07b40620..d6122856f069 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -61,7 +61,7 @@
 #ifndef PCI_DEVICE_ID_FREESCALE_AHCI
 #define PCI_DEVICE_ID_FREESCALE_AHCI	0x0440
 #endif
-#define CONFIG_SCSI_DEV_LIST		{PCI_VENDOR_ID_FREESCALE, \
+#define CFG_SCSI_DEV_LIST		{PCI_VENDOR_ID_FREESCALE, \
 	PCI_DEVICE_ID_FREESCALE_AHCI}
 
 /* SPI */
diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h
index 8c53636beac3..ee4f885c5341 100644
--- a/include/configs/ls1028ardb.h
+++ b/include/configs/ls1028ardb.h
@@ -52,7 +52,7 @@
 /* SATA */
 #define SCSI_VEND_ID 0x1b4b
 #define SCSI_DEV_ID  0x9170
-#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
+#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
 
 /* Initial environment variables */
 #ifndef SPL_NO_ENV
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index ec81b3ca5b36..da84e517b127 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -210,7 +210,7 @@
 #ifndef SPL_NO_SATA
 #define SCSI_VEND_ID 0x1b4b
 #define SCSI_DEV_ID  0x9170
-#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
+#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
 #endif
 
 #include <asm/fsl_secure_boot.h>
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d77171c2c553..179d6918cd64 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -182,7 +182,7 @@ CFG_SANDBOX_SPI_MAX_CS
 CFG_SAR2_REG
 CFG_SAR_REG
 CFG_SCIF_A
-CONFIG_SCSI_DEV_LIST
+CFG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
 CONFIG_SERIAL_BOOT
 CONFIG_SERVERIP
-- 
2.25.1