[PATCH 056/149] global: Migrate CONFIG_KM_UBI_PARTITION_NAME_APP to CFG

Tom Rini
2022-12-04T15:17:02Z

Perform a simple rename of CONFIG_KM_UBI_PARTITION_NAME_APP to CFG_KM_UBI_PARTITION_NAME_APP

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

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 7e347e5b8f4f..2e73d9d6d28f 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -28,7 +28,7 @@
#define CONFIG_KM_UBI_PART_BOOT_OPTS ""
#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */

-#ifndef CONFIG_KM_UBI_PARTITION_NAME_APP
+#ifndef CFG_KM_UBI_PARTITION_NAME_APP
/* one flash chip only called boot */
/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
# define CFG_KM_UBI_LINUX_MTD \
@@ -36,19 +36,19 @@
CONFIG_KM_UBI_PART_BOOT_OPTS
# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \
"ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0"
-#else /* CONFIG_KM_UBI_PARTITION_NAME_APP */
+#else /* CFG_KM_UBI_PARTITION_NAME_APP */
/* two flash chips called boot and app */
/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
-/* app: CONFIG_KM_UBI_PARTITION_NAME_APP */
+/* app: CFG_KM_UBI_PARTITION_NAME_APP */
# define CFG_KM_UBI_LINUX_MTD \
"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \
CONFIG_KM_UBI_PART_BOOT_OPTS " " \
- "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
+ "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 " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0"
-#endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */
+ "ubi part " CFG_KM_UBI_PARTITION_NAME_APP "; fi\0"
+#endif /* CFG_KM_UBI_PARTITION_NAME_APP */

#ifdef CONFIG_NAND_ECC_BCH
#define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index e4f28935370e..ebb3e6a04468 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -12,7 +12,7 @@
#define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */

#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"

/* include common defines/options for all Keymile boards */
#include "km/keymile-common.h"
diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h
index 66c371336b27..36b5949c430d 100644
--- a/include/configs/pg-wcom-expu1.h
+++ b/include/configs/pg-wcom-expu1.h
@@ -9,7 +9,7 @@
#define WCOM_EXPU1

#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"

/* CLIPS FPGA Definitions */
#define CFG_SYS_CSPR3_EXT (0x00)
diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h
index 69829a5c9bd1..f50db92aa74c 100644
--- a/include/configs/pg-wcom-seli8.h
+++ b/include/configs/pg-wcom-seli8.h
@@ -7,7 +7,7 @@
#define __CONFIG_PG_WCOM_SELI8_H

#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"

/* PAXK FPGA Definitions */
#define CFG_SYS_CSPR3_EXT (0x00)
--
2.25.1