public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Simon Schwarz <simonschwarzcor@googlemail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/2] devkit8000: protect board_mmc_init
Date: Fri, 30 Sep 2011 12:41:33 +0200	[thread overview]
Message-ID: <1317379294-16314-2-git-send-email-simonschwarzcor@gmail.com> (raw)
In-Reply-To: <1317379294-16314-1-git-send-email-simonschwarzcor@gmail.com>

This function is also defined in omap-common/spl_mmc.de so the implementation
in devkit8000.c was protected by a ifdef.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
---
 board/timll/devkit8000/devkit8000.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 9124569..dc99afb 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -125,7 +125,7 @@ void set_muxconf_regs(void)
 	MUX_DEVKIT8000();
 }
 
-#ifdef CONFIG_GENERIC_MMC
+#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
 int board_mmc_init(bd_t *bis)
 {
 	omap_mmc_init(0);
-- 
1.7.4.1

  reply	other threads:[~2011-09-30 10:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-30 10:41 [U-Boot] [PATCH 0/2] devkit8000: add spl mmc boot Simon Schwarz
2011-09-30 10:41 ` Simon Schwarz [this message]
2011-10-14 19:58   ` [U-Boot] [PATCH 1/2] devkit8000: protect board_mmc_init Albert ARIBAUD
2011-09-30 10:41 ` [U-Boot] [PATCH 2/2] devkit8000: Add config to enable SPL MMC boot Simon Schwarz
2011-10-14 19:59   ` Albert ARIBAUD

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=1317379294-16314-2-git-send-email-simonschwarzcor@gmail.com \
    --to=simonschwarzcor@googlemail.com \
    --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