[PATCH] ARM: phycard-imx6: fixup for barebox_arm_entry signature change

[PATCH] ARM: phycard-imx6: fixup for barebox_arm_entry signature change

[Lucas Stach]

This board wasn't changed properly, as it was merged in the short
timeframe where the signature change waited to be applied. Change
it now to get rid of the compiler warning.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
Sascha, please apply to master.
---
 arch/arm/boards/phytec-phycard-imx6/lowlevel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c b/arch/arm/boards/phytec-phycard-imx6/lowlevel.c
index 14df18f83543..64312b02437c 100644
--- a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-phycard-imx6/lowlevel.c
@@ -57,7 +57,7 @@ extern char __dtb_imx6q_phytec_pbaa03_start[];
 
 static void __noreturn start_imx6q_phytec_pbaa03_common(uint32_t size)
 {
-	uint32_t fdt;
+	void *fdt;
 
 	arm_cpu_lowlevel_init();
 
@@ -66,7 +66,7 @@ static void __noreturn start_imx6q_phytec_pbaa03_common(uint32_t size)
 	if (IS_ENABLED(CONFIG_DEBUG_LL))
 		setup_uart();
 
-	fdt = (uint32_t)__dtb_imx6q_phytec_pbaa03_start - get_runtime_offset();
+	fdt = __dtb_imx6q_phytec_pbaa03_start - get_runtime_offset();
 
 	barebox_arm_entry(0x10000000, size, fdt);
 }
-- 
1.9.0


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

Re: [PATCH] ARM: phycard-imx6: fixup for barebox_arm_entry signature change

[Sascha Hauer]

On Tue, May 06, 2014 at 09:28:16PM +0200, Lucas Stach wrote:
> This board wasn't changed properly, as it was merged in the short
> timeframe where the signature change waited to be applied. Change
> it now to get rid of the compiler warning.
> 
> Signed-off-by: Lucas Stach <dev@lynxeye.de>

Applied, thanks

Sascha

> ---
> Sascha, please apply to master.
> ---
>  arch/arm/boards/phytec-phycard-imx6/lowlevel.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c b/arch/arm/boards/phytec-phycard-imx6/lowlevel.c
> index 14df18f83543..64312b02437c 100644
> --- a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c
> +++ b/arch/arm/boards/phytec-phycard-imx6/lowlevel.c
> @@ -57,7 +57,7 @@ extern char __dtb_imx6q_phytec_pbaa03_start[];
>  
>  static void __noreturn start_imx6q_phytec_pbaa03_common(uint32_t size)
>  {
> -	uint32_t fdt;
> +	void *fdt;
>  
>  	arm_cpu_lowlevel_init();
>  
> @@ -66,7 +66,7 @@ static void __noreturn start_imx6q_phytec_pbaa03_common(uint32_t size)
>  	if (IS_ENABLED(CONFIG_DEBUG_LL))
>  		setup_uart();
>  
> -	fdt = (uint32_t)__dtb_imx6q_phytec_pbaa03_start - get_runtime_offset();
> +	fdt = __dtb_imx6q_phytec_pbaa03_start - get_runtime_offset();
>  
>  	barebox_arm_entry(0x10000000, size, fdt);
>  }
> -- 
> 1.9.0
> 
> 
> _______________________________________________
> 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