Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

env: Make more use of the ENV_SAVE_PTR macro

Browse Source 
With commit 82b2f41357 ("env_internal.h: add alternative ENV_SAVE_PTR
macro") we introduced the ENV_SAVE_PTR macro but as explained in the
commit message, left full conversion for a later time. This commit
makes more progress on that front by doing the remaining easy
conversions to the new macro.

Signed-off-by: Tom Rini <trini@konsulko.com>

Changes in v2:
- Reduce the number of conversions, some didn't work as expected once
  CMD_SAVEENV was actually disabled.
- Finish converting UBI

Cc Rasmus Villemoes <rasmus.villemoes@prevas.dk>
This commit is contained in:
Tom Rini
2026-03-23 13:51:05 -06:00
parent 93f84ee022
commit 8af4e12487
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
env/eeprom.c vendored
View File

@@ -175,5 +175,5 @@ U_BOOT_ENV_LOCATION(eeprom) = {
.location = ENVL_EEPROM, .location = ENVL_EEPROM,
ENV_NAME("EEPROM") ENV_NAME("EEPROM")
.load = env_eeprom_load, .load = env_eeprom_load,
.save = env_save_ptr(env_eeprom_save), .save = ENV_SAVE_PTR(env_eeprom_save),
}; };

2
env/nvram.c vendored
View File

@@ -65,6 +65,6 @@ U_BOOT_ENV_LOCATION(nvram) = {
.location = ENVL_NVRAM, .location = ENVL_NVRAM,
ENV_NAME("NVRAM") ENV_NAME("NVRAM")
.load = env_nvram_load, .load = env_nvram_load,
.save = env_save_ptr(env_nvram_save), .save = ENV_SAVE_PTR(env_nvram_save),
.init = env_nvram_init, .init = env_nvram_init,
}; };

2
env/onenand.c vendored
View File

@@ -107,5 +107,5 @@ U_BOOT_ENV_LOCATION(onenand) = {
.location = ENVL_ONENAND, .location = ENVL_ONENAND,
ENV_NAME("OneNAND") ENV_NAME("OneNAND")
.load = env_onenand_load, .load = env_onenand_load,
.save = env_save_ptr(env_onenand_save), .save = ENV_SAVE_PTR(env_onenand_save),
}; };

4
env/scsi.c vendored
View File

@@ -108,8 +108,6 @@ U_BOOT_ENV_LOCATION(scsi) = {
.location = ENVL_SCSI, .location = ENVL_SCSI,
ENV_NAME("SCSI") ENV_NAME("SCSI")
.load = env_scsi_load, .load = env_scsi_load,
#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_XPL_BUILD) .save = ENV_SAVE_PTR(env_scsi_save),
.save = env_save_ptr(env_scsi_save),
.erase = ENV_ERASE_PTR(env_scsi_erase), .erase = ENV_ERASE_PTR(env_scsi_erase),
#endif
}; };

4
env/ubi.c vendored
View File

@@ -33,7 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define ENV_UBI_VOLUME_REDUND "invalid" #define ENV_UBI_VOLUME_REDUND "invalid"
#endif #endif
#ifdef CONFIG_CMD_SAVEENV
#ifdef CONFIG_ENV_REDUNDANT #ifdef CONFIG_ENV_REDUNDANT
static int env_ubi_save(void) static int env_ubi_save(void)
{ {
@@ -103,7 +102,6 @@ static int env_ubi_save(void)
return 0; return 0;
} }
#endif /* CONFIG_ENV_REDUNDANT */ #endif /* CONFIG_ENV_REDUNDANT */
#endif /* CONFIG_CMD_SAVEENV */
#ifdef CONFIG_ENV_REDUNDANT #ifdef CONFIG_ENV_REDUNDANT
static int env_ubi_load(void) static int env_ubi_load(void)
@@ -219,6 +217,6 @@ U_BOOT_ENV_LOCATION(ubi) = {
.location = ENVL_UBI, .location = ENVL_UBI,
ENV_NAME("UBI") ENV_NAME("UBI")
.load = env_ubi_load, .load = env_ubi_load,
.save = env_save_ptr(env_ubi_save), .save = ENV_SAVE_PTR(env_ubi_save),
.erase = ENV_ERASE_PTR(env_ubi_erase), .erase = ENV_ERASE_PTR(env_ubi_erase),
}; };