Commit 551b39ef authored Dec 04, 2020 by Geert Uytterhoeven Committed by Russell King Dec 21, 2020

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>

parent 1ecec385

arch/arm/boot/compressed/head.S

+7 −5

Original line number	Diff line number	Diff line
		@@ -11,6 +11,12 @@

		#include "efi-header.S"

		#ifdef __ARMEB__
		#define OF_DT_MAGIC 0xd00dfeed
		#else
		#define OF_DT_MAGIC 0xedfe0dd0
		#endif

		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
		#else
		ldr r1, =0xd00dfeed
		#endif
		ldr r1, =OF_DT_MAGIC
		cmp lr, r1
		bne dtb_check_done @ not found

Admin message