mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Vicente Bergas <vicencb@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] omap4 regression: set correct boot source
Date: Thu, 18 Apr 2013 08:04:09 +0200	[thread overview]
Message-ID: <20130418060409.GA1906@pengutronix.de> (raw)
In-Reply-To: <1366147921-23073-1-git-send-email-vicencb@gmail.com>

On Tue, Apr 16, 2013 at 11:32:01PM +0200, Vicente Bergas wrote:
> 
> Signed-off-by: Vicente Bergas <vicencb@gmail.com>

Folded into the original patch breaking it.

Sascha

> ---
>  arch/arm/mach-omap/omap4_generic.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c
> index b33ed60..3d6ec25 100644
> --- a/arch/arm/mach-omap/omap4_generic.c
> +++ b/arch/arm/mach-omap/omap4_generic.c
> @@ -507,11 +507,11 @@ static int omap4_bootsource(void)
>  	u32 bootsrc = readl(OMAP4_TRACING_VECTOR3);
>  
>  	if (bootsrc & (1 << 5))
> -		return BOOTSOURCE_MMC;
> +		src = BOOTSOURCE_MMC;
>  	if (bootsrc & (1 << 3))
> -		return BOOTSOURCE_NAND;
> +		src = BOOTSOURCE_NAND;
>  	if (bootsrc & (1<<20))
> -		return BOOTSOURCE_USB;
> +		src = BOOTSOURCE_USB;
>  	bootsource_set(src);
>  	bootsource_set_instance(0);
>  
> -- 
> 1.8.2.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2013-04-18  6:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-16 21:32 Vicente Bergas
2013-04-17  7:30 ` Jan Lübbe
2013-04-18  6:04 ` Sascha Hauer [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=20130418060409.GA1906@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=vicencb@gmail.com \
    /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