From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2] Ethernut 5: fix build error
Date: Wed, 29 Feb 2012 01:07:42 +0100 [thread overview]
Message-ID: <4F4D6C4E.3060804@aribaud.net> (raw)
In-Reply-To: <1329998020-2338-1-git-send-email-prabhakar.csengg@gmail.com>
Hi Prabhakar,
Le 23/02/2012 12:53, Prabhakar Lad a ?crit :
> Fix build error for ethernut5 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>
> Cc: Tim Schendekehl<tim.schendekehl@egnite.de>
> Cc: Thierry Reding<thierry.reding@avionic-design.de>
> Cc: Albert ARIBAUD<albert.u.boot@aribaud.net>
> Cc: egnite GmbH<info@egnite.de>
> ---
> Changes for v2:
> Description change.
>
> 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
Applied to u-boot-arm/master as a bugfix, thanks!
Amicalement,
--
Albert.
prev parent reply other threads:[~2012-02-29 0:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-23 11:53 [U-Boot] [PATCH v2] Ethernut 5: fix build error Prabhakar Lad
2012-02-29 0:07 ` Albert ARIBAUD [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F4D6C4E.3060804@aribaud.net \
--to=albert.u.boot@aribaud.net \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox