diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-24 13:04:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-24 13:04:38 -0400 |
| commit | 18b9c98024ec89e00a57707f07ff6ada06089d26 (patch) | |
| tree | 60b4659a673d7a9dff309ee0d0b324c242a53cfc /env/ext4.c | |
| parent | b897306341024695d17296efc1f9d83d06368209 (diff) | |
| parent | 08140dba0f539842d4836afb56fe43a33d8ba045 (diff) | |
Merge branch '2020-04-24-master-imports'
- Assorted minor bugfixes.
- Resync fixdep with Linux v5.7-rc1
- Numerous changes to reduce SPL in various cases including when we have
read-only env support.
- Allow mkimage to align the header on FIT images to a specific size.
Diffstat (limited to 'env/ext4.c')
| -rw-r--r-- | env/ext4.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/env/ext4.c b/env/ext4.c index 1f6b1b5bd81..911e19c6d3d 100644 --- a/env/ext4.c +++ b/env/ext4.c @@ -41,7 +41,6 @@ __weak const char *env_ext4_get_dev_part(void) return (const char *)CONFIG_ENV_EXT4_DEVICE_AND_PART; } -#ifdef CONFIG_CMD_SAVEENV static int env_ext4_save(void) { env_t env_new; @@ -83,7 +82,6 @@ static int env_ext4_save(void) puts("done\n"); return 0; } -#endif /* CONFIG_CMD_SAVEENV */ static int env_ext4_load(void) { @@ -137,5 +135,5 @@ U_BOOT_ENV_LOCATION(ext4) = { .location = ENVL_EXT4, ENV_NAME("EXT4") .load = env_ext4_load, - .save = env_save_ptr(env_ext4_save), + .save = ENV_SAVE_PTR(env_ext4_save), }; |