commit c2854e09498e87251564cc32340b5f333e962b05
author Marek Behún <marek.behun@nic.cz> Thu May 20 13:24:09 2021 +0200
committer Tom Rini <trini@konsulko.com> Mon May 24 14:21:30 2021 -0400
tree 8d42fbd943049890b5033729da4015014a43d2c4
parent f8bd43f4714c5552953364f8fe274dbdc92130af

ARM: global_data: make set_gd() work for armv5 and armv6

The Thumb instruction `ldr` is able to move high registers only from
armv7. For armv5 and armv6 we have to use `mov`.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

arch/arm/include/asm/global_data.h

diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index fba655f..bb82efa 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -122,8 +122,10 @@
 {
 #ifdef CONFIG_ARM64
 	__asm__ volatile("ldr x18, %0\n" : : "m"(gd_ptr));
-#else
+#elif __ARM_ARCH >= 7
 	__asm__ volatile("ldr r9, %0\n" : : "m"(gd_ptr));
+#else
+	__asm__ volatile("mov r9, %0\n" : : "r"(gd_ptr));
 #endif
 }