[PoC 071/241] global: Migrate CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI to CFG

Tom Rini trini at konsulko.com
Sun Nov 20 14:31:02 CET 2022


Signed-off-by: Tom Rini <trini at konsulko.com>
---
 include/configs/km/keymile-common.h | 6 +++---
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 3d77b1770651..5e3baca75b23 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -34,7 +34,7 @@
 # define CONFIG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS
-# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI				\
+# 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 */
 /* two flash chips called boot and app */
@@ -44,7 +44,7 @@
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
-# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI				\
+# 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"
@@ -125,7 +125,7 @@
 	"cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0"	\
 	"ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0"		\
 	"uimage=" CONFIG_KM_UIMAGE_NAME					\
-	CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
+	CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 
 /*
  * constants
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d5909de8762e..fb702a42bd6b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -79,7 +79,7 @@ CFG_KM_DEF_ENV_BOOTTARGETS
 CFG_KM_DEF_ENV_CONSTANTS
 CFG_KM_DEF_ENV_CPU
 CFG_KM_DEF_ENV_FLASH_BOOT
-CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
+CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 CONFIG_KM_ECC_MODE
 CONFIG_KM_NEW_ENV
 CONFIG_KM_UBI_LINUX_MTD
-- 
2.25.1



More information about the U-Boot mailing list