Skip to contentSkip to conversation

ARM: phycard-imx6: fixup for barebox_arm_entry signature change

PATCH Applied Lucas Stach 2 participants 2 messages May 6, 2014 – May 7, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: phycard-imx6: fixup for barebox_arm_entry signature change

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.

---
Sascha, please apply to master.

---
 arch/arm/boards/phytec-phycard-imx6/lowlevel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boards/phytec-phycard-imx6/lowlevel.c +2 -2
index 14df18f83543..64312b02437c 100644
@@ -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);
 }
Signature · 7 lines
1.9.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
maintainer Applied
#1 lore raw
Quoted 5 lines · 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.

Applied, thanks

Sascha

Quoted 37 lines

---
Sascha, please apply to master.

---
 arch/arm/boards/phytec-phycard-imx6/lowlevel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boards/phytec-phycard-imx6/lowlevel.c +2 -2
index 14df18f83543..64312b02437c 100644
@@ -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);
 }
Signature · 7 lines
1.9.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
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
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox