this makes it easier comparable to the double-buffered version Signed-off-by: Andreas Fenkart <afenkart@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@openedev.com>
@ -313,29 +313,31 @@ void env_relocate_spec(void)
char *buf = NULL;
buf = (char *)memalign(ARCH_DMA_MINALIGN, CONFIG_ENV_SIZE);
if (!buf) {
ret = setup_flash_device();
set_default_env("!malloc() failed");
if (ret) {
if (buf)
free(buf);
return;
}
if (ret)
goto out;
ret = spi_flash_read(env_flash,
CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, buf);
set_default_env("!spi_flash_read() failed");
goto err_read;
ret = env_import(buf, 1);
gd->env_valid = 1;
out:
err_read:
spi_flash_free(env_flash);
env_flash = NULL;
#endif