Re: [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
On Monday, October 24, 2011 07:42:32 AM Heiko Schocher wrote: since commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 building arch/arm/lib/board.c breaks if CONFIG_CMD_NET is defined. Fix this. Signed-off-by: Heiko Schocher h...@denx.de Cc: Albert ARIBAUD albert.u.b...@aribaud.net Cc: Simon Glass s...@chromium.org --- arch/arm/lib/board.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index ad02dbd..c1a3f2c 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -440,6 +440,9 @@ void board_init_r(gd_t *id, ulong dest_addr) #if !defined(CONFIG_SYS_NO_FLASH) ulong flash_size; #endif +#if defined(CONFIG_CMD_NET) + char *s; +#endif gd = id; I just sent something similar, but please use this one. Cheers ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
Hi Heiko, Le 24/10/2011 07:42, Heiko Schocher a écrit : since commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 building arch/arm/lib/board.c breaks if CONFIG_CMD_NET is defined. Fix this. Signed-off-by: Heiko Schocherh...@denx.de Cc: Albert ARIBAUDalbert.u.b...@aribaud.net Cc: Simon Glasss...@chromium.org --- arch/arm/lib/board.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index ad02dbd..c1a3f2c 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -440,6 +440,9 @@ void board_init_r(gd_t *id, ulong dest_addr) #if !defined(CONFIG_SYS_NO_FLASH) ulong flash_size; #endif +#if defined(CONFIG_CMD_NET) + char *s; +#endif gd = id; Applied to u-boot-arm/master, thanks. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
Dear Albert ARIBAUD, In message 4ea59236.4000...@aribaud.net you wrote: Le 24/10/2011 07:42, Heiko Schocher a écrit : since commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 building arch/arm/lib/board.c breaks if CONFIG_CMD_NET is defined. Fix this. Signed-off-by: Heiko Schocherh...@denx.de Cc: Albert ARIBAUDalbert.u.b...@aribaud.net Cc: Simon Glasss...@chromium.org --- arch/arm/lib/board.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index ad02dbd..c1a3f2c 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -440,6 +440,9 @@ void board_init_r(gd_t *id, ulong dest_addr) #if !defined(CONFIG_SYS_NO_FLASH) ulong flash_size; #endif +#if defined(CONFIG_CMD_NET) + char *s; +#endif gd = id; Applied to u-boot-arm/master, thanks. Sorry for disagreeing - but I like Simon's patch better than both Heiko's and my own, because it does without additional #ifdef. And sorry again, I pull this directly to get the build issues fixed quickly. 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: w...@denx.de core error - bus dumped ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
Dear Marek Vasut, In message 201110241115.45602.marek.va...@gmail.com you wrote: I just sent something similar, but please use this one. It's really interesting to see how many people wake up if they are affected - and then hack away and send patches without even checing how many similar patches have been sent before :-( 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: w...@denx.de Every program has at least one bug and can be shortened by at least one instruction -- from which, by induction, one can deduce that every program can be reduced to one instruction which doesn't work. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
Hi Wolfgang, Le 24/10/2011 21:12, Wolfgang Denk a écrit : Dear Albert ARIBAUD, In message4ea59236.4000...@aribaud.net you wrote: Le 24/10/2011 07:42, Heiko Schocher a écrit : since commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 building arch/arm/lib/board.c breaks if CONFIG_CMD_NET is defined. Fix this. Signed-off-by: Heiko Schocherh...@denx.de Cc: Albert ARIBAUDalbert.u.b...@aribaud.net Cc: Simon Glasss...@chromium.org --- arch/arm/lib/board.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index ad02dbd..c1a3f2c 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -440,6 +440,9 @@ void board_init_r(gd_t *id, ulong dest_addr) #if !defined(CONFIG_SYS_NO_FLASH) ulong flash_size; #endif +#if defined(CONFIG_CMD_NET) + char *s; +#endif gd = id; Applied to u-boot-arm/master, thanks. Sorry for disagreeing - but I like Simon's patch better than both Heiko's and my own, because it does without additional #ifdef. And sorry again, I pull this directly to get the build issues fixed quickly. That's fine with me. :) I've removed Heiko's patch from u-boot-arm/master. (ARM tree custodians -- Cc:ed -- please rebase onto new u-boot-arm/master) Best regards, Wolfgang Denk Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
since commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 building arch/arm/lib/board.c breaks if CONFIG_CMD_NET is defined. Fix this. Signed-off-by: Heiko Schocher h...@denx.de Cc: Albert ARIBAUD albert.u.b...@aribaud.net Cc: Simon Glass s...@chromium.org --- arch/arm/lib/board.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index ad02dbd..c1a3f2c 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -440,6 +440,9 @@ void board_init_r(gd_t *id, ulong dest_addr) #if !defined(CONFIG_SYS_NO_FLASH) ulong flash_size; #endif +#if defined(CONFIG_CMD_NET) + char *s; +#endif gd = id; -- 1.7.6.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
