]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
imx: bootaux: fix stack and pc assignment on 64-bit platforms
authorGary Bisson <gary.bisson@boundarydevices.com>
Wed, 14 Nov 2018 16:55:29 +0000 (17:55 +0100)
committerStefano Babic <sbabic@denx.de>
Tue, 1 Jan 2019 13:12:18 +0000 (14:12 +0100)
Using ulong is wrong as its size depends on the Host CPU architecture
(32-bit vs. 64-bit) although the Cortex-M4 is always 32-bit.

Without this patch, the stack and PC are obviously wrong and it
generates an abort when used on 64-bit processors such as the i.MX8MQ.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
arch/arm/mach-imx/imx_bootaux.c

index a1ea5c13f124df51f336886d00d7a4653b5d5e6a..3103001b7cc1ea76afca8328a9209e8b2689bd16 100644 (file)
@@ -17,8 +17,8 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data)
        if (!boot_private_data)
                return -EINVAL;
 
-       stack = *(ulong *)boot_private_data;
-       pc = *(ulong *)(boot_private_data + 4);
+       stack = *(u32 *)boot_private_data;
+       pc = *(u32 *)(boot_private_data + 4);
 
        /* Set the stack and pc to M4 bootROM */
        writel(stack, M4_BOOTROM_BASE_ADDR);