From b966e5dc54006c1c9e2ab93c7de38d5d43368b1a Mon Sep 17 00:00:00 2001
From: Ivan Gorinov <ivan.gorinov@intel.com>
Date: Thu, 28 Jun 2018 14:50:04 -0700
Subject: [PATCH] arm: Remove unused _relocate arguments
EFI image handle and system table are not used in _relocate().
Signed-off-by: Ivan Gorinov <ivan.gorinov@intel.com>
---
arch/arm/lib/crt0_aarch64_efi.S | 2 --
arch/arm/lib/crt0_arm_efi.S | 2 --
arch/arm/lib/reloc_aarch64_efi.c | 3 +--
arch/arm/lib/reloc_arm_efi.c | 3 +--
4 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/arm/lib/crt0_aarch64_efi.S b/arch/arm/lib/crt0_aarch64_efi.S
index 5b6c3849f7..0db4360bcf 100644
--- a/arch/arm/lib/crt0_aarch64_efi.S
+++ b/arch/arm/lib/crt0_aarch64_efi.S
@@ -122,8 +122,6 @@ _start:
mov x29, sp
stp x0, x1, [sp, #16]
- mov x2, x0
- mov x3, x1
adr x0, ImageBase
adrp x1, _DYNAMIC
add x1, x1, #:lo12:_DYNAMIC
diff --git a/arch/arm/lib/crt0_arm_efi.S b/arch/arm/lib/crt0_arm_efi.S
index 0f296f3be4..23db49f1fc 100644
--- a/arch/arm/lib/crt0_arm_efi.S
+++ b/arch/arm/lib/crt0_arm_efi.S
@@ -119,8 +119,6 @@ section_table:
_start:
stmfd sp!, {r0-r2, lr}
- mov r2, r0
- mov r3, r1
adr r1, .L_DYNAMIC
ldr r0, [r1]
add r1, r0, r1
diff --git a/arch/arm/lib/reloc_aarch64_efi.c b/arch/arm/lib/reloc_aarch64_efi.c
index 38c13d3689..1aa57dbc80 100644
--- a/arch/arm/lib/reloc_aarch64_efi.c
+++ b/arch/arm/lib/reloc_aarch64_efi.c
@@ -38,8 +38,7 @@
#include <elf.h>
-efi_status_t _relocate(long ldbase, Elf64_Dyn *dyn, efi_handle_t image,
- struct efi_system_table *systab)
+efi_status_t EFIAPI _relocate(long ldbase, Elf64_Dyn *dyn)
{
long relsz = 0, relent = 0;
Elf64_Rela *rel = 0;
diff --git a/arch/arm/lib/reloc_arm_efi.c b/arch/arm/lib/reloc_arm_efi.c
index 6232e3f73e..9103c035c5 100644
--- a/arch/arm/lib/reloc_arm_efi.c
+++ b/arch/arm/lib/reloc_arm_efi.c
@@ -14,8 +14,7 @@
#include <efi.h>
#include <elf.h>
-efi_status_t _relocate(long ldbase, Elf32_Dyn *dyn, efi_handle_t image,
- struct efi_system_table *systab)
+efi_status_t EFIAPI _relocate(long ldbase, Elf32_Dyn *dyn)
{
long relsz = 0, relent = 0;
Elf32_Rel *rel = 0;
--
2.39.5