Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-03-14 13:57:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

env_nand: align NAND buffers

Browse source 
This allows cache flush/invalidate operations to succeed on the buffers.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Stephen Warren 2012-07-30 07:38:38 +00:00 • committed by Wolfgang Denk
parent cee84e8257
commit 3801a15f67
1 changed files with 5 additions and 5 deletions

10
common/env_nand.c
View file

@ -226,7 +226,7 @@ int saveenv(void)
int saveenv(void) int saveenv(void)
{ {
int ret = 0; int ret = 0;
env_t env_new; ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, sizeof(env_t));
ssize_t len; ssize_t len;
char *res; char *res;
nand_erase_options_t nand_erase_options; nand_erase_options_t nand_erase_options;
@ -238,20 +238,20 @@ int saveenv(void)
if (CONFIG_ENV_RANGE < CONFIG_ENV_SIZE) if (CONFIG_ENV_RANGE < CONFIG_ENV_SIZE)
return 1; return 1;
res = (char *)&env_new.data; res = (char *)&env_new->data;
len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL); len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL);
if (len < 0) { if (len < 0) {
error("Cannot export environment: errno = %d\n", errno); error("Cannot export environment: errno = %d\n", errno);
return 1; return 1;
} }
env_new.crc = crc32(0, env_new.data, ENV_SIZE); env_new->crc = crc32(0, env_new->data, ENV_SIZE);
puts("Erasing Nand...\n"); puts("Erasing Nand...\n");
if (nand_erase_opts(&nand_info[0], &nand_erase_options)) if (nand_erase_opts(&nand_info[0], &nand_erase_options))
return 1; return 1;
puts("Writing to Nand... "); puts("Writing to Nand... ");
if (writeenv(CONFIG_ENV_OFFSET, (u_char *)&env_new)) { if (writeenv(CONFIG_ENV_OFFSET, (u_char *)env_new)) {
puts("FAILED!\n"); puts("FAILED!\n");
return 1; return 1;
} }
@ -398,7 +398,7 @@ void env_relocate_spec(void)
{ {
#if !defined(ENV_IS_EMBEDDED) #if !defined(ENV_IS_EMBEDDED)
int ret; int ret;
char buf[CONFIG_ENV_SIZE]; ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
#if defined(CONFIG_ENV_OFFSET_OOB) #if defined(CONFIG_ENV_OFFSET_OOB)
ret = get_nand_env_oob(&nand_info[0], &nand_env_oob_offset); ret = get_nand_env_oob(&nand_info[0], &nand_env_oob_offset);