From patchwork Mon May 10 12:23:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476352 X-Patchwork-Delegate: uboot@andestech.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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Q7LFDHHC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Ff0bY1kgqz9rx6 for ; Mon, 10 May 2021 22:24:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 15E7782EC3; Mon, 10 May 2021 14:23:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q7LFDHHC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BC68682EB6; Mon, 10 May 2021 14:23:54 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) (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 EE10482B0B for ; Mon, 10 May 2021 14:23:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pf1-x42b.google.com with SMTP id b21so6384980pft.10 for ; Mon, 10 May 2021 05:23:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OuUiBRN+crsVMKbmMEWQDycsZ3WG+lAg6osNJIaQY/k=; b=Q7LFDHHCJALPy1ovjWRpv97AShLUsrlXJwaqeoamn7AUQmA/5GhBbWULDDsjqju1+M VRsmlzMqtkqQVIl+3S+PMQ49a2vof5xiZ8PFVxEcfJXtjOI4NpFAco4xaAFi2i6ivEOP ScEZW+Iq84/MW5ks72Z3DfLOvhRWlivvAb6GN4kWEpyXPCUe3TavTZFDG882uKi8vyy+ UqV0fODaOYcAkqSWbuMTasSVL8Bu1EnbrTUKM9g00lYPhwDlOckzY3gkkh9t6x0ququh eg8rRZe79VVWcJdgSPDnqvE82h+RhXI3m1KuT8JN3hJUr6zHXkMNeudMMbhVBUpWpjKJ iGOA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=OuUiBRN+crsVMKbmMEWQDycsZ3WG+lAg6osNJIaQY/k=; b=NjL1U/YwLi76NGRtLs4Qsvx12OLkiwEmKa5hj+M/ZxdUeS5zTy4Q0/ikgwUcI2TRHz czd7h43xFbgmyAeMOSovi8UvKBWDXyJIy5oFvRbbx4T+VvmmTu+n+uJmuOall9lvizUZ ROdI0QQjXNoyvxb5nLRx+HGvSE8IKyLElwrxlDjDLjYnIr0s4O5Nc/IJi4bOwich5Fyc sQBxQ+wnz77pmIJZ8h50bvRfSpBPRhAJ5+H4M24Kt0Vp/NkY1428taQi2Sp9z7rp0MYv knQxtAih2sBgS5eeDCX/umvCU2XpD5pQzfj2b/WxNw8pS1CePxs88Q/qI2Oo0QBVO+Mo +icQ== X-Gm-Message-State: AOAM532B6TJWIj/PMVt3QMrSi2AGZgUfAulb2AMS5WKXfty4OqfGDc3d woigEw3KOhIzP0OhCu4p1x3zTE05QS4= X-Google-Smtp-Source: ABdhPJw5AFiWVFJSROamrAgAbrQHhrmyzyh0WRk4+ziczkVPZzdhn13vIL7ZYvXRhRbd+3Wl+JU9mA== X-Received: by 2002:a05:6a00:b8f:b029:2c7:2883:235b with SMTP id g15-20020a056a000b8fb02902c72883235bmr95668pfj.5.1620649430561; Mon, 10 May 2021 05:23:50 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.23.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:23:50 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 01/13] common: kconfig: Correct a typo in SPL_LOAD_FIT Date: Mon, 10 May 2021 20:23:29 +0800 Message-Id: <20210510122341.13798-2-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean It should be FDT, not FTD. Signed-off-by: Bin Meng Reviewed-by: Simon Glass Reviewed-by: Rick Chen --- (no changes since v1) common/Kconfig.boot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/Kconfig.boot b/common/Kconfig.boot index 5a18d62d78..94d82c27dd 100644 --- a/common/Kconfig.boot +++ b/common/Kconfig.boot @@ -204,7 +204,7 @@ config SPL_LOAD_FIT This path has the following limitations: - 1. "loadables" images, other than FTDs, which do not have a "load" + 1. "loadables" images, other than FDTs, which do not have a "load" property will not be loaded. This limitation also applies to FPGA images with the correct "compatible" string. 2. For FPGA images, only the "compatible" = "u-boot,fpga-legacy" From patchwork Mon May 10 12:23:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476353 X-Patchwork-Delegate: uboot@andestech.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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=vfbeOHNx; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Ff0bl1rqlz9rx6 for ; Mon, 10 May 2021 22:24:19 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E6C9582ECA; Mon, 10 May 2021 14:23:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vfbeOHNx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 26CC682EC1; Mon, 10 May 2021 14:23:57 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) (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 214EF82AC4 for ; Mon, 10 May 2021 14:23:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pf1-x431.google.com with SMTP id x188so13478127pfd.7 for ; Mon, 10 May 2021 05:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lp3oxiRf9uV8Rm6hdVl6kUx83ootqYE5aMlyrAgrVZ8=; b=vfbeOHNxH3qszUfQ1wOcL58dTXJpDLQBUHvY1kc2ZmD/zwQFIff/RtBt64o2ne7OQ4 C8H6t0GZ9Pbcvg9FrFiDJymmM+Gn7A7DOBxYMhoVRDgSoP1Bc3pGqkndmtpt9ubXWso7 /irx7bXLgOLD3p7TksHIwZv42shlpfss2HcQMvdYcYI8P+ay7Nr5hUiJygJFLMaxFWri mPzXwf0Dwonrb2Q0j5kOlqbKVLnjKmeJArOPa1At04jb8Zlb5HX0EISRcxsv3zoU5bAi F6VMzwMZwmn1AhBAAqMYrtADYFJCiXoXo0OENS7eHgIjQjwtB1+c6nru7T6CUo1Mwn9q NFBg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lp3oxiRf9uV8Rm6hdVl6kUx83ootqYE5aMlyrAgrVZ8=; b=Psw+Mc7bPu8Wt6JmNGrP66TH8fABoa+YTpnSP+TVWv2ETnXNOtGqPnjit2j5I8jG8C PF6lls0CVkC5dS028eM2x+Zk7vRNELgq1Y4uPgGUYtTDwBv+b3xnQlj9G8CfchaXuml7 SnxYUBzgCDI1YNvWQHOCwU1pYEWbs/14J+tJSniR4LTJd8l2q830OwTntLxx57oG7RNZ n3tP4aeMTamVMYZTlQ7XSwydB3sXd7uKgGkwHTtd0TJm1Pk1InA9YYIaB5XVBAK2/is7 XBkCwCM9nEZJ8g820JOIIbag76ZuU1zVD5b3Pq5EIoZyd9CabyUuE85IbFH2lVCzE98F khYw== X-Gm-Message-State: AOAM530apG0r4/t4SenMmUHqJTyrMzLNt/RGaQaB9yrhR2ng3bLQjjFs 9KsIa+ocqVut1c0pixeDf+4= X-Google-Smtp-Source: ABdhPJxGKPJkiozsZuPtZOqyQdXc2pwT/BkN2NFc6evGVDnM+RC/obuB9bAaauyrGtZM2+RjtyA5Gg== X-Received: by 2002:aa7:9313:0:b029:2c5:7e1c:2c77 with SMTP id 19-20020aa793130000b02902c57e1c2c77mr1625402pfj.73.1620649432697; Mon, 10 May 2021 05:23:52 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.23.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:23:52 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 02/13] binman: Correct '-a' description in the doc Date: Mon, 10 May 2021 20:23:30 +0800 Message-Id: <20210510122341.13798-3-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean It needs a space around '-a'. Signed-off-by: Bin Meng Reviewed-by: Simon Glass Reviewed-by: Rick Chen --- (no changes since v1) tools/binman/binman.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index 1aa2459d50..b3df3a6428 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -322,9 +322,9 @@ Sometimes it is useful to pass binman the value of an entry property from the command line. For example some entries need access to files and it is not always convenient to put these filenames in the image definition (device tree). -The-a option supports this:: +The -a option supports this:: - -a= + -a = where:: From patchwork Mon May 10 12:23:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476354 X-Patchwork-Delegate: uboot@andestech.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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=GGL4SpuK; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Ff0by1tCSz9rx6 for ; Mon, 10 May 2021 22:24:29 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 04F8C82ED2; Mon, 10 May 2021 14:24:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GGL4SpuK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 62EFF82ECE; Mon, 10 May 2021 14:23:59 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) (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 36C6782EB9 for ; Mon, 10 May 2021 14:23:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pg1-x533.google.com with SMTP id q15so8923303pgg.12 for ; Mon, 10 May 2021 05:23:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cUPKSLc9IsShD04D5TS5mvutNZWVuK0wQ6efMlOulGM=; b=GGL4SpuKPjJogS4Eg2k2v1F6sj9sd+4d8htqSGbLNXqlZP3h+q0CW4+JATuV3h+tWw LGNHGKDRqr5vAjhWj0TwNhlgEhL2Tqzx0qWdd6Dj+4p76zXke+Lnk0EEEEAejE9G44KQ EvULYj5zObyx0sdkfRV7QkX+Kp19AtrFmJYg3Ta1MLKlo0iguMOqanzEAhbIpEplsJ5p UGlVaFDjx3QP5M9TiRKzUkJjwQStbev4ntJbNjA3FWOWJujtseELCubTrup/JUX1OtyU 0fQyU+pxNa5W1sLEdKWA7iXwfzZfFJo3b9eeVqTFS1/axB3YmOtP4HUnozMiRxL6SU/E JtCg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=cUPKSLc9IsShD04D5TS5mvutNZWVuK0wQ6efMlOulGM=; b=WK6yzFSC41A88l6ol4sg3XN2beUoDzic+uzMWdZGrmKXNWFKOb+/GotlYpfJhhYed+ +AvGiWZThKY+G3st/FVwkzFejgLQAshhQZUCC8cF5zMinwbRyHkmPdcyalQqmroj4Ncd KCWNTooGJEYH1XAUK3o07Z9v5rPVxx9mLCRJiZJ9CqqTWShNxJfzKAbXATMLo8vUq/AU +2atUbUhwJrqh67RPz0i8YlJTEhiu5GNk/ANuqkXcLC5IGmi+HA0PnWQCgNg31JSrDSX sSVeng4NX+Tkxw4XmX5D6SXWGuQBxxcjf2A8M1E34qM55qTiigySwtJBS3RO5STXrN6B 3wFA== X-Gm-Message-State: AOAM532oidjZutd/MHk3oWHmP9tfeBsJAR5vp0Qh1AKS0gWPOD9rn9WX lbeG7xGMeW8pPNr40lnpeNk= X-Google-Smtp-Source: ABdhPJwfxtKveqF74mrJRkbXACaLE+ipL0T3KB7j5tKcAvuu/xXhNubJXVy+ki3DBrjWfWbEEbCLDw== X-Received: by 2002:a63:4c66:: with SMTP id m38mr24908469pgl.157.1620649434865; Mon, 10 May 2021 05:23:54 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.23.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:23:54 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 03/13] binman: Correct the comment for ATF entry type Date: Mon, 10 May 2021 20:23:31 +0800 Message-Id: <20210510122341.13798-4-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean This is wrongly referring to Intel ME, which should be ATF. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- (no changes since v1) tools/binman/etype/atf_bl31.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/binman/etype/atf_bl31.py b/tools/binman/etype/atf_bl31.py index 163d714184..2041da416c 100644 --- a/tools/binman/etype/atf_bl31.py +++ b/tools/binman/etype/atf_bl31.py @@ -2,7 +2,7 @@ # Copyright 2020 Google LLC # Written by Simon Glass # -# Entry-type module for Intel Management Engine binary blob +# Entry-type module for ARM Trusted Firmware binary blob # from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg From patchwork Mon May 10 12:23:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476355 X-Patchwork-Delegate: uboot@andestech.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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YBr6B54o; 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 4Ff0c9309Dz9rx6 for ; Mon, 10 May 2021 22:24:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 447B082EE0; Mon, 10 May 2021 14:24:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YBr6B54o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F333E82EE0; Mon, 10 May 2021 14:24:04 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) (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 5404882EC5 for ; Mon, 10 May 2021 14:23:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pf1-x435.google.com with SMTP id i13so13605734pfu.2 for ; Mon, 10 May 2021 05:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BL+R78M3H0P+ynCzUsUFKeSMkaBVmQ9vrZW687u08+g=; b=YBr6B54ow1WHQ4jx5NgMQ+KQaSCy3v0jO6pDHKq00VzpEk88AgGf5y8YwaccBm5Dsj OiexR9ZlqV1I2e8fJkiZz1Rqg56NegW84UsqnvJI/Kr59lMOIdGvuyYUK3Yg9YoHL9fO ebbP6sIAB7m8YiIkMvnN/y2j+kB+3kGDu89L6EtHdhBIxL7Ts3BryCpAGTETZD1EXUY+ bOsTvLeEiIuKbZo/ts47g1R2zaDU2/3ycRAPAX6gI5eAinvnpRHU8R02BE/7mzy7J3nM TRjbjIkxFempCM0jHyTATuZloBqXQ3Z98lpm9vj8rZu7xgHPVvI1yxhwyuSlqnAehBWF 7X2w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=BL+R78M3H0P+ynCzUsUFKeSMkaBVmQ9vrZW687u08+g=; b=G/8LldYPKzlxQ254ElVDuhkLMVWYQGbp78uq7CuJuMLmkFCarMHr4qBbyNk49xZIRE RCd5FUYSsoG1K3cEF9QEIHTssUNLb3RJb5gCIuqb1OxqSEaqNvBJp3bpek1aD5VaexNs XZKbAt6gOMkKSRe0nUwu9d1CQcbbtED+aRgSrFkp3PUqx4BbSYoSB7uKRgDS6wZH6V5V Xngz5GtWS6J6go2KgmPJVC6ghA3QlPiEP8gHRTSq1FVPh8e2AZERzmIsqTAoioMFeMwk 5aPhz2RkAiawL9r61KuW/uw887zrbQvMXfDZcmJao0tEg5/F8IemQ3O4IUL11IiNZhT5 rGQw== X-Gm-Message-State: AOAM533JCRl6wGCIMtcvFdXabUYi/MEBB46ThfbwRXoTZmYcFZE3j2cd y/l/JWCUUdIxWmcYnQEHgag= X-Google-Smtp-Source: ABdhPJxWAdWzBV2mXxw4rNgB1O4QA8N8XI5lNcTmBuiS6yB6O5YimKyW4ehjWmFFeF7r2FXbD10lqQ== X-Received: by 2002:a63:ba5b:: with SMTP id l27mr25276535pgu.343.1620649437000; Mon, 10 May 2021 05:23:57 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:23:56 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 04/13] binman: test: Rename 172_fit_fdt.dts to 170_fit_fdt.dts Date: Mon, 10 May 2021 20:23:32 +0800 Message-Id: <20210510122341.13798-5-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean Currently there are 2 binman test cases using the same 172 number. It seems that 172_fit_fdt.dts was originally named as 170_, but commit c0f1ebe9c1b9 ("binman: Allow selecting default FIT configuration") changed its name to 172_ for no reason. Let's change it back. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- (no changes since v1) tools/binman/ftest.py | 10 +++++----- tools/binman/test/{172_fit_fdt.dts => 170_fit_fdt.dts} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename tools/binman/test/{172_fit_fdt.dts => 170_fit_fdt.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index f36823f51b..b0daccbc3b 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -3826,7 +3826,7 @@ class TestFunctional(unittest.TestCase): 'default-dt': 'test-fdt2', } data = self._DoReadFileDtb( - '172_fit_fdt.dts', + '170_fit_fdt.dts', entry_args=entry_args, extra_indirs=[os.path.join(self._indir, TEST_FDT_SUBDIR)])[0] self.assertEqual(U_BOOT_NODTB_DATA, data[-len(U_BOOT_NODTB_DATA):]) @@ -3848,7 +3848,7 @@ class TestFunctional(unittest.TestCase): def testFitFdtMissingList(self): """Test handling of a missing 'of-list' entry arg""" with self.assertRaises(ValueError) as e: - self._DoReadFile('172_fit_fdt.dts') + self._DoReadFile('170_fit_fdt.dts') self.assertIn("Generator node requires 'of-list' entry argument", str(e.exception)) @@ -3871,7 +3871,7 @@ class TestFunctional(unittest.TestCase): entry_args = { 'of-list': '', } - data = self._DoReadFileDtb('172_fit_fdt.dts', entry_args=entry_args)[0] + data = self._DoReadFileDtb('170_fit_fdt.dts', entry_args=entry_args)[0] def testFitFdtMissing(self): """Test handling of a missing 'default-dt' entry arg""" @@ -3880,7 +3880,7 @@ class TestFunctional(unittest.TestCase): } with self.assertRaises(ValueError) as e: self._DoReadFileDtb( - '172_fit_fdt.dts', + '170_fit_fdt.dts', entry_args=entry_args, extra_indirs=[os.path.join(self._indir, TEST_FDT_SUBDIR)])[0] self.assertIn("Generated 'default' node requires default-dt entry argument", @@ -3894,7 +3894,7 @@ class TestFunctional(unittest.TestCase): } with self.assertRaises(ValueError) as e: self._DoReadFileDtb( - '172_fit_fdt.dts', + '170_fit_fdt.dts', entry_args=entry_args, extra_indirs=[os.path.join(self._indir, TEST_FDT_SUBDIR)])[0] self.assertIn("default-dt entry argument 'test-fdt3' not found in fdt list: test-fdt1, test-fdt2", diff --git a/tools/binman/test/172_fit_fdt.dts b/tools/binman/test/170_fit_fdt.dts similarity index 100% rename from tools/binman/test/172_fit_fdt.dts rename to tools/binman/test/170_fit_fdt.dts From patchwork Mon May 10 12:23:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476358 X-Patchwork-Delegate: uboot@andestech.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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=KOGXr8ZM; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Ff0cb4C78z9t1s for ; Mon, 10 May 2021 22:25:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C977482EE1; Mon, 10 May 2021 14:24:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KOGXr8ZM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7945782ED5; Mon, 10 May 2021 14:24:10 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) (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 06E3C82ED5 for ; Mon, 10 May 2021 14:24:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pf1-x42f.google.com with SMTP id q2so13425871pfh.13 for ; Mon, 10 May 2021 05:24:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NW8vPl3HAI+QsV0NFPHCvi6DeyzL3crN6oKQafreGaU=; b=KOGXr8ZMvbSMX5f1wOId7MSxODLEdTHok5Zwz/XpVTiX8dqIGTDd492XVSmGSSl8jL EJXG5k2yQwU3IsI/pYv2BUSXmHPc3ysCz1tb+G6HBX845z/wlEKuidpZG+6gJFgGbtnY L3qvv49cQmB5bjWlt9ZUuYWSL+IyrJuv9ahz7bhUWLRvSPAm6d5ZtGSOJkwM4OxOxAfP 8M1it1yf2fe+A9jNfAjQ7r29G1MWMQ8ff438UlFSghPomQUPU1ccUnc44L9ttSyB81tU PQMMhpzKRxlrg2awPmuEAq8QvaJCZNWxMQAcRANA2luyqefLysmPafxF1SWivs76QG9D SPrQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=NW8vPl3HAI+QsV0NFPHCvi6DeyzL3crN6oKQafreGaU=; b=jAYlfJdrhUJoesWYccC52YQuW6m7UfSbltW80fj3HQOSfRPyXW5y566Oy5rR0hR2zk SnCwByxxzPcLokDDOTdykFQ5XZ0rdGrziWtsOLXB81ODA3LtgJSUNxoqDEWbkGfpJh9i O2U+/HVHhne23tn3bPTAv33aMg2kUUy3DMvmT+Zmumjhyi/AZqIkuxCdq8bDgFEdW3cl fyIY5RzPhVHLE4M2pv1spaH0TUwUABJyaADVw7t5Qpe5vzOd7gPkFjP+99vEXcHbzDie mxUj6qvm1r7XTA2HVwxylI7+N326Stmoicm9PniVCFTAqfQBFkW46ofvxebNiTsS1tW2 KdOg== X-Gm-Message-State: AOAM533XmT3+lu5LSy2IA/4CLnucTyE0bScgxPIWO9hr+zKrr4lwEyrt abg437X9kZWXCX3/E+uVyi4= X-Google-Smtp-Source: ABdhPJy0IM4FasuuGV50IKUM9l5Z1o5iBlJsCIxlUBveo+gY70QacfW82Wo3XD02rPhlwfRgm8FGCw== X-Received: by 2002:a63:7049:: with SMTP id a9mr25712695pgn.181.1620649439580; Mon, 10 May 2021 05:23:59 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:23:59 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 05/13] binman: Add support for RISC-V OpenSBI fw_dynamic blob Date: Mon, 10 May 2021 20:23:33 +0800 Message-Id: <20210510122341.13798-6-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean Add an entry for RISC-V OpenSBI's 'fw_dynamic' firmware payload. Signed-off-by: Bin Meng Reviewed-by: Simon Glass Reviewed-by: Rick Chen Reviewed-by: Rick Chen --- (no changes since v2) Changes in v2: - drop "size = <16>" in the binman node tools/binman/entries.rst | 13 +++++++++++++ tools/binman/etype/opensbi.py | 23 +++++++++++++++++++++++ tools/binman/ftest.py | 7 +++++++ tools/binman/test/201_opensbi.dts | 14 ++++++++++++++ 4 files changed, 57 insertions(+) create mode 100644 tools/binman/etype/opensbi.py create mode 100644 tools/binman/test/201_opensbi.dts diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst index f1c3b7de7a..dcac700c46 100644 --- a/tools/binman/entries.rst +++ b/tools/binman/entries.rst @@ -761,6 +761,19 @@ binman. +Entry: opensbi: RISC-V OpenSBI fw_dynamic blob +---------------------------------------------- + +Properties / Entry arguments: + - opensbi-path: Filename of file to read into entry. This is typically + called fw_dynamic.bin + +This entry holds the run-time firmware, typically started by U-Boot SPL. +See the U-Boot README for your architecture or board for how to use it. See +https://github.com/riscv/opensbi for more information about OpenSBI. + + + Entry: powerpc-mpc85xx-bootpg-resetvec: PowerPC mpc85xx bootpg + resetvec code for U-Boot ----------------------------------------------------------------------------------------- diff --git a/tools/binman/etype/opensbi.py b/tools/binman/etype/opensbi.py new file mode 100644 index 0000000000..74d473d535 --- /dev/null +++ b/tools/binman/etype/opensbi.py @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2021, Bin Meng +# +# Entry-type module for RISC-V OpenSBI binary blob +# + +from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg + +class Entry_opensbi(Entry_blob_named_by_arg): + """RISC-V OpenSBI fw_dynamic blob + + Properties / Entry arguments: + - opensbi-path: Filename of file to read into entry. This is typically + called fw_dynamic.bin + + This entry holds the run-time firmware, typically started by U-Boot SPL. + See the U-Boot README for your architecture or board for how to use it. See + https://github.com/riscv/opensbi for more information about OpenSBI. + """ + def __init__(self, section, etype, node): + super().__init__(section, etype, node, 'opensbi') + self.external = True diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index b0daccbc3b..5383eec489 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -76,6 +76,7 @@ FSP_M_DATA = b'fsp_m' FSP_S_DATA = b'fsp_s' FSP_T_DATA = b'fsp_t' ATF_BL31_DATA = b'bl31' +OPENSBI_DATA = b'opensbi' SCP_DATA = b'scp' TEST_FDT1_DATA = b'fdt1' TEST_FDT2_DATA = b'test-fdt2' @@ -178,6 +179,7 @@ class TestFunctional(unittest.TestCase): TestFunctional._MakeInputFile('compress', COMPRESS_DATA) TestFunctional._MakeInputFile('compress_big', COMPRESS_DATA_BIG) TestFunctional._MakeInputFile('bl31.bin', ATF_BL31_DATA) + TestFunctional._MakeInputFile('fw_dynamic.bin', OPENSBI_DATA) TestFunctional._MakeInputFile('scp.bin', SCP_DATA) # Add a few .dtb files for testing @@ -4535,5 +4537,10 @@ class TestFunctional(unittest.TestCase): expected += tools.GetBytes(0, 88 - len(expected)) + U_BOOT_NODTB_DATA self.assertEqual(expected, data) + def testPackOpenSBI(self): + """Test that an image with an OpenSBI binary can be created""" + data = self._DoReadFile('201_opensbi.dts') + self.assertEqual(OPENSBI_DATA, data[:len(OPENSBI_DATA)]) + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/201_opensbi.dts b/tools/binman/test/201_opensbi.dts new file mode 100644 index 0000000000..942183f990 --- /dev/null +++ b/tools/binman/test/201_opensbi.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + opensbi { + filename = "fw_dynamic.bin"; + }; + }; +}; From patchwork Mon May 10 12:23:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476356 X-Patchwork-Delegate: uboot@andestech.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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ncvN0h1N; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Ff0cN2mNGz9rx6 for ; Mon, 10 May 2021 22:24:52 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 653CD82ED6; Mon, 10 May 2021 14:24:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ncvN0h1N"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3AF9A82ED0; Mon, 10 May 2021 14:24:09 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) (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 C3A5782EDF for ; Mon, 10 May 2021 14:24:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pj1-x1031.google.com with SMTP id t2-20020a17090ae502b029015b0fbfbc50so9958256pjy.3 for ; Mon, 10 May 2021 05:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dr/C7kNogRdq/qCh8qH8ymqxlIFoo98AslvVq633tuA=; b=ncvN0h1NR502R+xCyqEpGiL4iQVkLz1Ch0/MaM7Sn1mCXKWzJKUoQa53RXWixzGoUf p/LByYmo7iBdWlodH1qA3ucNtHte9oux+7WO61R67K/Wz1KcqJEcLMl8615debwMi3If k7Fzt3MlxOK7U1OzlKn1qj/0QjGvCcXq9oZuZHlq4yD59Tn4Yx0U49xOOUwRME7biWAR 9c/GlekeI6VVYLqSneDU6qtnz6Ub8wJOfLt3QMyGlVhjbKeKdAyByCgQQIW/ZaiOw+Wd iBsI8kCcVB8CC+DSe4S9x2AfJ2l8XaeJ5mZbgy6gHGVt0udbMqnLO04of85vJDYgJD36 RbJg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=dr/C7kNogRdq/qCh8qH8ymqxlIFoo98AslvVq633tuA=; b=AWjJn14f0P7VWFzBciA2bi/kB+4+b1oyE1FXj/A4saThvxb+C1VvQdwBTlxqmYAj6s iDZLIskfyqc81y3MP0AaZ/NzQeo5SpIaTzA3/1aPwcLm2VxqpDXWdEC6vt7S0wrvGK7R lIz7PacTcEV8etnqXmK9hoNcW2u2WMio2Rvj0k3qLtSprzAdOT5Oq7BMm1bctQoFbY2r 9Z0xqlwWwRO5WcLWgCD8S1DpE/NDWz8ARQVNdpxnpdXIydU/fVc/ifRr4kHx0TTAJGZT aFSHDE0vFiBpmuv1JwEaqdbpRua81VV8KheuNQLQNQ3ZMVMP9MBwe9eNNuiJZrzxh3FB DoFw== X-Gm-Message-State: AOAM5322zbg2SbKmSUo/ue/cuFRGjucFRhOaQbpbKO9QWAKjNyCDpEcI gBqL/00SM9hcJotlNqxzhEU= X-Google-Smtp-Source: ABdhPJy1JazvggeOwD6QyOfi6qlg/8UzeAq0g9/7yK60Vvp1CQ5GPIzjn7m7ZRrH4ecaP3Cf9pPF4A== X-Received: by 2002:a17:90a:e645:: with SMTP id ep5mr40472010pjb.143.1620649442046; Mon, 10 May 2021 05:24:02 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:24:01 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 06/13] makefile: Pass OpenSBI blob to binman make rules Date: Mon, 10 May 2021 20:23:34 +0800 Message-Id: <20210510122341.13798-7-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean This updates the make rules to pass OpenSBI blob to binman. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- (no changes since v1) Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 404977efa5..3d88559b67 100644 --- a/Makefile +++ b/Makefile @@ -1287,6 +1287,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ -a atf-bl31-path=${BL31} \ + -a opensbi-path=${OPENSBI} \ -a default-dt=$(default_dt) \ -a scp-path=$(SCP) \ -a spl-bss-pad=$(if $(CONFIG_SPL_SEPARATE_BSS),,1) \ From patchwork Mon May 10 12:23:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476359 X-Patchwork-Delegate: uboot@andestech.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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=eU2Vq21v; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Ff0cp4ZlJz9rx6 for ; Mon, 10 May 2021 22:25:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 16EC482EF0; Mon, 10 May 2021 14:24:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eU2Vq21v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 512F082EE3; Mon, 10 May 2021 14:24:12 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) (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 88F1E82ED6 for ; Mon, 10 May 2021 14:24:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pj1-x1030.google.com with SMTP id h14-20020a17090aea8eb02901553e1cc649so9952713pjz.0 for ; Mon, 10 May 2021 05:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Njqujok9h7HAkNhCe3JVzmwvr+ArfyBcCBb7ia+fd5U=; b=eU2Vq21vXY69xHkwkfOx2pHr8Abyw4JsG4XkxTUm2E6NIcTYBICG4QD7ye19A/o/JC tVJpJS/QPI33mc2oqEfBrJh0GYwyoMek7a7xlvZnQ1lvOqVxcCQlNcEMHWmy+QBtzyDj zL595LwA7dHDXT47v3sxLNveDhVtHgSN1JXQrsrbVzGXOIn+ZbUEs/j532ugSkGJGIDo yWFMkOZVZfQ648Y4obhWkeU9PSjqJMbpuRrWwupexUCTrKQpKamZ7ZeGi9vAkYRNQpq8 50rN0l/UrrbT92AG2CBPqqjBF4zCUrS5cu4bs0EHCz5QtVhqAnBNTGjQLhWwU6KzJGHh 2qrw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Njqujok9h7HAkNhCe3JVzmwvr+ArfyBcCBb7ia+fd5U=; b=t2x16TT2JiD3k1GkYPwKZ/2j2+V8hF/YKgTM8V1HnjFpO2MBSzNSDogJ16dMVmfOYv 5fKFjxFhI11HfcfSVOov6zwVOtSpJ3IrtWlEzLeyZO0aCgWo9kVJJM93XPuFhczcOggS GXziMG8sULiqNjQ8DvNJ4hUWw3JnwEgo9Cqd8MBK1CSqVOe/iWouHBsh/qUawFySy9XH JP+J4aG90aVt9TXDY2E0oDiGU8NQCg5IZJqdYxRM07U52mbyWCw+qin6eiw1jvhkMgUu T97VLY6wANijYdphJHP6wWDOfb7CorhKTDJ1jQu1KvYeGt1y268KeK6KZxlSxn9GWi+R L4ZA== X-Gm-Message-State: AOAM533bgn1CcntcbaXqKsyrjLgB2AKXo590Imj+UzRmMFz0voHAec0d M8rNJVHL4DGQx9wKRZlMHVU= X-Google-Smtp-Source: ABdhPJwkIfRegLUFbYpNhnulSFd1t+8uSnhrEim6mipZ1goiS4NH09a1LvmF3k6Gj/9z0R1DW1COHg== X-Received: by 2002:a17:90b:505:: with SMTP id r5mr27444496pjz.121.1620649444195; Mon, 10 May 2021 05:24:04 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:24:03 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 07/13] riscv: sifive: unleashed: Switch to use binman to generate u-boot.itb Date: Mon, 10 May 2021 20:23:35 +0800 Message-Id: <20210510122341.13798-8-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean At present SiFive Unleashed board uses the Makefile to create the FIT, using USE_SPL_FIT_GENERATOR, which is deprecated as per the Makefile warning. Update to use binman instead. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- (no changes since v3) Changes in v3: - Fix the opensbi entry type in binman.dtsi arch/riscv/dts/binman.dtsi | 70 +++++++++++++++++++ .../dts/hifive-unleashed-a00-u-boot.dtsi | 1 + board/sifive/unleashed/Kconfig | 1 + configs/sifive_unleashed_defconfig | 1 + 4 files changed, 73 insertions(+) create mode 100644 arch/riscv/dts/binman.dtsi diff --git a/arch/riscv/dts/binman.dtsi b/arch/riscv/dts/binman.dtsi new file mode 100644 index 0000000000..e02597e73d --- /dev/null +++ b/arch/riscv/dts/binman.dtsi @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2021, Bin Meng + */ + +#include + +/ { + binman: binman { + multiple-images; + }; +}; + +&binman { + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load OpenSBI before U-Boot"; + #address-cells = <1>; + fit,fdt-list = "of-list"; + + images { + uboot { + description = "U-Boot"; + type = "standalone"; + os = "U-Boot"; + arch = "riscv"; + compression = "none"; + load = ; + + uboot_blob: blob-ext { + filename = "u-boot-nodtb.bin"; + }; + }; + + opensbi { + description = "OpenSBI fw_dynamic Firmware"; + type = "firmware"; + os = "opensbi"; + arch = "riscv"; + compression = "none"; + load = ; + entry = ; + + opensbi_blob: opensbi { + filename = "fw_dynamic.bin"; + }; + }; + + @fdt-SEQ { + description = "NAME"; + type = "flat_dt"; + compression = "none"; + }; + }; + + configurations { + default = "conf-1"; + + @conf-SEQ { + description = "NAME"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-SEQ"; + }; + }; + }; + }; +}; diff --git a/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi b/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi index 1996149c95..51b566116d 100644 --- a/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi +++ b/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi @@ -3,6 +3,7 @@ * Copyright (C) 2019 Jagan Teki */ +#include "binman.dtsi" #include "fu540-c000-u-boot.dtsi" #include "fu540-hifive-unleashed-a00-ddr.dtsi" diff --git a/board/sifive/unleashed/Kconfig b/board/sifive/unleashed/Kconfig index dbffd59c98..502916e86a 100644 --- a/board/sifive/unleashed/Kconfig +++ b/board/sifive/unleashed/Kconfig @@ -27,6 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select SIFIVE_FU540 select ENV_IS_IN_SPI_FLASH + select BINMAN imply CMD_DHCP imply CMD_EXT2 imply CMD_EXT4 diff --git a/configs/sifive_unleashed_defconfig b/configs/sifive_unleashed_defconfig index 62416a7c1d..dc9313e572 100644 --- a/configs/sifive_unleashed_defconfig +++ b/configs/sifive_unleashed_defconfig @@ -14,6 +14,7 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000 +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_MISC_INIT_R=y From patchwork Mon May 10 12:23:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476360 X-Patchwork-Delegate: uboot@andestech.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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BKYvI+7a; 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 4Ff0d30GNqz9rx6 for ; Mon, 10 May 2021 22:25:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C302982EF7; Mon, 10 May 2021 14:24:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BKYvI+7a"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8D43482EE3; Mon, 10 May 2021 14:24:13 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) (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 11FE682EC9 for ; Mon, 10 May 2021 14:24:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pl1-x631.google.com with SMTP id b3so9031871plg.11 for ; Mon, 10 May 2021 05:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n9SfnBNK7++phCmtcKevbKVGSOVpGMUcv89wLidWWNI=; b=BKYvI+7a43IvVx1+ATP7y7Gu5qRUHJBwArRr0EJYb6gOZ4Milhwu1C6p2MALaWoH4o bafy2K5uErQqJTQJmTSwbea4Q4UNB5raMp89e80zO5bGUqwX99kUOO9N5zakSY+mCMZq KB6IbqU/4G0aMa2N3fPoyKoXdNdE/n1irUC2vLqgidGYWjKhKeLalTwGvvhAg5CCwczX n+vEgZ4kr76qMCGI9P6PSN2bgdo0mIqSK+QF4Ayt0YcQMerulIcgBOD3vid8Ch8lO/w9 PUUNpIu9V43KSlQZdg/V+ruuocB03ZdVJe/P4NcYe3vGZ0Th/YufoEOEdgAkxqpalHkI ZuxQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=n9SfnBNK7++phCmtcKevbKVGSOVpGMUcv89wLidWWNI=; b=DpI9LrYJ5oIgsXn7V1Z7tVU0HoRP74Q+D2FCgoybONhTswTwXes3WPYH1QeBft0TeE IvOphyPKrsYyiGi7RE5PkRlZx4D3ca/v09NheOePCTZ+0VonhYW6ZIXdpiIDZL5DbuBV TaB2cZMrk2wErlpeFlPdiuK2ifiuC2GPqtxbkpV39M85Qg6p2xbP8N10h0ht8B4seefk oJedhZP/Qkynw+1uY5I1bkGh0Vc4UKb7/QgKZyFPpftsV4uQWqP3s+CaURLVajzUMFYb S+hril4LMqF4adGWUyItXmor4+ihQ4r2JM28Ema19gaMuBdL49+zsyNm1WyoaIjpnqd1 ZFbg== X-Gm-Message-State: AOAM530rV3lEBbxUjblrdyusxVSlefW0yAKrkEqkl0YiGb9NFZmYU27D rLydOpReBV1c6MMCUKCYsdA= X-Google-Smtp-Source: ABdhPJz3Sv6L51ok3ZffUeLEPkc+Z03zhV6G+ibFdbBoaMl6ges3ccdIJ3BzFzmLSjYQPhdgaGK+ZQ== X-Received: by 2002:a17:90a:fe3:: with SMTP id 90mr41128071pjz.215.1620649446498; Mon, 10 May 2021 05:24:06 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:24:06 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 08/13] lib: kconfig: Limit BINMAN_FDT for OF_SEPARATE or OF_EMBED Date: Mon, 10 May 2021 20:23:36 +0800 Message-Id: <20210510122341.13798-9-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean Generally speaking BINMAN_FDT makes sense for OF_SEPARATE or OF_EMBED. For the other OF_CONTROL methods, it's quite possible binman node is not available as binman is invoked during the build phase instead of runtime. Let's only turn it on for OF_SEPARATE or OF_EMBED by default. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- (no changes since v3) Changes in v3: - new patch: "lib: kconfig: Limit BINMAN_FDT for OF_SEPARATE or OF_EMBED" lib/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kconfig b/lib/Kconfig index 6d2d41de30..7d5990c940 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -25,7 +25,7 @@ config BCH config BINMAN_FDT bool "Allow access to binman information in the device tree" depends on BINMAN && DM && OF_CONTROL - default y + default y if OF_SEPARATE || OF_EMBED help This enables U-Boot to access information about binman entries, stored in the device tree in a binman node. Typical uses are to From patchwork Mon May 10 12:23:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476361 X-Patchwork-Delegate: uboot@andestech.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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=rJ+P+9Rr; 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 4Ff0dD4tzTz9rx6 for ; Mon, 10 May 2021 22:25:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6703A82F00; Mon, 10 May 2021 14:24:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rJ+P+9Rr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 45A2B82EDF; Mon, 10 May 2021 14:24:14 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) (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 651C682EE4 for ; Mon, 10 May 2021 14:24:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pj1-x102c.google.com with SMTP id fa21-20020a17090af0d5b0290157eb6b590fso10211465pjb.5 for ; Mon, 10 May 2021 05:24:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NpqIhWmEDCDfVMoIH+NH8/UZupmcOf0EPmSCBVtn/8U=; b=rJ+P+9Rro3BUbA8G/9/foWLoQQSdaIURPZHsgIFVz6C4lLFrJ5rdSEyNp62Ls21qi7 4hO3XP4Bb4908Thhka8m7oubYCk5Ml1D8qnej8Pa9OUrkJBB8qPNw9crzd7fYTrYCQHR ywQwD3HYqf1yHtChm4yV4xCyUepttqBBDjh3pA3PHn+LFj+qhFCLpBbb79KqaQktN8y7 twZjfpRu3yZ+ZG5wTD46Dz6Kjt6WPPon14uLerv+ewqcSAiBVcDZpwPaA8dPXfNu+J0O UqnnDsMLcXVrhxekaIuAzXgcVGN82CKjU6rLuLwIQsAgXaffVTq8hEmZUWFO4cAp8Hsv hvRA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=NpqIhWmEDCDfVMoIH+NH8/UZupmcOf0EPmSCBVtn/8U=; b=gVGL/Ih+Gm74iaUwlHF7NwFAS4n4srmhvaPL27e7sNcdgEKtNOTXMrTn9rUQMTosYy 3XydH1sKwW6egVYcP+zXNua9lmbpKZKpTrxOYmg57Tnxp9MTjR95TLgWAS70vYdzg9y7 Pxo+91KrAhK6sFqsKu8n+MLHsSIXcGjDEDsJ3Pjkh/7d2HEtgjFDo/djffvmYuZfxGIz XORcOpZ85aeBObEDup8XSNWHxwxpg1YO47meGt13LO6Ac82R/oU6XnP68Knegf43RpgW aZbEQRsBcjjxE6pn0HBCPPsnNXkRDPvkL//iuSUj6rJKMeFn04czsjHGdwt4rIx1QtvN yNPg== X-Gm-Message-State: AOAM533EfyNOkd+QZH7iOwIOprk9OZD7giPGeEQM86ihjo5D5P0kqr0l mQo90IIdqyqkd5PJv1vne2I= X-Google-Smtp-Source: ABdhPJw2KUBd9/FZNyH7nDa9Yk3Sfx5PhRhnsdXE4S6Ue1AqMLBY10KaaUkjIvvZReq8rTGOgTO6pQ== X-Received: by 2002:a17:90a:1d41:: with SMTP id u1mr13250616pju.20.1620649448988; Mon, 10 May 2021 05:24:08 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:24:08 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 09/13] binman: Support packaging U-Boot for scenarios like OF_BOARD or OF_PRIOR_STAGE Date: Mon, 10 May 2021 20:23:37 +0800 Message-Id: <20210510122341.13798-10-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean For scenarios like OF_BOARD or OF_PRIOR_STAGE, no device tree blob is provided in the U-Boot build phase hence the binman node information is not available. In order to support such use case, a new Kconfig option BINMAN_STANDALONE_FDT is introduced, to tell the build system that a device tree blob containing binman node is explicitly required when using binman to package U-Boot. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- Changes in v5: - update binman.rst for OF_BOARD or OF_PRIOR_STAGE usage Changes in v4: - update the makefile dependency on u-boot.img instead of u-boot.bin Changes in v3: - rename the Kconfig option name to BINMAN_STANDALONE_FDT - make BINMAN_STANDALONE_FDT default y for OF_BOARD as well - reword the Kconfig option help message a little bit Changes in v2: - new patch: "binman: Support packaging U-Boot for scenarios like OF_PRIOR_STAGE" Makefile | 3 ++- dts/Kconfig | 18 ++++++++++++++++++ tools/binman/binman.rst | 24 ++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3d88559b67..1dbf0b0b8c 100644 --- a/Makefile +++ b/Makefile @@ -918,6 +918,7 @@ endif endif INPUTS-$(CONFIG_TPL) += tpl/u-boot-tpl.bin INPUTS-$(CONFIG_OF_SEPARATE) += u-boot.dtb +INPUTS-$(CONFIG_BINMAN_STANDALONE_FDT) += u-boot.dtb ifeq ($(CONFIG_SPL_FRAMEWORK),y) INPUTS-$(CONFIG_OF_SEPARATE) += u-boot-dtb.img endif @@ -1392,7 +1393,7 @@ u-boot-lzma.img: u-boot.bin.lzma FORCE u-boot-dtb.img u-boot.img u-boot.kwb u-boot.pbl u-boot-ivt.img: \ $(if $(CONFIG_SPL_LOAD_FIT),u-boot-nodtb.bin \ - $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_OF_HOSTFILE),dts/dt.dtb) \ + $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_OF_HOSTFILE)$(CONFIG_BINMAN_STANDALONE_FDT),dts/dt.dtb) \ ,$(UBOOT_BIN)) FORCE $(call if_changed,mkimage) $(BOARD_SIZE_CHECK) diff --git a/dts/Kconfig b/dts/Kconfig index 99ce75e1a2..dabe0080c1 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -19,6 +19,24 @@ config BINMAN bool select DTOC +config BINMAN_STANDALONE_FDT + bool + depends on BINMAN + default y if OF_BOARD || OF_PRIOR_STAGE + help + This option tells U-Boot build system that a standalone device tree + source is explicitly required when using binman to package U-Boot. + + This is not necessary in a common scenario where a device tree source + that contains the binman node is provided in the arch//dts + directory for a specific board. Such device tree sources are built for + OF_SEPARATE or OF_EMBED. However for a scenario like the board device + tree blob is not provided in the U-Boot build tree, but fed to U-Boot + in the runtime, e.g.: in the OF_PRIOR_STAGE case that it is passed by + a prior stage bootloader. For such scenario, a standalone device tree + blob containing binman node to describe how to package U-Boot should + be provided explicitly. + menu "Device Tree Control" depends on SUPPORT_OF_CONTROL diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index b3df3a6428..bc635aa00a 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -232,6 +232,30 @@ You can use other, more specific CONFIG options - see 'Automatic .dtsi inclusion' below. +Using binman with OF_BOARD or OF_PRIOR_STAGE +-------------------------------------------- + +Normally binman is used with a board configured with OF_SEPARATE or OF_EMBED. +This is a typical scenario where a device tree source that contains the binman +node is provided in the arch//dts directory for a specific board. + +However for a board configured with OF_BOARD or OF_PRIOR_STAGE, no device tree +blob is provided in the U-Boot build phase hence the binman node information +is not available. In order to support such use case, a new Kconfig option +BINMAN_STANDALONE_FDT is introduced, to tell the build system that a standalone +device tree blob containing binman node is explicitly required. + +Note there is a Kconfig option BINMAN_FDT which enables U-Boot run time to +access information about binman entries, stored in the device tree in a binman +node. Generally speaking, this option makes sense for OF_SEPARATE or OF_EMBED. +For the other OF_CONTROL methods, it's quite possible binman node is not +available as binman is invoked during the build phase, thus this option is not +turned on by default for these OF_CONTROL methods. + +See qemu-riscv64_spl_defconfig for an example of how binman is used with +OF_PRIOR_STAGE to generate u-boot.itb image. + + Access to binman entry offsets at run time (symbols) ---------------------------------------------------- From patchwork Mon May 10 12:23:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476362 X-Patchwork-Delegate: uboot@andestech.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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=UuA7okYx; 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 4Ff0dT4xbFz9t0G for ; Mon, 10 May 2021 22:25:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A5CC182EF3; Mon, 10 May 2021 14:24:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UuA7okYx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 633B382EE9; Mon, 10 May 2021 14:24:16 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) (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 9040982EEA for ; Mon, 10 May 2021 14:24:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pg1-x536.google.com with SMTP id t193so629324pgb.4 for ; Mon, 10 May 2021 05:24:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K+iJzDfHdPgV9ZdCLi+EqnbzWcp2tEBzhL8cdsrJTRo=; b=UuA7okYxG7cbR3M40mYMHhCaBsmLAeXpl9M0pfOJ7XdWfGVlmFyB1qDUvpWr0qiRSk gdGSiHWOcfGxU53G03Z60wcwyNjCdcrOdEXdaT3oBz1lx5FSM1IhOBXYWlCXV1gzZIyr zjZAGSylLv0i1BHUuu81hj4U4dKy9ZjlmeWB3oEN8GQwmsXvjJ2u4HOkLD7qjXy/YogQ +GBMb/9if68ZntBImkRQ42yUXUaXZguHZ78qJVnmS1hpwtGbK7w26tMhwmttEJrbq8hp 8SizPSFMcU8mZ1qcCuRFOMhL8CpI83gBZwPXbjSsxa6HLLpEqmk1PDBRAwRiGJ3cUBz/ IYgg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=K+iJzDfHdPgV9ZdCLi+EqnbzWcp2tEBzhL8cdsrJTRo=; b=uQ2DyexFoLzTjdb8ui1oe4FJMvadDQ/8CJ1tnqkc87ZGLR1aHd5SF+QiNYlWr//YFs AuLzez7G0yRk+i7jBjYL+E8JnYek41RFWh8ZzQ1GH8sibqkPGEw6Ff4XKYfFOuGz8N9G ImKNHk43Yp6ls0ysy8//vqA3XI+txz9fjkB7ktCp6ACWZpBnjCJPSVwcH2h3l3pdQxrC ZfI4LFolFkEx5Q/mFlcxWLA1S7oeJWIpTA7IEKiybahgtnhbH1STo/cmNHUC88g6Gy/7 19mWRVu3FVrFsxf2WxTTFH9Lclnz4iF5bw1Zw1Poug755OlAm6dX7iJNLPdJ5otGKpgN P9sg== X-Gm-Message-State: AOAM533DXSxrr9miQIPDECu8ToGymrB255P6vIx5R6Q8ws+t85JKOs2S bTzZTj8zZhefsfn9xXc76GE= X-Google-Smtp-Source: ABdhPJyNfTRtCv912YoVFDsB3lQvk0T1h45BzCutn58IM7J3e/xGtOJg0skTPC3bau5INSrV1HiImA== X-Received: by 2002:a63:79c3:: with SMTP id u186mr21503852pgc.203.1620649451126; Mon, 10 May 2021 05:24:11 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.24.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:24:10 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 10/13] riscv: dts: Sort build targets in alphabetical order Date: Mon, 10 May 2021 20:23:38 +0800 Message-Id: <20210510122341.13798-11-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean Sort the RISC-V DTS build targets by their Kconfig target names in alphabetical order. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- (no changes since v2) Changes in v2: - new patch: "riscv: dts: Sort build targets in alphabetical order" arch/riscv/dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile index 8138d89d84..3780334875 100644 --- a/arch/riscv/dts/Makefile +++ b/arch/riscv/dts/Makefile @@ -1,9 +1,9 @@ # SPDX-License-Identifier: GPL-2.0+ dtb-$(CONFIG_TARGET_AX25_AE350) += ae350_32.dtb ae350_64.dtb +dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += microchip-mpfs-icicle-kit.dtb dtb-$(CONFIG_TARGET_SIFIVE_UNLEASHED) += hifive-unleashed-a00.dtb dtb-$(CONFIG_TARGET_SIPEED_MAIX) += k210-maix-bit.dtb -dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += microchip-mpfs-icicle-kit.dtb targets += $(dtb-y) From patchwork Mon May 10 12:23:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476363 X-Patchwork-Delegate: uboot@andestech.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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BvwNzvkt; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Ff0dc4X0pz9t2b for ; Mon, 10 May 2021 22:25:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 826D982F02; Mon, 10 May 2021 14:24:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BvwNzvkt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8FA9282EF1; Mon, 10 May 2021 14:24:18 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) (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 A24E682EC9 for ; Mon, 10 May 2021 14:24:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pj1-x1035.google.com with SMTP id j6-20020a17090adc86b02900cbfe6f2c96so10211069pjv.1 for ; Mon, 10 May 2021 05:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nIZE/GOtFB7EXYcsi1mY/xcMRLRlvj+uDchxOuEWoxY=; b=BvwNzvktntF1ttgWQ4OMP+Mh8cC5gfMpmgQBd2MieuYM5CjsmdffvZxNdbey2lrspo X4sO+3ZKcigUrcP0A+MAeZPbjLDrH3rLUctlmvuqM/NuzQpKfVWCVkce7twqyZyxSu6V WHD3lKg6S4fZi1pjNZI7VdkF6PZR4Q3GT0MqIyV3dkC5ndzWfgIx6EROmTZXpgBCx4dQ tHVeiMj8waqbSyG0IiiysKlmspoSgjD21zLFrffHBkdxTurt38k6tSnpCmVkkt/un5MD V7fs97E2DbWvhAZ2fSTY9A6+xKROJJh2522EFbBOG0IxwQ4Nae44/luzhufgjw6aaWCo yCCw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=nIZE/GOtFB7EXYcsi1mY/xcMRLRlvj+uDchxOuEWoxY=; b=U1WXATlByRqbOzettC2/Oz9ZGHjHNjM484Zalix/ZTlw2RIumM7JqDdZWjqHzc7lDo vEqk88xRgNgXI3kno0AxlCCR1rPePhwOnJup3IzodULP55+OOHWtj/ODSY89MuqBALQl l+u8Dja/3Bu4rRy0EQGwqSCmUJzGfAKGknpJvM1Y+ItTcx+aL2m7dn0kvLjp5z8PW0sP 8BFyznaQb64SJ5jkjktSXWf5SA5SJSrEc+BB52Rvlmsh+8PR3njzan85tL24GtfmbaHX xyMdGSRA+8o/Ajv2x8bUDU3r9TggAjhUaNRZJ8vUtmwz/v1MJMgtY8CXVmm3xBZ6tGaW 5PzQ== X-Gm-Message-State: AOAM533YrUAQXdRqwJ2S8NvWMEvblKaJnG+6wNcZRg6pphrX1wQ6WWlY LPaQ+ABJIqzY+P5tk78mNNYY3wtDFMY= X-Google-Smtp-Source: ABdhPJxAdH44Yh6eGkMFkaa+vEL0qk+l1/A9VSnJKqvljsAs9GA6RhoNGU8vU4XZ7ghZqVYrYMv8Mg== X-Received: by 2002:a17:90a:8809:: with SMTP id s9mr33061126pjn.189.1620649453322; Mon, 10 May 2021 05:24:13 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:24:13 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 11/13] riscv: qemu: Switch to use binman to generate u-boot.itb Date: Mon, 10 May 2021 20:23:39 +0800 Message-Id: <20210510122341.13798-12-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean By utilizing the newly introduced BINMAN_STANDALONE_FDT option, along with a new dedicated device tree source file for the QEMU virt target used for binman only, we can now use binman to generate u-boot.itb. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- (no changes since v2) Changes in v2: - new patch: "riscv: qemu: Switch to use binman to generate u-boot.itb" arch/riscv/cpu/generic/Kconfig | 1 + arch/riscv/dts/Makefile | 1 + arch/riscv/dts/binman.dtsi | 8 ++++++++ arch/riscv/dts/qemu-virt.dts | 8 ++++++++ configs/qemu-riscv32_spl_defconfig | 2 ++ configs/qemu-riscv64_spl_defconfig | 2 ++ 6 files changed, 22 insertions(+) create mode 100644 arch/riscv/dts/qemu-virt.dts diff --git a/arch/riscv/cpu/generic/Kconfig b/arch/riscv/cpu/generic/Kconfig index 198e36e969..a4934bb957 100644 --- a/arch/riscv/cpu/generic/Kconfig +++ b/arch/riscv/cpu/generic/Kconfig @@ -4,6 +4,7 @@ config GENERIC_RISCV bool + select BINMAN if SPL select ARCH_EARLY_INIT_R imply CPU imply CPU_RISCV diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile index 3780334875..26ef853282 100644 --- a/arch/riscv/dts/Makefile +++ b/arch/riscv/dts/Makefile @@ -2,6 +2,7 @@ dtb-$(CONFIG_TARGET_AX25_AE350) += ae350_32.dtb ae350_64.dtb dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += microchip-mpfs-icicle-kit.dtb +dtb-$(CONFIG_TARGET_QEMU_VIRT) += qemu-virt.dtb dtb-$(CONFIG_TARGET_SIFIVE_UNLEASHED) += hifive-unleashed-a00.dtb dtb-$(CONFIG_TARGET_SIPEED_MAIX) += k210-maix-bit.dtb diff --git a/arch/riscv/dts/binman.dtsi b/arch/riscv/dts/binman.dtsi index e02597e73d..d26cfdb78a 100644 --- a/arch/riscv/dts/binman.dtsi +++ b/arch/riscv/dts/binman.dtsi @@ -48,21 +48,29 @@ }; }; +#ifndef CONFIG_OF_PRIOR_STAGE @fdt-SEQ { description = "NAME"; type = "flat_dt"; compression = "none"; }; +#endif }; configurations { default = "conf-1"; +#ifndef CONFIG_OF_PRIOR_STAGE @conf-SEQ { +#else + conf-1 { +#endif description = "NAME"; firmware = "opensbi"; loadables = "uboot"; +#ifndef CONFIG_OF_PRIOR_STAGE fdt = "fdt-SEQ"; +#endif }; }; }; diff --git a/arch/riscv/dts/qemu-virt.dts b/arch/riscv/dts/qemu-virt.dts new file mode 100644 index 0000000000..fecff542b9 --- /dev/null +++ b/arch/riscv/dts/qemu-virt.dts @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2021, Bin Meng + */ + +/dts-v1/; + +#include "binman.dtsi" diff --git a/configs/qemu-riscv32_spl_defconfig b/configs/qemu-riscv32_spl_defconfig index 18dfe33ca8..a4c156612a 100644 --- a/configs/qemu-riscv32_spl_defconfig +++ b/configs/qemu-riscv32_spl_defconfig @@ -2,11 +2,13 @@ CONFIG_RISCV=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 CONFIG_SPL=y +CONFIG_DEFAULT_DEVICE_TREE="qemu-virt" CONFIG_TARGET_QEMU_VIRT=y CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000 +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y # CONFIG_CMD_MII is not set diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig index 897adf6a29..6c680483ce 100644 --- a/configs/qemu-riscv64_spl_defconfig +++ b/configs/qemu-riscv64_spl_defconfig @@ -2,12 +2,14 @@ CONFIG_RISCV=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 CONFIG_SPL=y +CONFIG_DEFAULT_DEVICE_TREE="qemu-virt" CONFIG_TARGET_QEMU_VIRT=y CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000 +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y # CONFIG_CMD_MII is not set From patchwork Mon May 10 12:23:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476364 X-Patchwork-Delegate: uboot@andestech.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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=D4bH4ceO; 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 4Ff0dq4V7Hz9t6h for ; Mon, 10 May 2021 22:26:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CE79C82F0C; Mon, 10 May 2021 14:24:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="D4bH4ceO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5F83382EF6; Mon, 10 May 2021 14:24:20 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) (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 0E03B82EEA for ; Mon, 10 May 2021 14:24:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pl1-x630.google.com with SMTP id t4so9046067plc.6 for ; Mon, 10 May 2021 05:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o7txZaVVf98wOMvsx5+bip3lUd+JP1ZTpQFXWJHz3wA=; b=D4bH4ceOZnX2Xq5HSpbHnM2djyVTz99FN9T/Cs0vsUZ/Fuy99crXNZvvdOjwbb1gmK Cw3soCsjD0r6DPrnN8GtO3zqhX2nycGhYmyhBMlW4azTnKc3VcnZhMyn9D8WwZerg8kZ G70cKvQnP5zmb9ZOKhB1rT8OyFC69ztOetJB8XHcgv7vI+yxgPe6AlIys+P1QpPUVNiD c53m3jsXjX5FD6Ut3OjIj+gIsdytVK7xukUVYt1bMEzxTFfOiGJROw414lNWDH1wTwMO wDP5ERYss4yIOrUdFS4Wr9TzBP5QfpC3WcV5Jd1A40uTQT4qusgwACIWB/LDB4Y1e8RT aXig== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=o7txZaVVf98wOMvsx5+bip3lUd+JP1ZTpQFXWJHz3wA=; b=FLN06aHxnilM2SIqtObi+gctGNJrt3Rieih/VGhctNrRncMtcsA0bPPMCzuWx81BWM DCuolWBGHmZSqEQ3E+LQIp0afvKSACqHR3uLuTrcaDPU95N+cSFzTspq5RodspgrwprS /0zhaXERqT3RpfKXVzTxmyqH3r0yWp5MJgZIf1+Nh97sQsZRj3RqSWDHBBMpp80TQiMc RLGTt9bt5lcg7Ftkt/eb4Jn8xqgPO6EZpEYkxZB3Hqaqk6dqrYBeg1wkiQInyK7vpmfa uLr5tMzBWsqh+4S5FtJsplF/SkrgUC0vlldVyFXagDerv6TSaQQGqc2GhIlddUIkuiEn 6Jtg== X-Gm-Message-State: AOAM533TTSiIIM+nqFcOxtjRMOAvsDmNvtTE3aSyf6LY8xLbhvasB8r0 2bjslD7k74dCJeMfvtBRSm8= X-Google-Smtp-Source: ABdhPJw4LEmywCSh09I7jcisivmdjx2/gEo/0PwZOV4jlrpeDsQ+A7kTlV7eIRqKSAP8EGSCKPamhA== X-Received: by 2002:a17:90b:4b45:: with SMTP id mi5mr42238354pjb.197.1620649455702; Mon, 10 May 2021 05:24:15 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:24:15 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 12/13] riscv: ae350: Switch to use binman to generate u-boot.itb Date: Mon, 10 May 2021 20:23:40 +0800 Message-Id: <20210510122341.13798-13-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean Use the new BINMAN_STANDALONE_FDT option for AE350 based SPL defconfigs, so that binman is now used to generate u-boot.itb. Signed-off-by: Bin Meng Reviewed-by: Simon Glass Reviewed-by: Rick Chen --- (no changes since v3) Changes in v3: - new patch: "riscv: ae350: Switch to use binman to generate u-boot.itb" arch/riscv/dts/ae350_32.dts | 2 ++ arch/riscv/dts/ae350_64.dts | 2 ++ board/AndesTech/ax25-ae350/Kconfig | 1 + configs/ae350_rv32_spl_defconfig | 2 ++ configs/ae350_rv32_spl_xip_defconfig | 2 ++ configs/ae350_rv64_spl_defconfig | 2 ++ configs/ae350_rv64_spl_xip_defconfig | 2 ++ 7 files changed, 13 insertions(+) diff --git a/arch/riscv/dts/ae350_32.dts b/arch/riscv/dts/ae350_32.dts index 3f8525fe56..a0ab5e9be2 100644 --- a/arch/riscv/dts/ae350_32.dts +++ b/arch/riscv/dts/ae350_32.dts @@ -1,5 +1,7 @@ /dts-v1/; +#include "binman.dtsi" + / { #address-cells = <1>; #size-cells = <1>; diff --git a/arch/riscv/dts/ae350_64.dts b/arch/riscv/dts/ae350_64.dts index 482c707503..f654f4809a 100644 --- a/arch/riscv/dts/ae350_64.dts +++ b/arch/riscv/dts/ae350_64.dts @@ -1,5 +1,7 @@ /dts-v1/; +#include "binman.dtsi" + / { #address-cells = <2>; #size-cells = <2>; diff --git a/board/AndesTech/ax25-ae350/Kconfig b/board/AndesTech/ax25-ae350/Kconfig index 321dd0cb10..e50f505a2b 100644 --- a/board/AndesTech/ax25-ae350/Kconfig +++ b/board/AndesTech/ax25-ae350/Kconfig @@ -31,6 +31,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select RISCV_NDS select SUPPORT_SPL + select BINMAN if SPL imply SMP imply SPL_RAM_SUPPORT imply SPL_RAM_DEVICE diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig index 153266f647..47c8e9a621 100644 --- a/configs/ae350_rv32_spl_defconfig +++ b/configs/ae350_rv32_spl_defconfig @@ -3,11 +3,13 @@ CONFIG_SYS_TEXT_BASE=0x01200000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL=y +CONFIG_DEFAULT_DEVICE_TREE="ae350_32" CONFIG_TARGET_AX25_AE350=y CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x00200000 +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # " diff --git a/configs/ae350_rv32_spl_xip_defconfig b/configs/ae350_rv32_spl_xip_defconfig index 651b1eb733..206ffe2720 100644 --- a/configs/ae350_rv32_spl_xip_defconfig +++ b/configs/ae350_rv32_spl_xip_defconfig @@ -4,12 +4,14 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL_TEXT_BASE=0x80000000 CONFIG_SPL=y +CONFIG_DEFAULT_DEVICE_TREE="ae350_32" CONFIG_TARGET_AX25_AE350=y CONFIG_RISCV_SMODE=y CONFIG_XIP=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # " diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig index f434091d47..ef04e4a4b6 100644 --- a/configs/ae350_rv64_spl_defconfig +++ b/configs/ae350_rv64_spl_defconfig @@ -3,12 +3,14 @@ CONFIG_SYS_TEXT_BASE=0x01200000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL=y +CONFIG_DEFAULT_DEVICE_TREE="ae350_64" CONFIG_TARGET_AX25_AE350=y CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x00200000 +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # " diff --git a/configs/ae350_rv64_spl_xip_defconfig b/configs/ae350_rv64_spl_xip_defconfig index b0afdb4cfe..21b7e8895b 100644 --- a/configs/ae350_rv64_spl_xip_defconfig +++ b/configs/ae350_rv64_spl_xip_defconfig @@ -4,6 +4,7 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL_TEXT_BASE=0x80000000 CONFIG_SPL=y +CONFIG_DEFAULT_DEVICE_TREE="ae350_64" CONFIG_TARGET_AX25_AE350=y CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y @@ -11,6 +12,7 @@ CONFIG_XIP=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # " From patchwork Mon May 10 12:23:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476365 X-Patchwork-Delegate: uboot@andestech.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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=h5cJ4tHS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Ff0f24F5Sz9vDw for ; Mon, 10 May 2021 22:26:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CDDAB82F13; Mon, 10 May 2021 14:24:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="h5cJ4tHS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CD33082F02; Mon, 10 May 2021 14:24:23 +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,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) (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 5782C82EE9 for ; Mon, 10 May 2021 14:24:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pf1-x42a.google.com with SMTP id h127so13465447pfe.9 for ; Mon, 10 May 2021 05:24:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h5gtE9xs+7STHuODAlov8RdPjxLWFzt14Oe3t1juHAI=; b=h5cJ4tHS6U6baKLIF4yX07CLqTKIDaBB/tzDdHSJqa3HqQxEOq2sLc54zU+BVlr1pe w0OhBvGwb5Nvmz08e5H8FOec/jCSjmQgqo7mS/9Ciar7NT4pPew2u+Zc7h8suchUZ6kL jfmO2YNTSF8VWlR6Kt41FtqezAD9+qR5CgFl16dGdQ/FxN1QWZypAhgIy/1YLNaccth6 XwtVUr/KGIE6GHaTV5EPVYOugTbMYJ6A4YkdFYGzr9Yx8MiKQm9rksbqBYM/9MhC0N3G HNgn/SCg36XFhijHWtnaRkVnRQGAS5uHgoL3+kOZaP6w0VEbNxlbbxgPEuHM2KFfokXr XaWQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=h5gtE9xs+7STHuODAlov8RdPjxLWFzt14Oe3t1juHAI=; b=kkun4yvKxpKJNwuRMXqDIs2dLhX+ggKL4h8Z8dM1G+qmn/YW98BeAcl2QcAMMHpuZn NgOkCpV4g3ZTkopn9OtrquJoL9O4NZIkwq2FC/EWgHPYcMRzH56xD4UIdjbDpCE1+/9h ehtfbjPZfKV0/GMQ+2t3kVCVwzBG2yUR3iiPm+nCFIp3f/waijJGp4X04jqPiqjXapHx SNUaBSeJ/LwxA8gHsJimCjtAysf0ZuLma5tt6G4BUNt/j9RVkqP4sBlXaLC2BbF6EvUL cYIIRA7C+aRBlJtXNUvIgW4XRI0gaV6wxawalA7fwxjHa0tIgRogjTcxVi0Bfakzg2si x+0g== X-Gm-Message-State: AOAM531QB3kc6nM+CEpRzDHkI38SiBbUuscEtJ9ek5YZeoOExPMqH8Tl ZTVL+FSgp0Kw2RIdnaNLJH8kfB/4RKs= X-Google-Smtp-Source: ABdhPJwSY1AiXu4Pb/F1VI3MztYlKOHO6pX/zYRbxIpiUSQaJrX+KoC5z/2TqGDe28lctsI+cLIuqA== X-Received: by 2002:a62:8042:0:b029:28e:d95a:37bb with SMTP id j63-20020a6280420000b029028ed95a37bbmr24705238pfd.78.1620649457873; Mon, 10 May 2021 05:24:17 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.24.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:24:17 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 13/13] riscv: Drop USE_SPL_FIT_GENERATOR Date: Mon, 10 May 2021 20:23:41 +0800 Message-Id: <20210510122341.13798-14-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean Now that we have switched to binman to generate u-boot.itb for all RISC-V boards, USE_SPL_FIT_GENERATOR is no longer needed and can be dropped. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- (no changes since v3) Changes in v3: - remove USE_SPL_FIT_GENERATOR in ae350_ defconfigs Changes in v2: - new patch: "riscv: Drop USE_SPL_FIT_GENERATOR" arch/riscv/lib/mkimage_fit_opensbi.sh | 100 -------------------------- common/Kconfig.boot | 3 +- configs/ae350_rv32_spl_defconfig | 1 - configs/ae350_rv32_spl_xip_defconfig | 1 - configs/ae350_rv64_spl_defconfig | 1 - configs/ae350_rv64_spl_xip_defconfig | 1 - configs/qemu-riscv32_spl_defconfig | 1 - configs/qemu-riscv64_spl_defconfig | 1 - configs/sifive_unleashed_defconfig | 1 - 9 files changed, 1 insertion(+), 109 deletions(-) delete mode 100755 arch/riscv/lib/mkimage_fit_opensbi.sh diff --git a/arch/riscv/lib/mkimage_fit_opensbi.sh b/arch/riscv/lib/mkimage_fit_opensbi.sh deleted file mode 100755 index d6f95e5bfd..0000000000 --- a/arch/riscv/lib/mkimage_fit_opensbi.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0+ -# -# script to generate FIT image source for RISC-V boards with OpenSBI -# and, optionally, multiple device trees (given on the command line). -# -# usage: $0 [ [&2 - OPENSBI=/dev/null -fi - -cat << __HEADER_EOF -/dts-v1/; - -/ { - description = "Configuration to load OpenSBI before U-Boot"; - - images { - uboot { - description = "U-Boot"; - data = /incbin/("u-boot-nodtb.bin"); - type = "standalone"; - os = "U-Boot"; - arch = "riscv"; - compression = "none"; - load = <$UBOOT_LOAD_ADDR>; - }; - opensbi { - description = "RISC-V OpenSBI"; - data = /incbin/("$OPENSBI"); - type = "firmware"; - os = "opensbi"; - arch = "riscv"; - compression = "none"; - load = <$OPENSBI_LOAD_ADDR>; - entry = <$OPENSBI_LOAD_ADDR>; - }; -__HEADER_EOF - -cnt=1 -for dtname in $* -do - cat << __FDT_IMAGE_EOF - fdt_$cnt { - description = "$(basename $dtname .dtb)"; - data = /incbin/("$dtname"); - type = "flat_dt"; - compression = "none"; - }; -__FDT_IMAGE_EOF -cnt=$((cnt+1)) -done - -cat << __CONF_HEADER_EOF - }; - configurations { - default = "config_1"; - -__CONF_HEADER_EOF - -if [ $# -eq 0 ]; then -cat << __CONF_SECTION_EOF - config_1 { - description = "U-Boot FIT"; - firmware = "opensbi"; - loadables = "uboot"; - }; -__CONF_SECTION_EOF -else -cnt=1 -for dtname in $* -do -cat << __CONF_SECTION_EOF - config_$cnt { - description = "$(basename $dtname .dtb)"; - firmware = "opensbi"; - loadables = "uboot"; - fdt = "fdt_$cnt"; - }; -__CONF_SECTION_EOF -cnt=$((cnt+1)) -done -fi - -cat << __ITS_EOF - }; -}; -__ITS_EOF diff --git a/common/Kconfig.boot b/common/Kconfig.boot index 94d82c27dd..89a3161f1f 100644 --- a/common/Kconfig.boot +++ b/common/Kconfig.boot @@ -273,14 +273,13 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT && !ARCH_SUNXI + default y if SPL_FIT && (!ARCH_SUNXI && !RISCV) config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on USE_SPL_FIT_GENERATOR default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP - default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCV help Specifies a (platform specific) script file to generate the FIT source file used to build the U-Boot FIT image file. This gets diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig index 47c8e9a621..25b4ada427 100644 --- a/configs/ae350_rv32_spl_defconfig +++ b/configs/ae350_rv32_spl_defconfig @@ -9,7 +9,6 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x00200000 -# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # " diff --git a/configs/ae350_rv32_spl_xip_defconfig b/configs/ae350_rv32_spl_xip_defconfig index 206ffe2720..c5d7ac3bc1 100644 --- a/configs/ae350_rv32_spl_xip_defconfig +++ b/configs/ae350_rv32_spl_xip_defconfig @@ -11,7 +11,6 @@ CONFIG_XIP=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 -# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # " diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig index ef04e4a4b6..61637a916e 100644 --- a/configs/ae350_rv64_spl_defconfig +++ b/configs/ae350_rv64_spl_defconfig @@ -10,7 +10,6 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x00200000 -# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # " diff --git a/configs/ae350_rv64_spl_xip_defconfig b/configs/ae350_rv64_spl_xip_defconfig index 21b7e8895b..6c63382f75 100644 --- a/configs/ae350_rv64_spl_xip_defconfig +++ b/configs/ae350_rv64_spl_xip_defconfig @@ -12,7 +12,6 @@ CONFIG_XIP=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 -# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # " diff --git a/configs/qemu-riscv32_spl_defconfig b/configs/qemu-riscv32_spl_defconfig index a4c156612a..f30bd5f0a0 100644 --- a/configs/qemu-riscv32_spl_defconfig +++ b/configs/qemu-riscv32_spl_defconfig @@ -8,7 +8,6 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000 -# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y # CONFIG_CMD_MII is not set diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig index 6c680483ce..ee91ece0ec 100644 --- a/configs/qemu-riscv64_spl_defconfig +++ b/configs/qemu-riscv64_spl_defconfig @@ -9,7 +9,6 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000 -# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y # CONFIG_CMD_MII is not set diff --git a/configs/sifive_unleashed_defconfig b/configs/sifive_unleashed_defconfig index dc9313e572..62416a7c1d 100644 --- a/configs/sifive_unleashed_defconfig +++ b/configs/sifive_unleashed_defconfig @@ -14,7 +14,6 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000 -# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_MISC_INIT_R=y