[PoC 018/241] global: Migrate CONFIG_ENV_TOTAL_SIZE to CFG

Tom Rini
2022-11-20T13:37:49Z

include/configs/km/pg-wcom-ls102xa.h | 8 ++++----
include/configs/kmcent2.h | 8 ++++----
scripts/config_whitelist.txt | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index dfa81c037f48..05cdcbfba193 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -172,7 +172,7 @@
* Environment
*/

-#define CONFIG_ENV_TOTAL_SIZE 0x40000
+#define CFG_ENV_TOTAL_SIZE 0x40000
#define ENV_DEL_ADDR CONFIG_ENV_ADDR_REDUND /* direct for newenv */

#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */
@@ -211,11 +211,11 @@

#define CONFIG_KM_NEW_ENV \
"newenv=protect off " __stringify(ENV_DEL_ADDR) \
- " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \
+ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \
"erase " __stringify(ENV_DEL_ADDR) \
- " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \
+ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \
"protect on " __stringify(ENV_DEL_ADDR) \
- " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0"
+ " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"

#define CONFIG_HW_ENV_SETTINGS \
"hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi," \
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 527f0383bc65..17eb9a7c2ea0 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -139,7 +139,7 @@
#define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS

/* Environment in parallel NOR-Flash */
-#define CONFIG_ENV_TOTAL_SIZE 0x040000
+#define CFG_ENV_TOTAL_SIZE 0x040000
#define ENV_DEL_ADDR 0xebf00000 /*direct for newenv*/

/*
@@ -430,11 +430,11 @@ int get_scl(void);

#define CONFIG_KM_NEW_ENV \
"newenv=protect off " __stringify(ENV_DEL_ADDR) \
- " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \
+ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \
"erase " __stringify(ENV_DEL_ADDR) \
- " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \
+ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \
"protect on " __stringify(ENV_DEL_ADDR) \
- " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0"
+ " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"

/* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */
#ifndef CONFIG_KM_DEF_ARCH
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5de121b41ca0..27923ec86bf5 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -18,7 +18,7 @@ CFG_ENV_SETTINGS_NAND_V2
CFG_ENV_SETTINGS_V1
CFG_ENV_SETTINGS_V2
CFG_ENV_SROM_BANK
-CONFIG_ENV_TOTAL_SIZE
+CFG_ENV_TOTAL_SIZE
CONFIG_ET1100_BASE
CONFIG_ETHBASE
CONFIG_EXTRA_ENV_SETTINGS
--
2.25.1