From: Thierry Reding Date: Mon, 15 Apr 2019 09:32:23 +0000 (+0200) Subject: ARM: tegra: Fix save_boot_params() prototype X-Git-Tag: v2019.07-rc4~4^2~15 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8f60d18f9406c38a90972798290aa3ce3de92ecb;p=oweals%2Fu-boot.git ARM: tegra: Fix save_boot_params() prototype The save_boot_params() function takes as its first four arguments the first four registers. On 32-bit ARM these are r0, r1, r2 and r3, all of which are 32 bits wide. However, on 64-bit ARM thene registers are x0, x1, x2 and x3, all of which are 64 bits wide. In order to allow reusing the save_boot_params() implementation on 64-bit ARM, change it to take unsigned long parameters rather than the fixed size 32-bit integers. This ensures that the correct values are passed. Signed-off-by: Thierry Reding Signed-off-by: Tom Warren --- diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index fd23de1804..42baf975ec 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -42,7 +42,8 @@ enum { static bool from_spl __attribute__ ((section(".data"))); #ifndef CONFIG_SPL_BUILD -void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) +void save_boot_params(unsigned long r0, unsigned long r1, unsigned long r2, + unsigned long r3) { from_spl = r0 != UBOOT_NOT_LOADED_FROM_SPL; save_boot_params_ret();