[U-Boot-Users] [PATCH] Fix u16 status declaration when PCMCIA is defined

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c index 95b7d82..536c954 100644 --- a/board/pb1x00/pb1x00.c +++ b/board/pb1x00/pb1x00.c @@ -42,7 +42,9 @@ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
int checkboard (void) { +#if defined(CONFIG_IDE_PCMCIA) && 0 u16 status; +#endif /* volatile u32 *pcmcia_bcsr = (u32*)(DB1000_BCSR_ADDR+0x10); */ volatile u32 *sys_counter = (volatile u32*)SYS_COUNTER_CNTRL; u32 proc_id;

In message 1195386902-15477-1-git-send-email-plagnioj@jcrosoft.com you wrote:
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c index 95b7d82..536c954 100644 --- a/board/pb1x00/pb1x00.c +++ b/board/pb1x00/pb1x00.c @@ -42,7 +42,9 @@ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
int checkboard (void) { +#if defined(CONFIG_IDE_PCMCIA) && 0
Oops? What is the meaning of the "&& 0" here ???
There are less cryptic ways to comment out a line of code, it seems.
Best regards,
Wolfgang Denk

On 16:27 Sun 18 Nov , Wolfgang Denk wrote:
In message 1195386902-15477-1-git-send-email-plagnioj@jcrosoft.com you wrote:
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c index 95b7d82..536c954 100644 --- a/board/pb1x00/pb1x00.c +++ b/board/pb1x00/pb1x00.c @@ -42,7 +42,9 @@ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
int checkboard (void) { +#if defined(CONFIG_IDE_PCMCIA) && 0
Oops? What is the meaning of the "&& 0" here ???
There are less cryptic ways to comment out a line of code, it seems.
I agree, but I've chose the same that the line 78.
If you prefer I can as fallowing
#if 0 #if defined(CONFIG_IDE_PCMCIA)
...
#endif #endif
Best Regards. J.

In message 20071118162829.GA4286@game.jcrosoft.org you wrote:
I agree, but I've chose the same that the line 78.
If you prefer I can as fallowing
#if 0 #if defined(CONFIG_IDE_PCMCIA)
...
#endif #endif
Well, instead, we could as well remove the code. That would be much cleaner.
BTW - which board configuration is throwing warnings for you?
Best regards,
Wolfgang Denk

On 20:32 Sun 18 Nov , Wolfgang Denk wrote:
In message 20071118162829.GA4286@game.jcrosoft.org you wrote:
I agree, but I've chose the same that the line 78.
If you prefer I can as fallowing
#if 0 #if defined(CONFIG_IDE_PCMCIA)
...
#endif #endif
Well, instead, we could as well remove the code. That would be much cleaner.
BTW - which board configuration is throwing warnings for you?
On Mips incaip on cramfs, On arm evb4510, mx1ads(errors) , mx1fs2(errors), sbc2410x, adsvix, pleb2, wepep250, xm250, all ixp
I will send a ppc status within the few hours ro tomorrow morming
Best regards, J.

In message 1195386902-15477-1-git-send-email-plagnioj@jcrosoft.com you wrote:
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c index 95b7d82..536c954 100644 --- a/board/pb1x00/pb1x00.c +++ b/board/pb1x00/pb1x00.c @@ -42,7 +42,9 @@ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
int checkboard (void) { +#if defined(CONFIG_IDE_PCMCIA) && 0 u16 status; +#endif /* volatile u32 *pcmcia_bcsr = (u32*)(DB1000_BCSR_ADDR+0x10); */ volatile u32 *sys_counter = (volatile u32*)SYS_COUNTER_CNTRL; u32 proc_id;
Checked in. Thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Jean-Christophe PLAGNIOL-VILLARD
-
Wolfgang Denk