From 52cd51c02fe0fcc4f86554de84e95607d62bdc21 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 21 Aug 2024 10:19:08 -0600 Subject: [PATCH] global_data: Use less space for environment fields Use shorter types for some of these fields to save space. Reorder to put fields with like alignment together. Signed-off-by: Simon Glass --- include/asm-generic/global_data.h | 14 +++++++------- include/env_internal.h | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 86e8d654a2..1252b8acef 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -114,21 +114,21 @@ struct global_data { */ unsigned long env_addr; /** - * @env_valid: environment is valid + * @env_has_init: bit mask indicating environment locations * - * See &enum env_valid + * &enum env_location defines which bit relates to which location */ - unsigned long env_valid; + unsigned short env_has_init; /** - * @env_has_init: bit mask indicating environment locations + * @env_valid: environment is valid * - * &enum env_location defines which bit relates to which location + * See &enum env_valid */ - unsigned long env_has_init; + unsigned char env_valid; /** * @env_load_prio: priority of the loaded environment */ - int env_load_prio; + char env_load_prio; /** * @ram_base: base address of RAM used by U-Boot */ diff --git a/include/env_internal.h b/include/env_internal.h index 0a267e3559..c1c0727e4d 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -100,6 +100,7 @@ extern const char default_environment[]; #include #include +/* this is stored as bits in gd->env_has_init so is limited to 16 entries */ enum env_location { ENVL_UNKNOWN, ENVL_EEPROM, -- 2.39.5