All of lore.kernel.org
 help / color / mirror / Atom feed
From: Changming Huang <jerry.huang@nxp.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 05/10] boot/arm-trusted-firmware: Add option BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE
Date: Thu, 21 Nov 2019 18:23:19 +0800	[thread overview]
Message-ID: <20191121102324.35225-6-jerry.huang@nxp.com> (raw)
In-Reply-To: <20191121102324.35225-1-jerry.huang@nxp.com>

From: Jerry Huang <jerry.huang@nxp.com>

Add option BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE to define the U-Boot BIN.
The default setting is u-boot.bin, customer can change it to anything via defconfig.

Signed-off-by: Jerry Huang <jerry.huang@nxp.com>
---
changes since v1:
1. add BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE for uboot binary file
2. default of new option is u-boot.bin.
3. use the new option for U-Boot BL33
---
 boot/arm-trusted-firmware/Config.in               | 12 ++++++++++++
 boot/arm-trusted-firmware/arm-trusted-firmware.mk |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
index 78c03019d5..3e83590776 100644
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -124,6 +124,18 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33
 	  gets built before ATF, and that the appropriate BL33
 	  variable pointing to u-boot.bin is passed when building ATF.
 
+if BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33
+
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE
+	string "U-Boot BL33 Image for ATF"
+	default "u-boot.bin"
+	help
+	  The U-Boot BL33 image for ATF, u-boot.bin is the default setting,
+	  this setting can be changed to any U-Boot binary file that used,
+	  for example, u-boot-dtb.bin.
+
+endif
+
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES
 	string "Additional ATF build variables"
 	help
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index e528686aa1..2133d39e6d 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -70,7 +70,8 @@ endif
 endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE
 
 ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y)
-ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/u-boot.bin
+ARM_TRUSTED_FIRMWARE_UBOOT_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE))
+ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_UBOOT_BIN)
 ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot
 endif
 
-- 
2.17.1

  parent reply	other threads:[~2019-11-21 10:23 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-21 10:23 [Buildroot] [PATCH v2 0/9] new board ls1028ardb introduced Changming Huang
2019-11-21 10:23 ` [Buildroot] [PATCH v2 01/10] package/freescale-qoriq: new package directory Changming Huang
2019-11-25 21:13   ` Thomas Petazzoni
2019-11-26  2:49     ` [Buildroot] [EXT] " Jerry Huang
2019-11-21 10:23 ` [Buildroot] [PATCH v2 02/10] package/freescale-qoriq/fsl-qoriq-rcw: move rcw into freescale-qoriq and rename it Changming Huang
2019-11-21 10:34   ` Michael Walle
2019-11-21 10:42     ` [Buildroot] [EXT] " Jerry Huang
2019-11-25 21:15   ` [Buildroot] " Thomas Petazzoni
2019-11-26  3:25     ` [Buildroot] [EXT] " Jerry Huang
2019-11-21 10:23 ` [Buildroot] [PATCH v2 03/10] package/freescale-qoriq/fsl-qoriq-rcw: upgrade the rcw version to LSDK-19.09 Changming Huang
2019-11-25 21:17   ` Thomas Petazzoni
2019-11-26  3:51     ` [Buildroot] [EXT] " Jerry Huang
2019-11-21 10:23 ` [Buildroot] [PATCH v2 04/10] package/freescale-qoriq/fsl-qoriq-rcw: add target rcw binary support Changming Huang
2019-11-25 21:23   ` Thomas Petazzoni
2019-11-26  4:33     ` [Buildroot] [EXT] " Jerry Huang
2019-11-21 10:23 ` Changming Huang [this message]
2019-11-22  9:11   ` [Buildroot] [PATCH v2 05/10] boot/arm-trusted-firmware: Add option BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE Sergey Matyukevich
2019-11-22  9:24     ` [Buildroot] [EXT] " Jerry Huang
2019-11-25 21:59   ` [Buildroot] " Thomas Petazzoni
2019-11-21 10:23 ` [Buildroot] [PATCH v2 06/10] boot/arm-trusted-firmware: Add RCW support Changming Huang
2019-11-22  9:19   ` Sergey Matyukevich
2019-11-22  9:31     ` [Buildroot] [EXT] " Jerry Huang
2019-11-25 22:09   ` [Buildroot] " Thomas Petazzoni
2019-11-26  7:06     ` [Buildroot] [EXT] " Jerry Huang
2019-11-26  7:34       ` Jerry Huang
2019-11-21 10:23 ` [Buildroot] [PATCH v2 07/10] package/freescale-qoriq/fsl-qoriq-cadence-dp-fw: new package Changming Huang
2019-11-21 10:42   ` Michael Walle
2019-11-21 11:04     ` [Buildroot] [EXT] " Jerry Huang
2019-11-22 10:41     ` Jerry Huang
2019-11-21 10:51   ` [Buildroot] " Michael Walle
2019-11-21 11:09     ` [Buildroot] [EXT] " Jerry Huang
2019-11-22 10:40     ` Jerry Huang
2019-11-22 11:00       ` Michael Walle
2019-11-25  2:40         ` Jerry Huang
2019-11-22 11:05       ` Thomas Petazzoni
2019-11-25  6:25         ` Jerry Huang
2019-11-25 22:12   ` [Buildroot] " Thomas Petazzoni
2019-11-26  8:09     ` [Buildroot] [EXT] " Jerry Huang
2019-11-26  9:21       ` Michael Walle
2019-11-26 10:13         ` Jerry Huang
2019-11-26  9:29       ` Michael Walle
2019-11-26 10:12         ` Thomas Petazzoni
2019-11-26 10:31           ` Michael Walle
2019-11-26 12:10             ` Jerry Huang
2019-11-21 10:23 ` [Buildroot] [PATCH v2 08/10] package/freescale-qoriq/fsl-qoriq-rcw:Enable IIC5_PMUX and CLK_OUT_PMUX for GPIO Changming Huang
2019-11-25 22:13   ` Thomas Petazzoni
2019-11-26  8:15     ` [Buildroot] [EXT] " Jerry Huang
2019-11-21 10:23 ` [Buildroot] [PATCH v2 09/10] board/freescale/common/ls: Add standard post image script for Layerscape processors Changming Huang
2019-11-21 10:23 ` [Buildroot] [PATCH v2 10/10] configs/freescale_ls1028ardb*: new board Changming Huang
2019-11-25 22:17   ` Thomas Petazzoni
2019-11-26 12:02     ` [Buildroot] [EXT] " Jerry Huang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191121102324.35225-6-jerry.huang@nxp.com \
    --to=jerry.huang@nxp.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.