From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93102C4338F for ; Thu, 19 Aug 2021 11:22:06 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E70E160F5E for ; Thu, 19 Aug 2021 11:22:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E70E160F5E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4433E831CC; Thu, 19 Aug 2021 13:20:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="LQ4OVYKB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7178F82DF6; Thu, 19 Aug 2021 13:20:19 +0200 (CEST) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5C7DA82F34 for ; Thu, 19 Aug 2021 13:20:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wr1-x432.google.com with SMTP id r7so8631087wrs.0 for ; Thu, 19 Aug 2021 04:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CtMxXMR+X48dwbcLQRkLH8Tfl2GVqaucxUUd956r8Cc=; b=LQ4OVYKB5jK9ikFMOMZ5jgfJ5z2UiZkHDcP6G8xlSvy3bACLOILsmf/v0ZSpEhB9Zn zZuLOZjvX9lgOLnOt7rxZ0Jjv5Ds6Qgs37CyTe+kpMaHWeOoL1Sekbf14aPeKWUQOVUv J/gyz2PxaEuNYw9700HzIRWw20PBa0YwE828xzvE0Mu2DmQP1rjwrIc4O+6SvBNHPyhT C4HK44V4DNytEVClKBNZQU/ZSLsrTIeDWtl6yGn94EZZGK654qZq4PoCvxCZGQFzYHvE 0OHsS1EfeH5OjR7MT695WWScQ2IKdolKbSRdYkN8q58Q+t2ItNS4xBgtsSDFEUwPQCWi RCIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CtMxXMR+X48dwbcLQRkLH8Tfl2GVqaucxUUd956r8Cc=; b=Y26uBxJkDMGNoI6O4LXrNQEApGoIN5gh+J/xOB56gmMzlTnZB0RHfGuR8Rw+Qnqpq+ zbDOc4mwuM+CdL/GMEbxdCYQoB9ovQuxu+YLVPrblW+oatjYGCCbJOme7m1tpALThDKl BYEDPUsYc06IdZn3VTU1wqORyCGVf0Mt5bPeaTQhCTurnZS01Jf6Cr8CBlmW9okRxvw3 Lb7l249lxAwmpt8lNpiEI1LtzjOIWOqXN7w+QTZiwj1R9TMiGfz3XHhr4ZSIPruzJkOt sldxwVj6EOZSTEU99686DX2iavZIXEXI73nNLQdPw2Vajj6CO3a723EPjw84RBSBZtAI lm1g== X-Gm-Message-State: AOAM530ficjrWXONVmSP8jmWc4JUWWw5ORSU/Bg44mqheMulQfRnbOL+ N8mkEul5/a25STD0Qd66r+WPUcREtXn8nNbA X-Google-Smtp-Source: ABdhPJz8mDBmwFN6pZM1RIhmVJWyehJHcTtVEvkC0o6kQKAf2thuLMs2XdIgYnTq3cENrejSOug6UQ== X-Received: by 2002:a5d:5703:: with SMTP id a3mr3199619wrv.333.1629372008617; Thu, 19 Aug 2021 04:20:08 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6:f666:9af6:3fed:e53b]) by smtp.gmail.com with ESMTPSA id t8sm3037695wrx.27.2021.08.19.04.20.07 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Aug 2021 04:20:08 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Michal Simek Subject: [PATCH 09/10] xilinx: zynqmp: Generate different u-boot.itb for MULTI_DTB_FIT Date: Thu, 19 Aug 2021 13:19:48 +0200 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.103.2 at phobos.denx.de X-Virus-Status: Clean When MULTI_DTB_FIT is enabled fit-dtb.blob fit image is created which contain all DTBs listed by CONFIG_OF_LIST. And with DTB_RELESELECT there is a need to handle it as one file with DTBs in it not as separate DTBs in u-boot.its/itb. That's why extend mkimage_fit_atf.sh to generate u-boot.itb correctly. Signed-off-by: Michal Simek --- arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 47 +++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh index 592be7f67066..37106909f1ee 100755 --- a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh +++ b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh @@ -111,6 +111,51 @@ cat << __TEE __TEE fi +MULTI_DTB=`awk '/CONFIG_MULTI_DTB_FIT / { print $3 }' include/generated/autoconf.h` + +if [ $MULTI_DTB -eq 1 ]; then + cat << __FDT_IMAGE_EOF + fdt_1 { + description = "Multi DTB fit image"; + data = /incbin/("fit-dtb.blob"); + type = "flat_dt"; + arch = "arm64"; + compression = "none"; + $DTB_LOAD + hash { + algo = "md5"; + }; + }; + }; + configurations { + default = "config_1"; +__FDT_IMAGE_EOF + +if [ ! -f $BL31 ]; then +cat << __CONF_SECTION1_EOF + config_1 { + description = "Multi DTB without TF-A"; + firmware = "uboot"; + loadables = "fdt_1"; + }; +__CONF_SECTION1_EOF +else +cat << __CONF_SECTION1_EOF + config_1 { + description = "Multi DTB with TF-A"; + firmware = "atf"; + loadables = "uboot", "fdt_1"; + }; +__CONF_SECTION1_EOF +fi + +cat << __ITS_EOF + }; +}; +__ITS_EOF + +else + DEFAULT=1 cnt=1 for dtname in $DT @@ -181,3 +226,5 @@ cat << __ITS_EOF }; }; __ITS_EOF + +fi -- 2.32.0