diff mbox series

[1/1] boot/arm-trusted-firmware: add target board options

Message ID 91ff193c-5e66-b80c-538c-7ebcddd9bd87@ti.com
State Superseded
Headers show
Series [1/1] boot/arm-trusted-firmware: add target board options | expand

Commit Message

Xuanhao Shi July 21, 2022, 8:38 p.m. UTC 
Some platforms such as TI's k3 outputs a TARGET_BOARD directory
in their ATF build output paths after PLATFORM.
$(@D)/build/<PLATFORM>/ does not contain the debug or release
directories for these platforms.
They are under $(@D)/build/<PLATFORM>/<TARGET_BOARD>/

Signed-off-by: Xuanhao Shi <x-shi@ti.com>
---
  boot/arm-trusted-firmware/Config.in               |  5 +++++
  boot/arm-trusted-firmware/arm-trusted-firmware.mk | 13 ++++++++++++-
  2 files changed, 17 insertions(+), 1 deletion(-)

   ARM_TRUSTED_FIRMWARE_MAKE_ENV += \
  	$(TARGET_MAKE_ENV) \

Comments

Thomas Petazzoni July 22, 2022, 7:55 a.m. UTC | #1 
Hello,

On Thu, 21 Jul 2022 15:38:56 -0500
Xuanhao Shi via buildroot <buildroot@buildroot.org> wrote:

> Some platforms such as TI's k3 outputs a TARGET_BOARD directory
> in their ATF build output paths after PLATFORM.
> $(@D)/build/<PLATFORM>/ does not contain the debug or release
> directories for these platforms.
> They are under $(@D)/build/<PLATFORM>/<TARGET_BOARD>/
> 
> Signed-off-by: Xuanhao Shi <x-shi@ti.com>

Thanks for your patch. Could you resend it with "git send-email"?
Indeed, your e-mail client has mangled the patch, so it cannot be
applied.

Thanks!

Thomas
diff mbox series

Patch

diff --git a/boot/arm-trusted-firmware/Config.in 
b/boot/arm-trusted-firmware/Config.in
index b1fc03e10b..a9354522b5 100644
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -68,6 +68,11 @@  config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM
  	help
  	  Target plaform to build for.
  +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD
+	string "ATF target board"
+	help
+	  Target board to build for.
+
  config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH
  	string "Device Tree Source file paths"
  	help
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk 
b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index 998de4b814..30ecb187ae 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -41,18 +41,29 @@  endif
   ARM_TRUSTED_FIRMWARE_PLATFORM = $(call 
qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM))
  +ARM_TRUSTED_FIRMWARE_TARGET_BOARD = $(call 
qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD))
+
  ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y)
  ARM_TRUSTED_FIRMWARE_MAKE_OPTS += DEBUG=1
+ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),)
+ARM_TRUSTED_FIRMWARE_IMG_DIR = 
$(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/debug
+else
  ARM_TRUSTED_FIRMWARE_IMG_DIR = 
$(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/debug
+endif
+else
+ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),)
+ARM_TRUSTED_FIRMWARE_IMG_DIR = 
$(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/release
  else
  ARM_TRUSTED_FIRMWARE_IMG_DIR = 
$(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release
  endif
+endif
   ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \
  	CROSS_COMPILE="$(TARGET_CROSS)" \
  	$(if $(BR2_PIC_PIE),CFLAGS="-fno-PIE") \
  	$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \
-	PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM)
+	PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \
+	TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)