From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 03/11] env_mmc.c: Allow environment to be used within SPL
Date: Thu, 26 Sep 2013 16:27:59 -0400 [thread overview]
Message-ID: <1380227287-26057-4-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1380227287-26057-1-git-send-email-trini@ti.com>
Inside of SPL we only concern ourself with one MMC device, so instead of
being able to use CONFIG_SYS_MMC_ENV_DEV we need to use 0 in SPL.
Switch the code to use a 'dev' variable to facilitate this.
Signed-off-by: Tom Rini <trini@ti.com>
---
common/env_mmc.c | 37 ++++++++++++++++++++++++++++++-------
1 file changed, 30 insertions(+), 7 deletions(-)
diff --git a/common/env_mmc.c b/common/env_mmc.c
index 0ab11d3..ad3ff45 100644
--- a/common/env_mmc.c
+++ b/common/env_mmc.c
@@ -64,6 +64,13 @@ int env_init(void)
static int init_mmc_for_env(struct mmc *mmc)
{
+#ifdef CONFIG_SYS_MMC_ENV_PART
+ int dev = CONFIG_SYS_MMC_ENV_DEV;
+#ifdef CONFIG_SPL_BUILD
+ dev = 0;
+#endif
+#endif
+
if (!mmc) {
puts("No MMC card found\n");
return -1;
@@ -76,8 +83,7 @@ static int init_mmc_for_env(struct mmc *mmc)
#ifdef CONFIG_SYS_MMC_ENV_PART
if (CONFIG_SYS_MMC_ENV_PART != mmc->part_num) {
- if (mmc_switch_part(CONFIG_SYS_MMC_ENV_DEV,
- CONFIG_SYS_MMC_ENV_PART)) {
+ if (mmc_switch_part(dev, CONFIG_SYS_MMC_ENV_PART)) {
puts("MMC partition switch failed\n");
return -1;
}
@@ -90,9 +96,12 @@ static int init_mmc_for_env(struct mmc *mmc)
static void fini_mmc_for_env(struct mmc *mmc)
{
#ifdef CONFIG_SYS_MMC_ENV_PART
+ int dev = CONFIG_SYS_MMC_ENV_DEV;
+#ifdef CONFIG_SPL_BUILD
+ dev = 0;
+#endif
if (CONFIG_SYS_MMC_ENV_PART != mmc->part_num)
- mmc_switch_part(CONFIG_SYS_MMC_ENV_DEV,
- mmc->part_num);
+ mmc_switch_part(dev, mmc->part_num);
#endif
}
@@ -174,11 +183,15 @@ static inline int read_env(struct mmc *mmc, unsigned long size,
unsigned long offset, const void *buffer)
{
uint blk_start, blk_cnt, n;
+ int dev = CONFIG_SYS_MMC_ENV_DEV;
+#ifdef CONFIG_SPL_BUILD
+ dev = 0;
+#endif
blk_start = ALIGN(offset, mmc->read_bl_len) / mmc->read_bl_len;
blk_cnt = ALIGN(size, mmc->read_bl_len) / mmc->read_bl_len;
- n = mmc->block_dev.block_read(CONFIG_SYS_MMC_ENV_DEV, blk_start,
+ n = mmc->block_dev.block_read(dev, blk_start,
blk_cnt, (uchar *)buffer);
return (n == blk_cnt) ? 0 : -1;
@@ -188,13 +201,18 @@ static inline int read_env(struct mmc *mmc, unsigned long size,
void env_relocate_spec(void)
{
#if !defined(ENV_IS_EMBEDDED)
- struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+ struct mmc *mmc;
u32 offset1, offset2;
int read1_fail = 0, read2_fail = 0;
int crc1_ok = 0, crc2_ok = 0;
env_t *ep, *tmp_env1, *tmp_env2;
int ret;
+ int dev = CONFIG_SYS_MMC_ENV_DEV;
+#ifdef CONFIG_SPL_BUILD
+ dev = 0;
+#endif
+ mmc = find_mmc_device(dev);
tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE);
tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE);
if (tmp_env1 == NULL || tmp_env2 == NULL) {
@@ -274,11 +292,16 @@ err:
void env_relocate_spec(void)
{
#if !defined(ENV_IS_EMBEDDED)
- struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+ struct mmc *mmc;
env_t *ep;
u32 offset;
int ret;
+ int dev = CONFIG_SYS_MMC_ENV_DEV;
+#ifdef CONFIG_SPL_BUILD
+ dev = 0;
+#endif
+ mmc = find_mmc_device(dev);
ep = (env_t *)malloc(CONFIG_ENV_SIZE);
if (ep == NULL) {
puts("Can't allocate buffers for environment\n");
--
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 ` [U-Boot] [PATCH 02/11] env_mmc.c: Make the non-redundant env_relocate_spec use malloc not stack Tom Rini
2013-10-05 20:00 ` Wolfgang Denk
2013-10-06 20:40 ` Tom Rini
2013-10-07 5:41 ` Wolfgang Denk
2013-09-26 20:27 ` Tom Rini [this message]
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-4-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