[PATCH 057/149] global: Migrate CONFIG_KM_UBI_PARTITION_NAME_BOOT to CFG

Tom Rini trini at konsulko.com
Sun Dec 4 16:04:22 CET 2022


Perform a simple rename of CONFIG_KM_UBI_PARTITION_NAME_BOOT to CFG_KM_UBI_PARTITION_NAME_BOOT

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 include/configs/km/keymile-common.h | 18 +++++++++---------
 include/configs/kmcoge5ne.h         |  2 +-
 include/configs/pg-wcom-expu1.h     |  2 +-
 include/configs/pg-wcom-seli8.h     |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 2e73d9d6d28f..720711ac8dde 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -20,9 +20,9 @@
 	"actual_bank=0\0"
 #endif
 
-#ifndef CONFIG_KM_UBI_PARTITION_NAME_BOOT
-#define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
-#endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */
+#ifndef CFG_KM_UBI_PARTITION_NAME_BOOT
+#define CFG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
+#endif /* CFG_KM_UBI_PARTITION_NAME_BOOT */
 
 #ifndef CONFIG_KM_UBI_PART_BOOT_OPTS
 #define CONFIG_KM_UBI_PART_BOOT_OPTS		""
@@ -30,23 +30,23 @@
 
 #ifndef CFG_KM_UBI_PARTITION_NAME_APP
 /* one flash chip only called boot */
-/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
+/* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */
 # define CFG_KM_UBI_LINUX_MTD					\
-	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
+	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
-	"ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0"
+	"ubiattach=ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "\0"
 #else /* CFG_KM_UBI_PARTITION_NAME_APP */
 /* two flash chips called boot and app */
-/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
+/* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */
 /* app:  CFG_KM_UBI_PARTITION_NAME_APP */
 # define CFG_KM_UBI_LINUX_MTD					\
-	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
+	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
 	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=if test ${boot_bank} -eq 0; then; "			\
-	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; "	\
+	"ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "; else; "	\
 	"ubi part " CFG_KM_UBI_PARTITION_NAME_APP "; fi\0"
 #endif /* CFG_KM_UBI_PARTITION_NAME_APP */
 
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index ebb3e6a04468..b6386bdbcb7e 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -11,7 +11,7 @@
 #define NAND_MAX_CHIPS				1
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
-#define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
+#define CFG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* include common defines/options for all Keymile boards */
diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h
index 36b5949c430d..88efa3e53b84 100644
--- a/include/configs/pg-wcom-expu1.h
+++ b/include/configs/pg-wcom-expu1.h
@@ -8,7 +8,7 @@
 
 #define WCOM_EXPU1
 
-#define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
+#define CFG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* CLIPS FPGA Definitions */
diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h
index f50db92aa74c..f9c55ca32f6a 100644
--- a/include/configs/pg-wcom-seli8.h
+++ b/include/configs/pg-wcom-seli8.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_PG_WCOM_SELI8_H
 #define __CONFIG_PG_WCOM_SELI8_H
 
-#define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
+#define CFG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* PAXK FPGA Definitions */
-- 
2.25.1



More information about the U-Boot mailing list