[PATCH 113/149] global: Migrate CONFIG_SCSI_DEV_LIST to CFG

Tom Rini
2022-12-04T15:28:06Z

Perform a simple rename of CONFIG_SCSI_DEV_LIST to CFG_SCSI_DEV_LIST

Signed-off-by: Tom Rini <trini@konsulko.com>
---
drivers/scsi/scsi.c | 4 ++--
include/configs/ls1021aiot.h | 2 +-
include/configs/ls1028ardb.h | 2 +-
include/configs/ls1043ardb.h | 2 +-
4 files changed, 5 insertions(+), 5 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 8b5fba51c6ff..53d9936f4e77 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 c8a6f0146aac..60362b6a4d07 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -203,7 +203,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>
--
2.25.1