Skip to contentSkip to conversation

Call gentenv_IPaddr only if CONFIG_CMD_NET set

PATCH New Albert Aribaud 2 participants 6 messages Jan 8, 2010

lore
Share & tools
lore

Albert Aribaud

author
#0 lore raw

PATCH 1/1 Call gentenv_IPaddr only if CONFIG_CMD_NET set

ARM Boards for which CONFIG_CMD_NET is unset still call getenv_IPaddr from lib_arm/board.c even though net/net.c (which defines gentenv_IPaddr) will not be compiled and linked. This patch fixes this by making the call conditional to CONFIG_CMD_NET.

Signed-off-by Albert Aribaud <[email protected]>
---
 lib_arm/board.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
lib_arm/board.c +2 -0
index e148739..453d660 100644
@@ -356,8 +356,10 @@ void start_armboot (void)
 	serial_initialize();
 #endif
 
+#ifdef CONFIG_CMD_NET
 	/* IP Address */
 	gd->bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
+#endif
 
 	stdio_init ();	/* get the devices list going. */
Signature · 1 line
1.6.4.4
author
#1 lore raw

PATCH 1/1 Call gentenv_IPaddr only if CONFIG_CMD_NET set

Albert Aribaud a ?crit :

Quoted 7 lines

ARM Boards for which CONFIG_CMD_NET is unset still call getenv_IPaddr from lib_arm/board.c even though net/net.c (which defines gentenv_IPaddr) will not be compiled and linked. This patch fixes this by making the call conditional to CONFIG_CMD_NET.

Signed-off-by Albert Aribaud <[email protected]>

Regarding this fix I have a SCM related question:

I was hit by this problem while preparing my Orion 5x patch for final submission (strangely enough I was not hit before even though I never had CONFIG_CMD_NET set).

This means my Orion patches will depend on this one (but I felt I should submit it separately as it was totally unrelated to Orion/Ed Mini support). Can I submit the Orion patches and just mention the dependency? Or do I also do the fix in my Orion patches and let GIT sort things out?

Amicalement,

Signature · 1 line
Albert.
#2 lore raw

PATCH 1/1 Call gentenv_IPaddr only if CONFIG_CMD_NET set

In reply to Albert Aribaud

Hi Albert,

Quoted 6 lines · Albert Aribaud

ARM Boards for which CONFIG_CMD_NET is unset still call getenv_IPaddr from lib_arm/board.c even though net/net.c (which defines gentenv_IPaddr) will not be compiled and linked. This patch fixes this by making the call conditional to CONFIG_CMD_NET.

There's already been quite a bit of discussion about this, and another fix is in the queue:

http://article.gmane.org/gmane.comp.boot-loaders.u-boot/73200/match=getenv_IPaddr

Correct me if it doesn't fix your problem.

regards,
Ben

author
#3 lore raw

PATCH 1/1 Call gentenv_IPaddr only if CONFIG_CMD_NET set

Ben Warren a ?crit :

Quoted 12 lines

Hi Albert,

Quoted 6 lines · Albert Aribaud

ARM Boards for which CONFIG_CMD_NET is unset still call getenv_IPaddr from lib_arm/board.c even though net/net.c (which defines gentenv_IPaddr) will not be compiled and linked. This patch fixes this by making the call conditional to CONFIG_CMD_NET.

There's already been quite a bit of discussion about this, and another fix is in the queue:

Quoted 7 lines

http://article.gmane.org/gmane.comp.boot-loaders.u-boot/73200/match=getenv_IPaddr

Correct me if it doesn't fix your problem.

regards,
Ben

Thanks Ben, I obviously missed this... I can try and mumble an excuse about it being too near New Year's Eve.

As long as it allows building with ARM and no CONFIG_CMD_NET, it's fine with me.

Does its being "in the queue" (but obviously not committed yet as I'd pulled and checked before posting) allow me to submit patches dependent on it?

Amicalement,

Signature · 1 line
Albert.
#4 lore raw

PATCH 1/1 Call gentenv_IPaddr only if CONFIG_CMD_NET set

Quoted 16 lines · Albert ARIBAUD

Ben Warren a ?crit :

Quoted 15 lines

Hi Albert,

Quoted 6 lines · Albert Aribaud

ARM Boards for which CONFIG_CMD_NET is unset still call getenv_IPaddr from lib_arm/board.c even though net/net.c (which defines gentenv_IPaddr) will not be compiled and linked. This patch fixes this by making the call conditional to CONFIG_CMD_NET.

There's already been quite a bit of discussion about this, and another fix is in the queue:

http://article.gmane.org/gmane.comp.boot-loaders.u-boot/73200/match=getenv_IPaddr

Quoted 8 lines
Quoted 4 lines

Correct me if it doesn't fix your problem.

regards,
Ben

Thanks Ben, I obviously missed this... I can try and mumble an excuse about it being too near New Year's Eve.

Pas de probleme.

Quoted 7 lines

As long as it allows building with ARM and no CONFIG_CMD_NET, it's fine with me.

Does its being "in the queue" (but obviously not committed yet as I'd pulled and checked before posting) allow me to submit patches dependent on it?

I've asked WD to apply the patch, but he hasn't acted yet. Do your patches affect the files touched by this patch, or are you concerned about the link error (undefined reference to 'getenv_IPaddr')? If the former, don't submit yet. If the latter, go ahead.

Quoted 1 line

Amicalement,

regards,
Ben

author
#5 lore raw

PATCH 1/1 Call gentenv_IPaddr only if CONFIG_CMD_NET set

Ben Warren a ?crit :

Quoted 8 lines
Quoted 4 lines

Does its being "in the queue" (but obviously not committed yet as I'd pulled and checked before posting) allow me to submit patches dependent on it?

I've asked WD to apply the patch, but he hasn't acted yet. Do your patches affect the files touched by this patch, or are you concerned about the link error (undefined reference to 'getenv_IPaddr')? If the former, don't submit yet. If the latter, go ahead.

I'll go ahead then: it's only the link problem.

Quoted 2 lines

regards,
Ben

Thanks again Ben!

Amicalement,

Signature · 1 line
Albert.