arm, lib: fix compile breakage
PATCH 1/1 arm, lib: fix compile breakage
since commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 building arch/arm/lib/board.c breaks if CONFIG_CMD_NET is defined. Fix this.
--- arch/arm/lib/board.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/lib/board.c +3 -0
@@ -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;
Signature · 1 line
1.7.6.4
PATCH 1/1 arm, lib: fix compile breakage
Quoted 16 lines · Heiko Schocher
since commit
dc8bbea0170eb2aca428ea221c91fc2e5e11f199buildingarch/arm/lib/board.cbreaks ifCONFIG_CMD_NETis defined. Fix this.Signed-off-by Heiko Schocher <[email protected]>Cc Albert ARIBAUD <[email protected]>Cc Simon Glass <[email protected]>--- arch/arm/lib/board.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)arch/arm/lib/board.c +0
-0
arch/arm/lib/board.c void board_init_r(gd_t *id, ulong dest_addr) · line 447
Quoted 8 lines
arch/arm/lib/board.c +3
-0@@ -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
PATCH 1/1 arm, lib: fix compile breakage
Dear Marek Vasut,
Quoted 2 lines · In message <[email protected]> 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
Signature · 6 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 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.
PATCH 1/1 arm, lib: fix compile breakage
In reply to Heiko SchocherHi Heiko,
Le 24/10/2011 07:42, Heiko Schocher a ?crit :
Quoted 16 lines
since commit
dc8bbea0170eb2aca428ea221c91fc2e5e11f199buildingarch/arm/lib/board.cbreaks ifCONFIG_CMD_NETis defined. Fix this.Signed-off-by Heiko Schocher<[email protected]>Cc Albert ARIBAUD<[email protected]>Cc Simon Glass<[email protected]>--- arch/arm/lib/board.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)arch/arm/lib/board.c +0
-0
arch/arm/lib/board.c void board_init_r(gd_t *id, ulong dest_addr) · line 448
Quoted 9 lines
arch/arm/lib/board.c +3
-0@@ -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,
Signature · 1 line
Albert.
PATCH 1/1 arm, lib: fix compile breakage
Dear Albert ARIBAUD,
Quoted 25 lines · In message <[email protected]> you wrote:
Le 24/10/2011 07:42, Heiko Schocher a ?crit :
Quoted 23 lines
since commit
dc8bbea0170eb2aca428ea221c91fc2e5e11f199buildingarch/arm/lib/board.cbreaks ifCONFIG_CMD_NETis defined. Fix this.Signed-off-by Heiko Schocher<[email protected]>Cc Albert ARIBAUD<[email protected]>Cc Simon Glass<[email protected]>--- arch/arm/lib/board.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)arch/arm/lib/board.c +3
-0@@ -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
Quoted 4 lines
arch/arm/lib/board.c void board_init_r(gd_t *id, ulong dest_addr) · line 448
Quoted 2 lines
arch/arm/lib/board.c +0
-0gd = 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
Signature · 4 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 core error - bus dumped
PATCH 1/1 arm, lib: fix compile breakage
Hi Wolfgang,
Le 24/10/2011 21:12, Wolfgang Denk a ?crit :
Quoted 33 lines
Dear Albert ARIBAUD,
Quoted 25 lines · In message<[email protected]> you wrote:
Le 24/10/2011 07:42, Heiko Schocher a ?crit :
Quoted 23 lines
since commit
dc8bbea0170eb2aca428ea221c91fc2e5e11f199buildingarch/arm/lib/board.cbreaks ifCONFIG_CMD_NETis defined. Fix this.Signed-off-by Heiko Schocher<[email protected]>Cc Albert ARIBAUD<[email protected]>Cc Simon Glass<[email protected]>--- arch/arm/lib/board.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)arch/arm/lib/board.c +3
-0@@ -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 Quoted 4 lines
arch/arm/lib/board.c void board_init_r(gd_t *id, ulong dest_addr) · line 448
Quoted 2 lines
arch/arm/lib/board.c +0
-0gd = id;Applied to u-boot-arm/master, thanks.
Quoted 5 lines
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)
Quoted 3 lines
Best regards,
Wolfgang Denk
Amicalement,
Signature · 1 line
Albert.