From patchwork Fri Mar 22 09:58:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 1061029 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="GvqXKk1M"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44QfHv2dPXz9sRV for ; Fri, 22 Mar 2019 20:58:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4B83C22E20; Fri, 22 Mar 2019 09:58:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id snp2y09qCXn8; Fri, 22 Mar 2019 09:58:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2185D22FB9; Fri, 22 Mar 2019 09:58:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 941291BF968 for ; Fri, 22 Mar 2019 09:58:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 90CC022E20 for ; Fri, 22 Mar 2019 09:58:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YcPwVmyXSf1y for ; Fri, 22 Mar 2019 09:58:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by silver.osuosl.org (Postfix) with ESMTPS id 6CF9B2288E for ; Fri, 22 Mar 2019 09:58:41 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id y197so1518289wmd.0 for ; Fri, 22 Mar 2019 02:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Mq6GvA7KkBc97puE+XFAwzQEify2GBwr/dQCQnew900=; b=GvqXKk1MNj4b+X1gJD1kmCw245X+nttWzG88clBwGbstb4AjPzyPIKKKyRn8Rdxhq8 B5GIpMc+u/wIrz3+GVpTjIeaUsUA1+k/JfsTQq/r4vlpUdwtD+Ypnj5dpUxiM/K6d9fO x1t1N8OQNR3BBcY1R5nQvcRav5o5p5+fLNjpQnOJ3+Kp7t1XLRv+if9U+iAKu7vL43Cf DFKLKU9MlQw6Kom3ah6F32OWWuP/ZPwWcXvdM7anzU/QhjpMMbwsMVNKXnhbMA3RhOrh 4qboaeCvJYX6xHPV8s30O4Ctxml8l+HJ9zv31S+qBs1+jtp+GGh9H29B3n0WTd0cl+Xr /dug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Mq6GvA7KkBc97puE+XFAwzQEify2GBwr/dQCQnew900=; b=k5b8dIpk+vjG831m6otvCD3M4PjPMaw/C96/Eo0gWOM4HQARW5ewhw4/bCI+E7iLuA o2E0WDVpy0mGUP151mtr2Wb99+BqHoGLDqkDnLPB+It4EHDLzjMWyogf8QStUi7KnrDP 89GHkcf71gAs+W6qDbJZJiTZMKqAQQnT41mCVXqzwKp6biCHY84h8hRjvJFrVNKuC/zr iVFbJayTsEI4qX353hLqEqE2mIOqC5w96SMl+j0dr/ufUprYuKb4hdGf/Lknn5fhBge/ huVwXWtBHHz+CUIjK/n8lIMUyHwxpP6K4gIGK3EgU0vrf69ckI+eLOq3gbqmvagXTD/d lvbg== X-Gm-Message-State: APjAAAU/bIm+ZZONbE2As/v5i8GT90Em//T6cv4vvpvze+xhZWYa8r3v slnQ5Py7s4r783GCSwGnqvyeNVymAKs= X-Google-Smtp-Source: APXvYqwwnKd8nECL2wEZeLVmskjvjjTYDLCWGUib4dccaBSIB/CVoq0r5/AWNxbTnCC29jSvF1oZeA== X-Received: by 2002:a1c:2d91:: with SMTP id t139mr2550935wmt.102.1553248719891; Fri, 22 Mar 2019 02:58:39 -0700 (PDT) Received: from lmecxl0524.st.com ([80.215.109.31]) by smtp.gmail.com with ESMTPSA id t69sm12165646wmt.16.2019.03.22.02.58.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 02:58:39 -0700 (PDT) From: Etienne Carriere To: buildroot@buildroot.org Date: Fri, 22 Mar 2019 10:58:15 +0100 Message-Id: <20190322095818.19914-1-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH v3 1/4] boot/arm-trusted-firmware: support alternate image files X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Etienne Carriere , Ricardo Martincoski , Sergey Matyukevich MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Some platform may generate specific boot image files instead of the generic files *.bin when building TF-A package. This change introduces new configuration directive for the arm-trusted-firmware boot package. BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES is boolean. When disabled, install boot image files are .../*.bin. When enabled, BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGE_NAMES shall lists the names of the generated boot image files. Signed-off-by: Etienne Carriere --- Changes v2 -> v3: - Replace BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES and BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGE_NAMES with unique config BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGE_NAMES. Changes v1 -> v2: - No change --- boot/arm-trusted-firmware/Config.in | 7 +++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index beb95fbf06..f4ed430aec 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -124,6 +124,13 @@ 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. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGE_NAMES + string "Image names" + default "*.bin" + help + File names of the generated boot images to be copied to + output directory images/. + 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 9a23e3d336..c3625cd986 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -136,6 +136,12 @@ define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF endef endif +define ARM_TRUSTED_FIRMWARE_BL_IMAGES_INSTALL + $(foreach f, $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGE_NAMES)), + echo $(f) && $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/$(f) + ) +endef + define ARM_TRUSTED_FIRMWARE_BUILD_CMDS $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ @@ -144,7 +150,7 @@ define ARM_TRUSTED_FIRMWARE_BUILD_CMDS endef define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS - cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/ + $(ARM_TRUSTED_FIRMWARE_BL_IMAGES_INSTALL) $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL) $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF) endef