[PATCH 022/149] global: Migrate CONFIG_ENV_TOTAL_SIZE to CFG

Tom Rini
2022-12-04T15:10:36Z

Perform a simple rename of CONFIG_ENV_TOTAL_SIZE to CFG_ENV_TOTAL_SIZE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
include/configs/km/pg-wcom-ls102xa.h | 8 ++++----
include/configs/kmcent2.h | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 45997c75128c..eb9dd48bd7fe 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -169,7 +169,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 */
@@ -208,11 +208,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 580d3a0faf01..4e5cdf640d27 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -138,7 +138,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*/

/*
@@ -428,11 +428,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
--
2.25.1