[PATCH 1/6] env: scsi: rename ENV_SCSI_PART_UUID

[David Lechner]

Rename SCSI_ENV_PART_UUID to ENV_SCSI_PART_UUID. All other environment-
related config names are of the form ENV_<name>, so this is more
consistent.

Signed-off-by: David Lechner <dlechner at baylibre.com>
---
 configs/qcom_qcs9100_defconfig | 2 +-
 env/Kconfig                    | 2 +-
 env/scsi.c                     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configs/qcom_qcs9100_defconfig b/configs/qcom_qcs9100_defconfig
index 371448b8b1b..082106157bb 100644
--- a/configs/qcom_qcs9100_defconfig
+++ b/configs/qcom_qcs9100_defconfig
@@ -11,6 +11,6 @@ CONFIG_REMAKE_ELF=y
 CONFIG_FASTBOOT_BUF_ADDR=0xdb300000
 CONFIG_DEFAULT_DEVICE_TREE="qcom/qcs9100-ride-r3"
 CONFIG_ENV_IS_IN_SCSI=y
-CONFIG_SCSI_ENV_PART_UUID="71cb9cd0-acf1-b6cb-ad91-be9572fe11a9"
+CONFIG_ENV_SCSI_PART_UUID="71cb9cd0-acf1-b6cb-ad91-be9572fe11a9"
 # CONFIG_ENV_IS_DEFAULT is not set
 # CONFIG_ENV_IS_NOWHERE is not set
diff --git a/env/Kconfig b/env/Kconfig
index 2feff0b382e..5824f762870 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -762,7 +762,7 @@ config ENV_MMC_USE_DT
 	  The 2 defines CONFIG_ENV_OFFSET, CONFIG_ENV_OFFSET_REDUND
 	  are not used as fallback.
 
-config SCSI_ENV_PART_UUID
+config ENV_SCSI_PART_UUID
 	string "SCSI partition UUID for saving environment"
 	depends on ENV_IS_IN_SCSI
 	help
diff --git a/env/scsi.c b/env/scsi.c
index 207717e17b1..f376f731870 100644
--- a/env/scsi.c
+++ b/env/scsi.c
@@ -35,7 +35,7 @@ static inline struct env_scsi_info *env_scsi_get_part(void)
 {
 	struct env_scsi_info *ep = &env_part;
 
-	if (scsi_get_blk_by_uuid(CONFIG_SCSI_ENV_PART_UUID, &ep->blk, &ep->part))
+	if (scsi_get_blk_by_uuid(CONFIG_ENV_SCSI_PART_UUID, &ep->blk, &ep->part))
 		return NULL;
 
 	ep->count = CONFIG_ENV_SIZE / ep->part.blksz;
@@ -83,12 +83,12 @@ static int env_scsi_load(void)
 	int ret;
 
 	if (!ep) {
-		env_set_default(CONFIG_SCSI_ENV_PART_UUID " partition not found", 0);
+		env_set_default(CONFIG_ENV_SCSI_PART_UUID " partition not found", 0);
 		return -ENOENT;
 	}
 
 	if (blk_dread(ep->blk, ep->part.start, ep->count, &envbuf) != ep->count) {
-		env_set_default(CONFIG_SCSI_ENV_PART_UUID " partition read failed", 0);
+		env_set_default(CONFIG_ENV_SCSI_PART_UUID " partition read failed", 0);
 		return -EIO;
 	}
 

-- 
2.43.0