[PATCH] omap4 regression: set correct boot source

[PATCH] omap4 regression: set correct boot source

[Vicente Bergas]

Signed-off-by: Vicente Bergas <vicencb@gmail.com>
---
 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

Re: [PATCH] omap4 regression: set correct boot source

[Jan Lübbe]

On Tue, 2013-04-16 at 23:32 +0200, Vicente Bergas wrote:
> Signed-off-by: Vicente Bergas <vicencb@gmail.com>
> ---
>  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);

Sorry for messing this up. Sascha, this patch is correct.

Regards,
Jan
-- 
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

Re: [PATCH] omap4 regression: set correct boot source

[Sascha Hauer]

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