From: Tom Rini <trini@konsulko.com>
Date: Sun, 4 Dec 2022 15:03:43 +0000 (-0500)
Subject: global: Migrate CONFIG_ENV_SETTINGS_NAND_V2 to CFG
X-Git-Tag: v2023.07~207^2~5^2~120
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a609781d514456980654079407dad0a801ff485;p=platform%2Fkernel%2Fu-boot.git

global: Migrate CONFIG_ENV_SETTINGS_NAND_V2 to CFG

Perform a simple rename of CONFIG_ENV_SETTINGS_NAND_V2 to CFG_ENV_SETTINGS_NAND_V2

Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/include/configs/draco.h b/include/configs/draco.h
index d1c7abe..5b0daec 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -36,6 +36,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_DRACO_H */
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 8bfc9c9..c68d0df 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -93,8 +93,8 @@
 	"u-boot.env1 mtddev;" \
 	"rootfs mtddevubi" \
 
-#undef CONFIG_ENV_SETTINGS_NAND_V2
-#define CONFIG_ENV_SETTINGS_NAND_V2 \
+#undef CFG_ENV_SETTINGS_NAND_V2
+#define CFG_ENV_SETTINGS_NAND_V2 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"rootfs_name=rootfs\0" \
 	"kernel_name=uImage\0"\
@@ -136,6 +136,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_ETAMIN_H */
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 2e002fa..f3435b2 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -46,6 +46,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_RASTABAN_H */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 296ac34..7e9a55e 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -273,7 +273,7 @@
 	"u-boot.env1 part 0 7;" \
 	"rootfs partubi 0 9" \
 
-#define CONFIG_ENV_SETTINGS_NAND_V2 \
+#define CFG_ENV_SETTINGS_NAND_V2 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"rootfs_name=rootfs\0" \
 	"kernel_name=uImage\0"\
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 25c5a8c..960b42d 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -39,6 +39,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_THUBAN_H */