Patchwork [U-Boot] Ethernut 5: fix build error for board_mmc_getcd()

login
register
mail settings
Submitter prabhakar.csengg@gmail.com
Date Feb. 6, 2012, 12:49 p.m.
Message ID <1328532584-17986-1-git-send-email-prabhakar.csengg@gmail.com>
Download mbox | patch
Permalink /patch/139727/
State Accepted
Commit 2271e7c6e8eef883b834fb7d07911848a54fde13
Headers show

Comments

prabhakar.csengg@gmail.com - Feb. 6, 2012, 12:49 p.m.
Fix build error for ethernut5 and mx6qarm2 board due
to prototype change for function  board_mmc_getcd()
ethernut5.c:238: error: conflicting types for 'board_mmc_getcd'
u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd' was here
make[2]: *** [ethernut5.o] Error 1

Signed-off-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
---
 board/egnite/ethernut5/ethernut5.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
Thierry Reding - Feb. 6, 2012, 1:38 p.m.
* Prabhakar Lad wrote:
> Fix build error for ethernut5 and mx6qarm2 board due
> to prototype change for function  board_mmc_getcd()
> ethernut5.c:238: error: conflicting types for 'board_mmc_getcd'
> u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd' was here
> make[2]: *** [ethernut5.o] Error 1
> 
> Signed-off-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
> ---
>  board/egnite/ethernut5/ethernut5.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c
> index e42e91e..fd021a3 100644
> --- a/board/egnite/ethernut5/ethernut5.c
> +++ b/board/egnite/ethernut5/ethernut5.c
> @@ -235,10 +235,9 @@ int board_mmc_init(bd_t *bd)
>  	return atmel_mci_init((void *)ATMEL_BASE_MCI);
>  }
>  
> -int board_mmc_getcd(u8 *cd, struct mmc *mmc)
> +int board_mmc_getcd(struct mmc *mmc)
>  {
> -	*cd = at91_get_pio_value(CONFIG_SYS_MMC_CD_PIN) ? 1 : 0;
> -	return 0;
> +	return !at91_get_pio_value(CONFIG_SYS_MMC_CD_PIN);
>  }
>  #endif

Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Albert ARIBAUD - Feb. 19, 2012, 9:49 a.m.
Hi Prabhakar,

Le 06/02/2012 13:49, Prabhakar Lad a écrit :
> Fix build error for ethernut5 and mx6qarm2 board due
> to prototype change for function  board_mmc_getcd()
> ethernut5.c:238: error: conflicting types for 'board_mmc_getcd'
> u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd' was here
> make[2]: *** [ethernut5.o] Error 1
>
> Signed-off-by: Prabhakar Lad<prabhakar.csengg@gmail.com>
> ---
>   board/egnite/ethernut5/ethernut5.c |    5 ++---
>   1 files changed, 2 insertions(+), 3 deletions(-)

This patch touches only Ethernut 5, and mx6qarm2 currently builds clean. 
Can you please elaborate on what your issue is with mx6qarm2 and 
resubmit with a corrected summary?

Amicalement,
prabhakar.csengg@gmail.com - Feb. 20, 2012, 4:45 a.m.
Albert,

On Sun, Feb 19, 2012 at 3:19 PM, Albert ARIBAUD
<albert.u.boot@aribaud.net>wrote:

> Hi Prabhakar,
>
> Le 06/02/2012 13:49, Prabhakar Lad a écrit :
>
>  Fix build error for ethernut5 and mx6qarm2 board due
>> to prototype change for function  board_mmc_getcd()
>> ethernut5.c:238: error: conflicting types for 'board_mmc_getcd'
>> u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd'
>> was here
>> make[2]: *** [ethernut5.o] Error 1
>>
>> Signed-off-by: Prabhakar Lad<prabhakar.csengg@gmail.com**>
>> ---
>>  board/egnite/ethernut5/**ethernut5.c |    5 ++---
>>  1 files changed, 2 insertions(+), 3 deletions(-)
>>
>
> This patch touches only Ethernut 5, and mx6qarm2 currently builds clean.
> Can you please elaborate on what your issue is with mx6qarm2 and resubmit
> with a corrected summary?
>
>    That was a typo, this patch only touches to Ethernut 5, I Had also
submitted
   a patch for mx6qarm2(Link <http://patchwork.ozlabs.org/patch/139726/>)
which had a same issue but Dirk had already submitted on it,
  i'll resubmit this patch with the correct summary.

WBR,
--Prabhakar Lad

Amicalement,
> --
> Albert.
>

Patch

diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c
index e42e91e..fd021a3 100644
--- a/board/egnite/ethernut5/ethernut5.c
+++ b/board/egnite/ethernut5/ethernut5.c
@@ -235,10 +235,9 @@  int board_mmc_init(bd_t *bd)
 	return atmel_mci_init((void *)ATMEL_BASE_MCI);
 }
 
-int board_mmc_getcd(u8 *cd, struct mmc *mmc)
+int board_mmc_getcd(struct mmc *mmc)
 {
-	*cd = at91_get_pio_value(CONFIG_SYS_MMC_CD_PIN) ? 1 : 0;
-	return 0;
+	return !at91_get_pio_value(CONFIG_SYS_MMC_CD_PIN);
 }
 #endif