From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 02/11] env_mmc.c: Make the non-redundant env_relocate_spec use malloc not stack
Date: Thu, 26 Sep 2013 16:27:58 -0400 [thread overview]
Message-ID: <1380227287-26057-3-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1380227287-26057-1-git-send-email-trini@ti.com>
Switch the case of non-redundant non-embedded environment to use malloc
to allocate buffers, rather than place them on the stack, like the
redundant case does.
Signed-off-by: Tom Rini <trini@ti.com>
---
common/env_mmc.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/common/env_mmc.c b/common/env_mmc.c
index 65aafa9..0ab11d3 100644
--- a/common/env_mmc.c
+++ b/common/env_mmc.c
@@ -274,11 +274,18 @@ err:
void env_relocate_spec(void)
{
#if !defined(ENV_IS_EMBEDDED)
- ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+ env_t *ep;
u32 offset;
int ret;
+ ep = (env_t *)malloc(CONFIG_ENV_SIZE);
+ if (ep == NULL) {
+ puts("Can't allocate buffers for environment\n");
+ ret = 1;
+ goto err;
+ }
+
if (init_mmc_for_env(mmc)) {
ret = 1;
goto err;
@@ -289,12 +296,12 @@ void env_relocate_spec(void)
goto fini;
}
- if (read_env(mmc, CONFIG_ENV_SIZE, offset, buf)) {
+ if (read_env(mmc, CONFIG_ENV_SIZE, offset, ep)) {
ret = 1;
goto fini;
}
- env_import(buf, 1);
+ env_import((char *)ep, 1);
ret = 0;
fini:
@@ -302,6 +309,8 @@ fini:
err:
if (ret)
set_default_env(NULL);
+
+ free(ep);
#endif
}
#endif /* CONFIG_ENV_OFFSET_REDUND */
--
1.7.9.5
next prev parent reply other threads:[~2013-09-26 20:27 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 20:27 [U-Boot] [PATCH 00/11] NAND/MMC environment in SPL, Falcon Mode enhancements Tom Rini
2013-09-26 20:27 ` [U-Boot] [PATCH 01/11] fw_env.c: Increase max dev path to 32 Tom Rini
2013-10-05 20:02 ` Wolfgang Denk
2013-10-06 20:55 ` Tom Rini
2013-10-07 5:47 ` Wolfgang Denk
2013-10-07 12:06 ` Tom Rini
2013-09-26 20:27 ` Tom Rini [this message]
2013-10-05 20:00 ` [U-Boot] [PATCH 02/11] env_mmc.c: Make the non-redundant env_relocate_spec use malloc not stack Wolfgang Denk
2013-10-06 20:40 ` Tom Rini
2013-10-07 5:41 ` Wolfgang Denk
2013-09-26 20:27 ` [U-Boot] [PATCH 03/11] env_mmc.c: Allow environment to be used within SPL Tom Rini
2013-09-26 20:28 ` [U-Boot] [PATCH 04/11] mtd: Add a CONFIG_SPL_MTD_SUPPORT for a more full NAND subsystem in SPL Tom Rini
2013-09-26 20:39 ` Scott Wood
2013-09-26 20:28 ` [U-Boot] [PATCH 05/11] mtd: Build nand_util.o for CONFIG_ENV_IS_IN_NAND " Tom Rini
2013-09-26 20:42 ` Scott Wood
2013-09-26 20:45 ` Tom Rini
2013-09-26 20:51 ` Scott Wood
2013-09-26 21:14 ` Tom Rini
2013-09-26 20:28 ` [U-Boot] [PATCH 06/11] spl: Make CONFIG_SPL_ENV_SUPPORT have to be set by all users of env " Tom Rini
2013-09-26 20:28 ` [U-Boot] [PATCH 07/11] am335x_evm: Make SPL_OS also check the boot_os variable for falcon mode Tom Rini
2013-09-26 20:28 ` [U-Boot] [PATCH 08/11] README: Add CONFIG_SPL_OS_BOOT to README Tom Rini
2013-09-26 20:28 ` [U-Boot] [PATCH 09/11] README.falcon: Document environment variables for falcon mode Tom Rini
2013-09-26 20:28 ` [U-Boot] [PATCH 10/11] a3m071: Make spl_start_uboot test like getenv_yesno does Tom Rini
2013-09-27 7:04 ` Stefan Roese
2013-09-26 20:28 ` [U-Boot] [PATCH 11/11] spl_mmc/CONFIG_SPL_OS_BOOT: Allow environment to determine what to boot Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380227287-26057-3-git-send-email-trini@ti.com \
--to=trini@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox