From: Tom Rini <trini@konsulko.com>
Date: Thu, 6 Nov 2025 17:32:57 +0000 (-0600)
Subject: Merge patch series "ARM: bootm: Add support for starting Linux through OPTEE-OS on... 
X-Git-Tag: v2026.01-rc2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad9240cb9df25fa9059c32dea7b4d739525e76f2;p=pandora-u-boot.git

Merge patch series "ARM: bootm: Add support for starting Linux through OPTEE-OS on ARMv7a"

This series from Marek Vasut <marek.vasut@mailbox.org> brings some
enhancements to use cases using OPTEE-OS on ARMv7a platforms, some of
which already existed on ARMv8.

Link: https://lore.kernel.org/r/20251030212359.12824-1-marek.vasut@mailbox.org
---

ad9240cb9df25fa9059c32dea7b4d739525e76f2
diff --cc arch/arm/lib/Makefile
index 05263eadad0,92149d7058c..11cb3a7145e
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@@ -34,11 -30,20 +34,14 @@@ endi
  
  obj-$(CONFIG_CPU_V7M) += cmd_boot.o
  obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
 -obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
  obj-$(CONFIG_CMD_BOOTM) += bootm.o
 -obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o
  else
  obj-$(CONFIG_$(PHASE_)FRAMEWORK) += spl.o
 -ifdef CONFIG_SPL_FRAMEWORK
 -obj-$(CONFIG_CMD_BOOTI) += image.o
 -obj-$(CONFIG_CMD_BOOTZ) += zimage.o
 -endif
  obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
  endif
+ ifndef CONFIG_ARM64
+ obj-$(CONFIG_BOOTM_OPTEE) += bootm-optee.o
+ endif
  ifdef CONFIG_ARM64
  obj-$(CONFIG_$(PHASE_)USE_ARCH_MEMSET) += memset-arm64.o
  obj-$(CONFIG_$(PHASE_)USE_ARCH_MEMCPY) += memcpy-arm64.o