[PATCH] Define barebox_loc magic variable only once

[PATCH] Define barebox_loc magic variable only once

[Alexander Shiyan]

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-imx/boot.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index 9f2def6..b79ebc7 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -87,8 +87,6 @@ static int imx_25_35_boot_save_loc(void)
 	return 0;
 }
 coredevice_initcall(imx_25_35_boot_save_loc);
-
-BAREBOX_MAGICVAR(barebox_loc, "The source barebox has been booted from");
 #endif
 
 #if defined(CONFIG_ARCH_IMX27)
@@ -114,6 +112,6 @@ static int imx_27_boot_save_loc(void)
 	return 0;
 }
 coredevice_initcall(imx_27_boot_save_loc);
+#endif
 
 BAREBOX_MAGICVAR(barebox_loc, "The source barebox has been booted from");
-#endif
-- 
1.7.3.4


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

Re: [PATCH] Define barebox_loc magic variable only once

[Sascha Hauer]

On Tue, Apr 03, 2012 at 01:27:00PM +0400, Alexander Shiyan wrote:
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>

Applied, thanks

Sascha

> ---
>  arch/arm/mach-imx/boot.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
> index 9f2def6..b79ebc7 100644
> --- a/arch/arm/mach-imx/boot.c
> +++ b/arch/arm/mach-imx/boot.c
> @@ -87,8 +87,6 @@ static int imx_25_35_boot_save_loc(void)
>  	return 0;
>  }
>  coredevice_initcall(imx_25_35_boot_save_loc);
> -
> -BAREBOX_MAGICVAR(barebox_loc, "The source barebox has been booted from");
>  #endif
>  
>  #if defined(CONFIG_ARCH_IMX27)
> @@ -114,6 +112,6 @@ static int imx_27_boot_save_loc(void)
>  	return 0;
>  }
>  coredevice_initcall(imx_27_boot_save_loc);
> +#endif
>  
>  BAREBOX_MAGICVAR(barebox_loc, "The source barebox has been booted from");
> -#endif
> -- 
> 1.7.3.4
> 
> 
> _______________________________________________
> 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