Skip to contentSkip to conversation

env_mmc: Fix broken build due to set_default_env() change

U-Boot Applied Steve Sakoman 2 participants 2 messages Oct 5, 2010 – Oct 6, 2010

lore
Share & tools
lore
#0 lore raw

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.

---

common/env_mmc.c +1 -2
index 14203b6..cc288d4 100644
@@ -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
#1 lore raw

Dear Steve Sakoman,

Quoted 12 lines · 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.

---

common/env_mmc.c +0 -0
index 14203b6..cc288d4 100644

common/env_mmc.c void env_relocate_spec(void) · line 152

Quoted 8 lines
common/env_mmc.c +1 -2
@@ -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

Signature · 5 lines
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."