diff mbox

[U-Boot,V2,1/4] ARM: tegra: ensure nvtboot_boot_x0 alignment

Message ID 20161019211847.29361-1-swarren@wwwdotorg.org
State Accepted
Commit 6db8e17892d9f7e2115f335c0a3bcada74273125
Delegated to: Tom Warren
Headers show

Commit Message

Stephen Warren Oct. 19, 2016, 9:18 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

nvtboot_boot_x0 is a 64-bit variable and hence must be 64-bit aligned.
So far this has happened by accident! Fix the code so this is guaranteed.

This fixes the following build error:
... relocation truncated to fit: R_AARCH64_LDST64_ABS_LO12_NC
    against symbol `nvtboot_boot_x0' ...

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
v2: New patch.
---
 arch/arm/mach-tegra/tegra186/nvtboot_ll.S | 1 +
 1 file changed, 1 insertion(+)

Comments

Stephen Warren Oct. 27, 2016, 5:41 p.m. UTC | #1 
On 10/19/2016 03:18 PM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> nvtboot_boot_x0 is a 64-bit variable and hence must be 64-bit aligned.
> So far this has happened by accident! Fix the code so this is guaranteed.
>
> This fixes the following build error:
> ... relocation truncated to fit: R_AARCH64_LDST64_ABS_LO12_NC
>     against symbol `nvtboot_boot_x0' ...

TomW, I assume you'll be applying this soon? Simon ack'd patch 3 a while 
back, and that's the only thing that touches non-Tegra logic. I assume 
he's OK with the other patches.
diff mbox

Patch

diff --git a/arch/arm/mach-tegra/tegra186/nvtboot_ll.S b/arch/arm/mach-tegra/tegra186/nvtboot_ll.S
index 1eab890958c7..899c9cccbe84 100644
--- a/arch/arm/mach-tegra/tegra186/nvtboot_ll.S
+++ b/arch/arm/mach-tegra/tegra186/nvtboot_ll.S
@@ -9,6 +9,7 @@ 
 #include <config.h>
 #include <linux/linkage.h>
 
+.align 8
 .globl	nvtboot_boot_x0
 nvtboot_boot_x0:
 	.dword 0