From patchwork Mon May 4 12:38:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 1282571 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=web.de header.i=@web.de header.a=rsa-sha256 header.s=dbaedf251592 header.b=VSk4OvnV; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49G2Wz5V9Hz9sSc for ; Mon, 4 May 2020 22:40:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0D1CF81FAE; Mon, 4 May 2020 14:38:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="VSk4OvnV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9982C81F91; Mon, 4 May 2020 14:38:50 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.web.de (mout.web.de [212.227.15.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 66C0B81F7E for ; Mon, 4 May 2020 14:38:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jan.kiszka@web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1588595924; bh=t8zuE4jjXGGOGH62L1vi5zB4cjUeETxnAgKk43gbj1M=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=VSk4OvnVr/vwtsUdEhqKRRx232q6ADJQ+sirAHMsfh/XDmQyqsj8HFgJC+1hcUr4m fusRdXfu+r+fqQ23G9L1z1GoEXShmxDW3E9Ed22fXT8AJTbQA8OFLUzw7xu9vJJgfd tBzna/vQt/Cs6JP80tgv2lWNgs6Hz7cEJjqA08cw= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from md1f2u6c.ww002.siemens.net ([95.157.53.180]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LaTpn-1irsJH2orX-00mN3A; Mon, 04 May 2020 14:38:44 +0200 From: Jan Kiszka To: U-Boot Mailing List Cc: "Andrew F . Davis" Subject: [PATCH 4/4] kbuild: arm: Fix duplicate builds of dtbs Date: Mon, 4 May 2020 14:38:32 +0200 Message-Id: X-Mailer: git-send-email 2.26.1 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:k3+YDc9ZO5MLOZYMnkPd75VjtOzucVOppdmQi5DxhgVtcNJcogu rS6XKL4SE89jTs3O3LkfxLzVcteNqFime215Pi+j2QU5KJDv2GmaneMTX1LkbnKKjd0QfUd ZJMxVYQ2M/cp0bUO+2K370cvsMCTLhB5DT8nVC4gVFqq+CkvSnhrzzCwIg63RMq7cwoZObh Iazp3YqrNLVoXeA7IzP/A== X-UI-Out-Filterresults: notjunk:1;V03:K0:g8inw2Y0UGo=:QZTDbQ7bmrvy/cF/5fYihC go7C5OUqKCBCUuf7Q6rehrqZ8NNIJFjqFSRunbvsBbV2feeqN/NGRM1Qh+zIM4fqMwz+kirGR dHo9C7UwhHPmVZAApewS+kRq4pXa8Jsc7OFjyZrUZolTjlS/0qK7QspHm7lBInBkGUA59d0MD RRVSEt1itInf7B5rNQn7j3yc95JNd2lJN+UmTt1L7qx3pEgNlrIU6jKjnECVRUqRIw/yv40AG J7mwgCmfrPB2w+IExRL25nyv4ibRXKeqx4RzWjEfW13aW/wxAsm1N3b//n+hf/Faro+J7iPbK MJXWfzaiF7fr3CsVPZMJJjbDgF+vG8aBw2kCHySm+FnYUpyQDBZWBEzBF4NMBf/TL2JuBxPr0 Q7bNUATre6EXvoOxlKX1fgipQ5P/5ErG6IXVE8g3oz8rFBz3UGzNkGYfLn+Ip4zBB8dvxN6IT NdasUnqBqzwkjHScYiX1mIK6HSPKFcfsEIRpPc3Rh6BGTyuGgF3WBhkL9cyXOWIDeyw8O086J +p/mQPs/8rNayKhlpi3buj+/9hpMJQMNzP2QB0w8YNLEHD2Jm3atzRIadJkNCdHGeBNegXr6g UNy6b3xiv4hNA/7NdMkBVLnn6r5lWXmrH6ig9B7nWB8jcJ6u7qJJE2fkNVlCc3UO8kw5gt14U ZqBH82QRBlLiGorYnY4/rDKAmSyoKmjayvvXn6poRxvNO3BrD+UmfQXGzGNTEc7G5xmG26T0o IpeqqzQk/YVBjuEFVQUzPQ/9XLGvz6NK/HeydGLVduUj7auVCwLflLYgOhDHmkUBzQ3Cbe4Zm P4MJfbeBVXh6/duVNFh6Ih+HIyuuBVA5OhaXy5MnRp2SNCQvxP5QIGEM63E0t8l8+Lrkg//Ws YnLuZszUKSGVzbyivfsmKgxh1xjqSGaZS4CGq7bK0dlgQopQAfj6cczG/YP1Rsq5JRt+fS++M K5Bb4QZYyHMqVXpHYPLjXsW/H3ewmTy95fC3igmq5pHmNruhThjxR2ffbnaCM9fw9oNgATMl6 SRSlSvyDYAwRrDcrreL7UC1OGFYJtxfcEdryWKQp93y6LWyKXDlK+4IZbpJJ6Th+cQCsv5Sg7 K3KMunuhTkeGHrIABqWosqKU6VQ9p5FI1EN4wE1sT9q4Zl+u8x5knyxHZn5AVRmEKFsjW56rj pfoNIFsZree8FVfD51kOuVT9n2djyMfX9LIoSkyZ44xNszOiqrZfVOhLZfDg51HwqEHy6sP7A H2iBzSLGdlFINconQ X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Jan Kiszka Build the secured board dtbs (.dtb_HS) as part of the regular dtb build on CONFIG_TI_SECURE_DEVICE targets. This avoids rebuilding them, possibly overwriting artifacts that are in use, as it is done so far. In the same run, fix needless rebuilding of the secured spl dtb. Fixes: 508369672ca3 ("arm: mach-k3: Add secure device build support") CC: Andrew F. Davis Signed-off-by: Jan Kiszka --- arch/arm/dts/Makefile | 6 ++++-- arch/arm/mach-k3/config_secure.mk | 19 ++++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) -- 2.26.1 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 2c123bd6da..b68e9c0726 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ +include $(srctree)/arch/arm/mach-k3/config_secure.mk + dtb-$(CONFIG_TARGET_SMARTWEB) += at91sam9260-smartweb.dtb dtb-$(CONFIG_TARGET_TAURUS) += at91sam9g20-taurus.dtb dtb-$(CONFIG_TARGET_CORVUS) += at91sam9g45-corvus.dtb @@ -927,13 +929,13 @@ dtb-$(CONFIG_TARGET_DURIAN) += phytium-durian.dtb dtb-$(CONFIG_TARGET_PRESIDIO_ASIC) += ca-presidio-engboard.dtb -targets += $(dtb-y) +targets += $(dtb-y) $(TI_SECURE_DTBS) # Add any required device tree compiler flags here DTC_FLAGS += PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) +dtbs: $(addprefix $(obj)/, $(dtb-y) $(TI_SECURE_DTBS)) @: clean-files := *.dtb *.dtbo *_HS diff --git a/arch/arm/mach-k3/config_secure.mk b/arch/arm/mach-k3/config_secure.mk index 6d63c57665..d9141e10a0 100644 --- a/arch/arm/mach-k3/config_secure.mk +++ b/arch/arm/mach-k3/config_secure.mk @@ -26,7 +26,12 @@ endif $(obj)/u-boot-spl-nodtb.bin_HS: $(obj)/u-boot-spl-nodtb.bin FORCE $(call if_changed,k3secureimg) -tispl.bin_HS: $(obj)/u-boot-spl-nodtb.bin_HS $(patsubst %,$(obj)/dts/%.dtb_HS,$(subst ",,$(CONFIG_SPL_OF_LIST))) $(SPL_ITS) FORCE +SPL_OF_LIST_TARGETS = $(patsubst %,dts/%.dtb,$(subst ",,$(CONFIG_SPL_OF_LIST))) +SPL_OF_LIST_TARGETS_HS = $(addsuffix _HS,$(SPL_OF_LIST_TARGETS)) + +targets += $(SPL_OF_LIST_TARGETS) $(SPL_OF_LIST_TARGETS_HS) + +tispl.bin_HS: $(obj)/u-boot-spl-nodtb.bin_HS $(addprefix $(obj)/,$(SPL_OF_LIST_TARGETS_HS)) $(SPL_ITS) FORCE $(call if_changed,mkfitimage) MKIMAGEFLAGS_u-boot.img_HS = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ @@ -34,11 +39,15 @@ MKIMAGEFLAGS_u-boot.img_HS = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb_HS,$(subst ",,$(CONFIG_OF_LIST))) -OF_LIST_TARGETS = $(patsubst %,arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) -$(OF_LIST_TARGETS): dtbs - u-boot-nodtb.bin_HS: u-boot-nodtb.bin FORCE $(call if_changed,k3secureimg) -u-boot.img_HS: u-boot-nodtb.bin_HS u-boot.img $(patsubst %.dtb,%.dtb_HS,$(OF_LIST_TARGETS)) FORCE +u-boot.img_HS: u-boot-nodtb.bin_HS u-boot.img dtbs FORCE $(call if_changed,mkimage) + +# Used when included by arch-dts makefile +-include include/config/auto.conf + +ifeq ($(CONFIG_TI_SECURE_DEVICE),y) +TI_SECURE_DTBS = $(addsuffix _HS, $(dtb-y)) +endif