[03/13] arm: Fix assembler.h for arm64

Message ID	20240519-aarch64-be-v1-3-75cc328eddfa@flygoat.com
State	Changes Requested
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> Feedback-ID: ifd894703:Fastmail From: Jiaxun Yang <jiaxun.yang@flygoat.com> Date: Sun, 19 May 2024 13:56:48 +0100 Subject: [PATCH 03/13] arm: Fix assembler.h for arm64 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240519-aarch64-be-v1-3-75cc328eddfa@flygoat.com> References: <20240519-aarch64-be-v1-0-75cc328eddfa@flygoat.com> In-Reply-To: <20240519-aarch64-be-v1-0-75cc328eddfa@flygoat.com> To: u-boot@lists.denx.de, uboot-snps-arc@synopsys.com Cc: Tom Rini <trini@konsulko.com>, Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Ilias Apalodimas <ilias.apalodimas@linaro.org>, Daniel Schwierzeck <daniel.schwierzeck@gmail.com>, Ezequiel Garcia <ezequiel@collabora.com>, Gregory CLEMENT <gregory.clement@bootlin.com>, Lars Povlsen <lars.povlsen@microchip.com>, Horatiu Vultur <horatiu.vultur@microchip.com>, Alexey Brodkin <alexey.brodkin@synopsys.com>, Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>, Dario Binacchi <dario.binacchi@amarulasolutions.com>, Michael Trimarchi <michael@amarulasolutions.com>, Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>, Jiaxun Yang <jiaxun.yang@flygoat.com> Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	Arm64 big endian enablement \| expand [00/13] Arm64 big endian enablement [01/13] tools/relocate-rela: Fix Big Endian elf64 handling [02/13] arm: Don't select ARM_ASM_UNIFIED on arm64 [03/13] arm: Fix assembler.h for arm64 [04/13] arm: Introduce CPU_LE/CPU_BE macros [05/13] arm: Define endian related bits in system.h [06/13] armv8: Big Endian enablement for compiler and linker [07/13] arm: Perform byte swap for read and write in io.h [08/13] armv8: Allow endianness to be setted at reset entry [09/13] armv8: spin_table: Perform byte swap for jump address [10/13] lib/crc32: Don't perform byte swap for arm64 crc32b [11/13] Kconfig: Unify endian support option [12/13] config: Use CONFIG_SYS_BIG_ENDIAN in code whenever possible [13/13] qemu-arm: Big endian enablement for arm64

Message ID

20240519-aarch64-be-v1-3-75cc328eddfa@flygoat.com

State

Changes Requested

Delegated to:

Tom Rini

Headers

Feedback-ID: ifd894703:Fastmail
From: Jiaxun Yang <jiaxun.yang@flygoat.com>
Date: Sun, 19 May 2024 13:56:48 +0100
Subject: [PATCH 03/13] arm: Fix assembler.h for arm64
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240519-aarch64-be-v1-3-75cc328eddfa@flygoat.com>
References: <20240519-aarch64-be-v1-0-75cc328eddfa@flygoat.com>
In-Reply-To: <20240519-aarch64-be-v1-0-75cc328eddfa@flygoat.com>
To: u-boot@lists.denx.de, uboot-snps-arc@synopsys.com
Cc: Tom Rini <trini@konsulko.com>,
 Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>,
 Heinrich Schuchardt <xypron.glpk@gmx.de>,
 Ilias Apalodimas <ilias.apalodimas@linaro.org>,
 Daniel Schwierzeck <daniel.schwierzeck@gmail.com>,
 Ezequiel Garcia <ezequiel@collabora.com>,
 Gregory CLEMENT <gregory.clement@bootlin.com>,
 Lars Povlsen <lars.povlsen@microchip.com>,
 Horatiu Vultur <horatiu.vultur@microchip.com>,
 Alexey Brodkin <alexey.brodkin@synopsys.com>,
 Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Michael Trimarchi <michael@amarulasolutions.com>,
 Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>,
 Jiaxun Yang <jiaxun.yang@flygoat.com>
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

Arm64 big endian enablement | expand

Commit Message

Jiaxun Yang May 19, 2024, 12:56 p.m. UTC

Header guard is missing, and ret macro is not relevant for
arm64.

Both fixed.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 arch/arm/include/asm/assembler.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 4fda483b8d8d..c3b8f34dd0af 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -14,6 +14,9 @@ 
  *  assembler source.
  */
 
+#ifndef __ASM_ARM_ASSEMBLER_H
+#define __ASM_ARM_ASSEMBLER_H
+
 #include <asm/unified.h>
 
 /*
@@ -56,6 +59,7 @@ 
 #define PLD(code...)
 #endif
 
+#if !defined(__aarch64__)
 /*
  * Use 'bx lr' everywhere except ARMv4 (without 'T') where only 'mov pc, lr'
  * works
@@ -75,6 +79,7 @@ 
 #endif
 	.endm
 	.endr
+#endif
 
 /*
  * Cache aligned, used for optimized memcpy/memset
@@ -87,3 +92,5 @@ 
 #else
 #define CALGN(code...) code
 #endif
+
+#endif

[03/13] arm: Fix assembler.h for arm64

Commit Message

Patch