On Thu, Jun 05, 2014 at 05:43:38PM +0400, Alexander Shiyan wrote:
> Signed-off-by: Alexander Shiyan <shc_work@xxxxxxx>
Applied, thanks
Sascha
> ---
> arch/arm/boards/clep7212/lowlevel.c | 2 +-
> arch/arm/mach-clps711x/include/mach/clps711x.h | 2 +-
> arch/arm/mach-clps711x/lowlevel.c | 4 ++--
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boards/clep7212/lowlevel.c b/arch/arm/boards/clep7212/lowlevel.c
> index 92fbb9b..ac71506 100644
> --- a/arch/arm/boards/clep7212/lowlevel.c
> +++ b/arch/arm/boards/clep7212/lowlevel.c
> @@ -24,5 +24,5 @@ void __naked __bare_init barebox_arm_reset_vector(void)
> {
> arm_cpu_lowlevel_init();
>
> - clps711x_barebox_entry(CLPS711X_CPU_PLL_MULT);
> + clps711x_barebox_entry(CLPS711X_CPU_PLL_MULT, NULL);
> }
> diff --git a/arch/arm/mach-clps711x/include/mach/clps711x.h b/arch/arm/mach-clps711x/include/mach/clps711x.h
> index cc65cc8..f4a1f0a 100644
> --- a/arch/arm/mach-clps711x/include/mach/clps711x.h
> +++ b/arch/arm/mach-clps711x/include/mach/clps711x.h
> @@ -281,6 +281,6 @@
> #define MEMCFG_WAITSTATE_2_0 (14 << 2)
> #define MEMCFG_WAITSTATE_1_0 (15 << 2)
>
> -void clps711x_barebox_entry(u32);
> +void clps711x_barebox_entry(u32, void *);
>
> #endif
> diff --git a/arch/arm/mach-clps711x/lowlevel.c b/arch/arm/mach-clps711x/lowlevel.c
> index 93a64a1..ff23b05 100644
> --- a/arch/arm/mach-clps711x/lowlevel.c
> +++ b/arch/arm/mach-clps711x/lowlevel.c
> @@ -17,7 +17,7 @@
>
> #include <mach/clps711x.h>
>
> -void __naked __bare_init clps711x_barebox_entry(u32 pllmult)
> +void __naked __bare_init clps711x_barebox_entry(u32 pllmult, void *data)
> {
> u32 cpu, bus;
>
> @@ -69,5 +69,5 @@ void __naked __bare_init clps711x_barebox_entry(u32 pllmult)
> /* Disable LED flasher */
> writew(0, LEDFLSH);
>
> - barebox_arm_entry(SDRAM0_BASE, SZ_8M, NULL);
> + barebox_arm_entry(SDRAM0_BASE, SZ_8M, data);
> }
> --
> 1.8.5.5
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
