public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] env_mmc: Fix broken build due to set_default_env() change
@ 2010-10-05 22:31 Steve Sakoman
  2010-10-06 20:24 ` Wolfgang Denk
  0 siblings, 1 reply; 2+ messages in thread
From: Steve Sakoman @ 2010-10-05 22:31 UTC (permalink / raw)
  To: u-boot

Previously the function was set_default_env(void), it is now
set_default_env(const char *s). This patch adds the required
parameter. This fixes a broken build on OMAP4430 SDP.

Signed-off-by: Steve Sakoman <steve.sakoman@linaro.org>
---

diff --git a/common/env_mmc.c b/common/env_mmc.c
index 14203b6..cc288d4 100644
--- a/common/env_mmc.c
+++ b/common/env_mmc.c
@@ -147,7 +147,6 @@ void env_relocate_spec(void)
 #if !defined(ENV_IS_EMBEDDED)
 static void use_default()
 {
-	puts ("*** Warning - bad CRC or MMC, using default environment\n\n");
-	set_default_env();
+	set_default_env(NULL);
 }
 #endif

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] env_mmc: Fix broken build due to set_default_env() change
  2010-10-05 22:31 [U-Boot] env_mmc: Fix broken build due to set_default_env() change Steve Sakoman
@ 2010-10-06 20:24 ` Wolfgang Denk
  0 siblings, 0 replies; 2+ messages in thread
From: Wolfgang Denk @ 2010-10-06 20:24 UTC (permalink / raw)
  To: u-boot

Dear Steve Sakoman,

In message <1286317898.27830.1.camel@quadra> you wrote:
> Previously the function was set_default_env(void), it is now
> set_default_env(const char *s). This patch adds the required
> parameter. This fixes a broken build on OMAP4430 SDP.
> 
> Signed-off-by: Steve Sakoman <steve.sakoman@linaro.org>
> ---
> 
> diff --git a/common/env_mmc.c b/common/env_mmc.c
> index 14203b6..cc288d4 100644
> --- a/common/env_mmc.c
> +++ b/common/env_mmc.c
> @@ -147,7 +147,6 @@ void env_relocate_spec(void)
>  #if !defined(ENV_IS_EMBEDDED)
>  static void use_default()
>  {
> -	puts ("*** Warning - bad CRC or MMC, using default environment\n\n");
> -	set_default_env();
> +	set_default_env(NULL);
>  }
>  #endif

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Who is the oldest inhabitant of this village?"
"We haven't got one; we had one, but he died three weeks ago."

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-10-06 20:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-05 22:31 [U-Boot] env_mmc: Fix broken build due to set_default_env() change Steve Sakoman
2010-10-06 20:24 ` Wolfgang Denk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox