colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/env: compute size of usable area only once

Browse Source 
for double buffering to work, redundant buffers must have equal size

Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
This commit is contained in:
Andreas Fenkart
2016-04-19 22:43:42 +02:00
committed by Tom Rini
parent cedb341e7f
commit f71cee4bfc
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tools/env/fw_env.c vendored
View File

@@ -75,7 +75,8 @@ static int dev_current;
#define CUR_ENVSIZE ENVSIZE(dev_current) #define CUR_ENVSIZE ENVSIZE(dev_current)
#define ENV_SIZE getenvsize() static unsigned long usable_envsize;
#define ENV_SIZE usable_envsize
struct env_image_single { struct env_image_single {
uint32_t crc; /* CRC32 over data bytes */ uint32_t crc; /* CRC32 over data bytes */
@@ -124,18 +125,6 @@ static int parse_config (void);
#if defined(CONFIG_FILE) #if defined(CONFIG_FILE)
static int get_config (char *); static int get_config (char *);
#endif #endif
static inline ulong getenvsize (void)
{
ulong rc = CUR_ENVSIZE - sizeof(uint32_t);
if (HaveRedundEnv)
rc -= sizeof (char);
if (common_args.aes_flag)
rc &= ~(AES_KEY_LENGTH - 1);
return rc;
}
static char *skip_chars(char *s) static char *skip_chars(char *s)
{ {
@@ -953,7 +942,7 @@ static int flash_flag_obsolete (int dev, int fd, off_t offset)
static int env_aes_cbc_crypt(char *payload, const int enc, uint8_t *key) static int env_aes_cbc_crypt(char *payload, const int enc, uint8_t *key)
{ {
uint8_t *data = (uint8_t *)payload; uint8_t *data = (uint8_t *)payload;
const int len = getenvsize(); const int len = usable_envsize;
uint8_t key_exp[AES_EXPAND_KEY_LENGTH]; uint8_t key_exp[AES_EXPAND_KEY_LENGTH];
uint32_t aes_blocks; uint32_t aes_blocks;
@@ -1382,6 +1371,21 @@ static int parse_config ()
DEVNAME (1), strerror (errno)); DEVNAME (1), strerror (errno));
return -1; return -1;
} }
if (HaveRedundEnv && ENVSIZE(0) != ENVSIZE(1)) {
ENVSIZE(0) = ENVSIZE(1) = min(ENVSIZE(0), ENVSIZE(1));
fprintf(stderr,
"Redundant environments have inequal size, set to 0x%08lx\n",
ENVSIZE(1));
}
usable_envsize = CUR_ENVSIZE - sizeof(uint32_t);
if (HaveRedundEnv)
usable_envsize -= sizeof(char);
if (common_args.aes_flag)
usable_envsize &= ~(AES_KEY_LENGTH - 1);
return 0; return 0;
} }