path: root/arch
diff options
authorGeert Uytterhoeven <geert+renesas@glider.be>2020-12-04 10:39:10 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2020-12-21 11:19:21 +0000
commit551b39efc6ffdc7a881122fbac0caa2a27a464d8 (patch)
treebbfd80fbd3775001c60d2a5daee0ef1f739aba24 /arch
parent1ecec38547d415054fdb63a231234f44396b6d06 (diff)
ARM: 9037/1: uncompress: Add OF_DT_MAGIC macro
The DTB magic marker is stored as a 32-bit big-endian value, and thus depends on the CPU's endianness. Add a macro to define this value in native endianness, to reduce #ifdef clutter and (future) duplication. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Ard Biesheuvel <ardb@kernel.org> Reviewed-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch')
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 4fb699769e6a..8d546cb10921 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -11,6 +11,12 @@
#include "efi-header.S"
+#ifdef __ARMEB__
+#define OF_DT_MAGIC 0xd00dfeed
+#define OF_DT_MAGIC 0xedfe0dd0
AR_CLASS( .arch armv7-a )
M_CLASS( .arch armv7-m )
@@ -335,11 +341,7 @@ restart: adr r0, LC1
ldr lr, [r6, #0]
-#ifndef __ARMEB__
- ldr r1, =0xedfe0dd0 @ sig is 0xd00dfeed big endian
- ldr r1, =0xd00dfeed
+ ldr r1, =OF_DT_MAGIC
cmp lr, r1
bne dtb_check_done @ not found