On 2/15/25 04:22, Simon Glass wrote:
The EFI app uses different startup and relocation code and the existing
code uses symbols not present in the app. Drop it.
Shouldn't this be squashed into patch 18 ("efi: arm: Omit the ARM
start-up code in the EFI app")?
Signed-off-by: Simon Glass <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
---
(no changes since v1)
arch/arm/cpu/armv8/Makefile | 2 ++
arch/arm/lib/Makefile | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile
index 7bd6cf21b19..a8f5de58cc4 100644
--- a/arch/arm/cpu/armv8/Makefile
+++ b/arch/arm/cpu/armv8/Makefile
@@ -3,7 +3,9 @@
# (C) Copyright 2000-2003
# Wolfgang Denk, DENX Software Engineering, [email protected].
+ifndef CONFIG_EFI_APP
extra-y := start.o
+endif
obj-y += cpu.o
ifndef CONFIG_$(PHASE_)TIMER
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 9500ba6fddc..a41566c816d 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -24,11 +24,13 @@ endif # ARM64
endif # CONFIG_EFI_APP
ifndef CONFIG_XPL_BUILD
+ifndef CONFIG_EFI_APP
ifdef CONFIG_ARM64
obj-y += relocate_64.o
else
obj-y += relocate.o
-endif
+endif # ARM64
+endif # EFI_APP
obj-$(CONFIG_CPU_V7M) += cmd_boot.o
obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
--
Caleb (they/them)
