[PoC 075/241] global: Migrate CONFIG_KM_UBI_PARTITION_NAME_APP to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at 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 +-
 scripts/config_whitelist.txt        |  2 +-
 5 files changed, 10 insertions(+), 10 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 8681145c309f..9386daa19ccc 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -13,7 +13,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 5b5637762aca..f7a598b5f9cb 100644
--- a/include/configs/pg-wcom-expu1.h
+++ b/include/configs/pg-wcom-expu1.h
@@ -10,7 +10,7 @@
 #define CFG_HOSTNAME				"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 a1c1ca993d7e..b7051e3749d0 100644
--- a/include/configs/pg-wcom-seli8.h
+++ b/include/configs/pg-wcom-seli8.h
@@ -9,7 +9,7 @@
 #define CFG_HOSTNAME			"SELI8"
 
 #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)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 19a4fc540336..a311539ab15c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -83,7 +83,7 @@ CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 CFG_KM_ECC_MODE
 CFG_KM_NEW_ENV
 CFG_KM_UBI_LINUX_MTD
-CONFIG_KM_UBI_PARTITION_NAME_APP
+CFG_KM_UBI_PARTITION_NAME_APP
 CONFIG_KM_UBI_PARTITION_NAME_BOOT
 CONFIG_KM_UBI_PART_BOOT_OPTS
 CONFIG_KM_UIMAGE_NAME
-- 
2.25.1