From patchwork Mon May 10 06:58:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476165 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=aKIT75kq; 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 4FdsN94Pvwz9sXH for ; Mon, 10 May 2021 16:58:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7DB7B82EB9; Mon, 10 May 2021 08:58:46 +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="aKIT75kq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4CB6282EC0; Mon, 10 May 2021 08:58:44 +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-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (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 4523282EB5 for ; Mon, 10 May 2021 08:58:40 +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-ej1-x62e.google.com with SMTP id a4so22886793ejk.1 for ; Sun, 09 May 2021 23:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OuUiBRN+crsVMKbmMEWQDycsZ3WG+lAg6osNJIaQY/k=; b=aKIT75kqhJEduGeJRA8++OVfU4T2WzjadVRMMLwWGlbnr0bZos1StT4G4xGz0sugkU m3qqhqAJ1Y6I8VJubfQ85N9Pf9cAE1FcMNsReANGlvsMIaFU2AOBiHzF3nNTBlfuk7uS 43Y8RkiD8eBjk6/nWpqbDNZwm+rMj0LqJgXKQCM1XZco2IP2Sciqikzo2dYhqjIhNPQv oUnuJLtJ2/srwbmVVnZL4ZOiUjsMqOKmK75+/sMm7DEL2sfoQ6KX/hVJplbGyACTMHCO sjVrlRsnnbkJU1c+3PRm7oNxAGe18kOHqSsJLPUxd4oPs0VmzOPxvT2n2fFmIM2/SqIr K5xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OuUiBRN+crsVMKbmMEWQDycsZ3WG+lAg6osNJIaQY/k=; b=XslxYlFwMz6jNIKd1N7D/vS0U2jceew00U6/8JxDJqDjxu8ZUyFdwLqDAp/AOnlXry jYpmSw4rlOjOwCxpG6cQfslLn0yxrUdGLMYyCUiVEVCGEAHrYcgMm43cGNfkezivbpE+ 9ndYTFdjy6as9gs/qLwvbQ6ncAtE9w1XaUsjSScpL/yJdJONKncOPJaTwz4Ei9U6173M 2A3FHTpwnAAFXquI8lfP4PgLZRiWRbQfW1/ew089ApEp6IdlZ+/9SDr/nYk9boS4/we6 apRBY+durZFYvnO648+NnXnRI+dJaOsVd8bQZy58Ip+JQ6hEGZN5kzIT8kYqPSOzzlxt mjzw== X-Gm-Message-State: AOAM530AYqxGgJgO23vNAiRcJtl2rLyZ0X7eUZIhaIYnZcgQUc3RaHlR 2hRlT6Vkmdwd+Etu1YJ+3Fk= X-Google-Smtp-Source: ABdhPJzpmgy81M42e6VFt1MOVdf8G03L/ucotFA5uRyIXdnDZeFCLIBDefOPL+luFyfKm9oqOUn06w== X-Received: by 2002:a17:906:2a16:: with SMTP id j22mr23985523eje.397.1620629919923; Sun, 09 May 2021 23:58:39 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.58.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:58:39 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 01/13] common: kconfig: Correct a typo in SPL_LOAD_FIT Date: Mon, 10 May 2021 14:58:25 +0800 Message-Id: <20210510065837.2008556-2-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 --- (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 06:58:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476171 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=EArpz/+E; 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 4FdsNZ1MFzz9sXL for ; Mon, 10 May 2021 16:59:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6EBBC82ED0; Mon, 10 May 2021 08:58:52 +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="EArpz/+E"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4286D82EB7; Mon, 10 May 2021 08:58:46 +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-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) (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 38F5782EBB for ; Mon, 10 May 2021 08:58:43 +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-ej1-x62c.google.com with SMTP id u3so22804963eja.12 for ; Sun, 09 May 2021 23:58:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Lp3oxiRf9uV8Rm6hdVl6kUx83ootqYE5aMlyrAgrVZ8=; b=EArpz/+EqGPYGXepEbqhCszctM4bDbkCONR0uWYkgKXLRUtikuJkFx6Lav8qf7CYtd RpSRcKnYvIqZxVu4xTONQnxekkxyh7gssbp17Xz9D/Vs33ipPJ3iF9LUVri3JAAl8Bu+ vIcrIjXD867mH+aq00kW0dUMuRelNvvaVhI+LkSBHL7tVlzjnBy08ddWmUgE36VcJjdX 3Rnrf7IiVWAZAZYUW9ZmOQeHVgDcRpmz6dP3Zrmh0tKqbPJ0cqv4gt1vJ6378jrOMu4G IVYF23qgoVDbtck+/+gcOobdJWYU6YysjygV9Mdzzt2/JBVOHytW88mzLxSUjx+Ibg0h CX3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lp3oxiRf9uV8Rm6hdVl6kUx83ootqYE5aMlyrAgrVZ8=; b=CUMv9FB8mS8gm5k9pmC3XGwNmZFnjMWUbAFoX77bq7hfq6Iyd6ZcFUp+qwEzi58R3g 1ldIEp+UgjwvtHSd9o9DxnePip2k7Hj+GsA9UJCIEbotIwgXWNX/pLiovC8+AV+2iKM0 laKDmBu1HhBhxIY1LKNw9dt7J9z13zWAFid8yFTZjJAkm3bwP9sCUDcU/1MDccTKAuRs Ma1TL6UeDdKOZ2FXNceIXYaI7W6KWswGxVWf54HWj0qqsfxLarThzYt7RufrXcfDHqVu dhwFTL1RI6u+n00K1LitWElUxwvyK2Zy4PCcGE3gQ5ZtwUORy4Kk7PhVv/h8DFbu0bkN 8Kmw== X-Gm-Message-State: AOAM5316qCI8NC5JAmPHQ9NrQCjb6aeH9YAXfLJUQRxjKcVfae7qQPCt EsdbgpKZPIULltGX+sMjDy0= X-Google-Smtp-Source: ABdhPJwoudIhr2RsHcHO3YYsadg2BTy8SBby/zPBxaYe9uqeFX+CyBTvhOG/uiXB4qfhOH1S5JvABA== X-Received: by 2002:a17:906:994f:: with SMTP id zm15mr24514620ejb.24.1620629922955; Sun, 09 May 2021 23:58:42 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:58:42 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 02/13] binman: Correct '-a' description in the doc Date: Mon, 10 May 2021 14:58:26 +0800 Message-Id: <20210510065837.2008556-3-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 --- (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 06:58:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476172 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=pUeFHUW7; 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 4FdsNn5HwRz9sXH for ; Mon, 10 May 2021 16:59:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C47C982ECF; Mon, 10 May 2021 08:58: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="pUeFHUW7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 10F2E82ECE; Mon, 10 May 2021 08:58:51 +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-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (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 BB9D382EB7 for ; Mon, 10 May 2021 08:58:46 +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-ed1-x52e.google.com with SMTP id s7so12730432edq.12 for ; Sun, 09 May 2021 23:58:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=cUPKSLc9IsShD04D5TS5mvutNZWVuK0wQ6efMlOulGM=; b=pUeFHUW7xWAwhj8MvELsexn8oWMNwSwgN8l/g/t2E7dQ/LGaR1cv8O/cPkRLKHDtIH nH38V913csZjCGE+srq9y1xMJDHJ6QEff3rwH3/Ypo5S1klO4P9J0GwMJTJVndgHrf8x e3oW7ghGKMzez+KkP1RDY7720CuBnGPwjzG83eDH42C/l50aCjPbRBZ5Fk7lFVgPEWbr O0PlIypVgp1i5j53mACjaFdcjLMKUPCZfaHm+GkoBL9M8le7PmIC7VapPfCSVnKYRIEX 2eG9baJHfam4OG0zR2ybCwzfABQSixY1H6FHSSWHQ1fTrkUjmhNXVTQagIKvfrUl3aAN vKow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cUPKSLc9IsShD04D5TS5mvutNZWVuK0wQ6efMlOulGM=; b=dJm+mFpMgndT1bJqD/oGsyEOipxY35b2YdmeBXQ+HO3Uz2QsQd17h3uEHP69R00/oU TlbsSyymnPeQXn6xGx40K4x1DCYhjYOWZpgS0kaEaeTBIZRMfSLsWNCN7KtCGhaIL6A2 ZZmvuqc9en5OK5kYcAP5JWcTf6Xlf6NKLrTRnPnT9WJZb6MmhIU+C94fGYvyXRW5wUcE CkbVlK+z3jHY/FGZFzTbuk9psaEgYA+0n9BRFJiMIZXWAa1vtYV13KsLj1zY5vGIhIie skb5ECZIW7ZM4rm95dXJkT3iXjJ7fyBeBP/dVJ+KOwcfYYnVc0vqNL9HiyHRhG8eqS7Q 2kFA== X-Gm-Message-State: AOAM5333y1Bodq4bEprARcuQWbJPVKIP0760/GZwTKxiZVKfE1s12abF wbgyOkpNV7PNquCIMfRsXd8= X-Google-Smtp-Source: ABdhPJzZ4/ygPkkBtnAVPGfGvYNfKv7N0FSPWxWDGZKniPZnYPFoabhPp/PsJh6TqYbOIW68/DcgFQ== X-Received: by 2002:a50:f113:: with SMTP id w19mr26768274edl.46.1620629926277; Sun, 09 May 2021 23:58:46 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.58.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:58:45 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 03/13] binman: Correct the comment for ATF entry type Date: Mon, 10 May 2021 14:58:27 +0800 Message-Id: <20210510065837.2008556-4-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 06:58:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476174 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=MQdIpA+C; 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 4FdsP164ylz9sXH for ; Mon, 10 May 2021 16:59:33 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BBC6D82EDC; Mon, 10 May 2021 08:59:00 +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="MQdIpA+C"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B4B8082ED6; Mon, 10 May 2021 08:58:53 +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-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (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 05EBF82EC5 for ; Mon, 10 May 2021 08:58:50 +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-ed1-x534.google.com with SMTP id b17so17455165ede.0 for ; Sun, 09 May 2021 23:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BL+R78M3H0P+ynCzUsUFKeSMkaBVmQ9vrZW687u08+g=; b=MQdIpA+COIvVqxG3bjnDpQUoX5LwF2/xqbFltVDVSDC5uuftSeTVIVom/0SK5aDmUD 9lBn9HLiEfv1DjMeZc4xkbJNl0+JjB4wrsM8m9mAmkMAv42xwKHqIrfJdhaUErAUbT0r Ix6FiOKIlg5aC87ORUaJYbRpNpRukGim9KxK5tJHcDfUJSbSda+aDc58c77l4ygUsksX NPL2Q7wj0OaNaRui7eqWah8PerOtWagWnDAHFseKqENSLM8Rt4LU5GJAlaiboCEYw9hh ae6rwH/U/XRFxBNcPDDuId4mA38HzVmKwz3Wi1zy34Ec0CLBD77MJCWCHMsEjNIUNu9b Ff9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BL+R78M3H0P+ynCzUsUFKeSMkaBVmQ9vrZW687u08+g=; b=sBkYLZMN1kZo1VBMD282QHFNj3lZVnBKXR5EVicvV+2/ZL7Rsy78crI9WfNslpzifm 7U8o/l7RYi8D24LZt31zy/FqJD/xO2dsPh429tdS2GN4006bi25dXf8cnjj7wFmGIhCe kJQlYTLRK+ZEobMnx/pBgJgXXlrP/0Ss27Nfv+1b05v1jKOMIK1V8VButzMjisqmGDsh dmluyGb6wKORRHRst54jQiPO9nrkr90Huzn+UykJ/ms7HGcJ0hCY0jYudkvjcbGKcT+H QCb1iJ216iAIU4x7HD7q5v5tbx3MsEr1IOr0DzKuBPm36NyDS7YxG3Kfe4Lprk45d7k/ EYcg== X-Gm-Message-State: AOAM533X2wjjkFJS7ZUpyacR01y5O7AjxowL2FElSmHF59qyFPqsCiOi V7SadENepuDI74nAfqXMfjQ= X-Google-Smtp-Source: ABdhPJwa6DV137/aH5n2va+bmNZUk+IB0qk6uEQceme/LRY+jFJjDRBysiE2VBNY7Y/0/umIzBinXA== X-Received: by 2002:aa7:cc10:: with SMTP id q16mr7314783edt.53.1620629929679; Sun, 09 May 2021 23:58:49 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.58.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:58:49 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 04/13] binman: test: Rename 172_fit_fdt.dts to 170_fit_fdt.dts Date: Mon, 10 May 2021 14:58:28 +0800 Message-Id: <20210510065837.2008556-5-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 06:58: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: 1476175 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=Krw/qT5K; 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 4FdsPG5ZMWz9sXH for ; Mon, 10 May 2021 16:59:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2674682EE8; Mon, 10 May 2021 08:59:06 +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="Krw/qT5K"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2E4FE82ECF; Mon, 10 May 2021 08:58: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-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (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 6557782ED4 for ; Mon, 10 May 2021 08:58:53 +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-ed1-x52e.google.com with SMTP id r11so2570758edt.13 for ; Sun, 09 May 2021 23:58:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=NW8vPl3HAI+QsV0NFPHCvi6DeyzL3crN6oKQafreGaU=; b=Krw/qT5KDDqeqTi/UExlt3quKS5G0FfN5Q6Vm6VJAmFwWoXYmwYqJ1g6pW4mRSZZNK 3XvHnz2wUEUwfV7qvgfWo6VagksgGLmOa4knFkvrBrBoXE43M5dg24DJHdpvRYmLaPSl nfcWrK+1h9wvaEctNfugIj37f1aO8TpCfVE/EJwhhepai/swnBb9HQlJI/3ZYpRZiRHl R7vEaaCIEXuQM+K5zrAS4oYvS8UClyJyfUVVpuX48QtobUR6L9J1JKwF04N4ybEyWCFJ 9dxYseJU3p2eUWFGPdyY62qBhpTmuXewAjGPdY2a5ASizti4JEw//VpR1dDmRrbbkGLM Tayg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NW8vPl3HAI+QsV0NFPHCvi6DeyzL3crN6oKQafreGaU=; b=S0cAeNlC8r3AIsprf53gfDLqgCQ46rDrK+y350G4TyYC53WFE8GWgJ7BHBIwcXhXZe mOhzeIVbagFFfoGltczrNiiSaWPgwC+m4AqiPQR0NLz1zIu4Bdr5CRuPZCH/yHeDW0dD UApwKehGlKVM0Hmi6ITafjOo+T/3kHhGkj3NXBhr9qd5PlSrb0udMDG7cqc23DxrwGuJ SWVD7fktJkcJMj7kN4NI394OUQU5y3vHInKh4zXGp6gwQcQLA/Tmd02zayJZL5zLW1+n ep0dhsuRLFZyF7BI7k0+aoClPZTZNU1HME54oVroZcpTmQFJPxMM+kNVXP8RmExQdTow bjyQ== X-Gm-Message-State: AOAM5324LHfwzUGp2zkrjZbskbnGaMU6IxJ3bLzX51HH6z6F2WTCBXrI KUaGOs5ITEIzr/YBPV3isgM= X-Google-Smtp-Source: ABdhPJwwvM77ba9u/wiSpd9NVZl+IvK3PK3iMYD11P4lQ1rcY5ivEPYH5xk7e5WWRyJMH126QHBHaw== X-Received: by 2002:aa7:c150:: with SMTP id r16mr27184934edp.82.1620629933001; Sun, 09 May 2021 23:58:53 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.58.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:58:52 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 05/13] binman: Add support for RISC-V OpenSBI fw_dynamic blob Date: Mon, 10 May 2021 14:58:29 +0800 Message-Id: <20210510065837.2008556-6-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 --- (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 06:58: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: 1476177 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=Wkmkc20c; 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 4FdsPW0yfRz9sXH for ; Mon, 10 May 2021 16:59:59 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27BCD82EE9; Mon, 10 May 2021 08:59: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="Wkmkc20c"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 306D482ED1; Mon, 10 May 2021 08:58: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-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) (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 447AE82EB7 for ; Mon, 10 May 2021 08:58: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-ej1-x62c.google.com with SMTP id n2so22845787ejy.7 for ; Sun, 09 May 2021 23:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=dr/C7kNogRdq/qCh8qH8ymqxlIFoo98AslvVq633tuA=; b=Wkmkc20cLurxMY+MaYjopigRYI9beOZQk967QZvvFBMYjkp/KpHM090v8nbWn/w6uW gDXhetwXwDhePO+GqYG/j9VXoHHftNgIgzDiEECPjj6BSj0jeRgq/fy9r3Z2voyCqSy3 YCOOMCRP61jpo20MNFNad6P/8fBqWTDm3loic/qk3KBMrafcrkky5dDyMsvqQjilkJGt sFeOkLf67GpM1rnv/trUcKwKoNAot1OGMiOY2w+xap3tc81Kz775jkN3/ZUwN9J2IQ1g ZD7aafalfTlcqjR56aOxrUVDmVOM6878mFZqubk4WTOPUjClekZ7/jEdxijLdPMyP4sZ o1jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dr/C7kNogRdq/qCh8qH8ymqxlIFoo98AslvVq633tuA=; b=ROxxVu8kcrIH6ZuQPaqzYVrZSbiKxoAdOeTvs3uzKA0QLNi9JUonDuNdZGIUwIZwx2 9BPPNoq21hggOUWKtX/sbqKdjirXQure+pGLw3tBdNqLkvg+5kNr1elw3EcvYSB+s7+g lhTJpQBVvtx6WA+ZcsmBbvBdeAPrbaM1H4JxMsVbmWLl8RjAigKKpEdQkDxfLWi9eTO6 uG/gNpzImLC2O0s9h/ZZxMcjYSCH6c9gUzJv4pvA2JRk1e2WEUDZ1yHZjVzRWmDc99EF Y4srfa8/aRuk2qa/MozV59TTWHSEiVsM4gJ0YKoFb9UhGZUEgyDt0r/Az741ZO83s+lJ lpog== X-Gm-Message-State: AOAM5325gBTnBuhFeMlSBF8+CkvQvXYVSaaAmYg0L1vwMuyaFnkz46vO NRpTDJ4mTRlgJcPORk6yDiM= X-Google-Smtp-Source: ABdhPJw36dsZ6yUgLWMezNampV6j71wNWs+KhIhE3+ovnZM5SJ3KLf1dpfey5/rpNWX9kZXrgyaarQ== X-Received: by 2002:a17:906:270a:: with SMTP id z10mr23707255ejc.204.1620629935953; Sun, 09 May 2021 23:58:55 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:58:55 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 06/13] makefile: Pass OpenSBI blob to binman make rules Date: Mon, 10 May 2021 14:58:30 +0800 Message-Id: <20210510065837.2008556-7-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 06:58: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: 1476178 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=BE0rsNwg; 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 4FdsPn2SgMz9sXS for ; Mon, 10 May 2021 17:00:13 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DAAE982EFC; Mon, 10 May 2021 08:59: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=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="BE0rsNwg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0F89482EE2; Mon, 10 May 2021 08:59:05 +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-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) (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 9BFF582ECC for ; Mon, 10 May 2021 08:58:59 +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-ej1-x636.google.com with SMTP id u21so22791843ejo.13 for ; Sun, 09 May 2021 23:58:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Njqujok9h7HAkNhCe3JVzmwvr+ArfyBcCBb7ia+fd5U=; b=BE0rsNwgDUVg+rnCrCG75N6GTgSvar1VUwF3RvXm8cnpbJ19L48o+Be+ZOTEDoRWDH mL1Dy5ydgdcQ+FiMHWuYvKRlCtYv7DCbzSmJmNkrHx3TI+/VO/jMBReTFXYbmUuOwYly 6tLcQjIFhiC/RKm1gXsI9GDyDlLX9IBNOjGWyg83pPPDEwFOD+iqHuQgwrUFJ2/c5qWk IcZBoVHIc8QFUGMAtuHsyls2OuEyStOIA/uRrrXm8Jj3Vp1UQsjJL+J3OArGjOm+ZJuI 3U1/ofezehk7OSLZE6gLn9rCqUakJSL7p/SSYz/APOFY2BICn4jB0vgskSAJ6M0prlIc IUhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Njqujok9h7HAkNhCe3JVzmwvr+ArfyBcCBb7ia+fd5U=; b=d85e2c2QYPnoRH2saeTJCb+HiY1L2OTxYjedEXyhyYgD7TGS5IQwSszS/CuBHgTVcx aBpocCfw3YoaD43dn5XIw/3tU6AhpkSs5kvEqyCYbkiKRI9IHuRK/mfaMIQjBjUpveTn AHxU4vmU86d33Y5OzDyKWTGReB5wDeoZWvDcYw0v0s2j5dagm1xC0j6Gz/r6Fk+N2QzT zr+B9+w29UcbVrev925fIV10gVL7cDjYBzPA/R2knpHDxgEq/C1Hn5khm47cfPAgdOyb N3bg3ivRvQSrLE4DEgMI5kBpRFgm/2EuESYKE+oNL1S+p1Ah4yFuMaIMaLc8bN76HLkg f+xg== X-Gm-Message-State: AOAM533fVyrAsXihXmq0wdIa8qDhxwo2TmMU0BYlzzaZPpPwFPWm3Zv9 0IQIiDcoa1DEf3P99RiBUIk= X-Google-Smtp-Source: ABdhPJxCedO0R9Nqwx1rQvgD//ZllzmDPB0Q0UCbefMKkb4BeqFHIudSSOn5qT03S9oY8O20w5Ziiw== X-Received: by 2002:a17:906:e086:: with SMTP id gh6mr23091692ejb.201.1620629939296; Sun, 09 May 2021 23:58:59 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:58:58 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 07/13] riscv: sifive: unleashed: Switch to use binman to generate u-boot.itb Date: Mon, 10 May 2021 14:58:31 +0800 Message-Id: <20210510065837.2008556-8-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 06:58: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: 1476179 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=C92/ZIRJ; 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 4FdsQ04qMGz9sXH for ; Mon, 10 May 2021 17:00:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 010C982F02; Mon, 10 May 2021 08:59: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="C92/ZIRJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 64A9A82EE9; Mon, 10 May 2021 08:59: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-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (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 9FF3B82EE6 for ; Mon, 10 May 2021 08:59:02 +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-ej1-x62d.google.com with SMTP id l4so22832098ejc.10 for ; Sun, 09 May 2021 23:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=n9SfnBNK7++phCmtcKevbKVGSOVpGMUcv89wLidWWNI=; b=C92/ZIRJuqVOjhKVeQe1aEgFCew1NZzn6ZJwlk8EglTFHtjE2sM+b4HsvsKtu7SJP8 Qun37adLwQZR6cOqa+2A9LFArcgymLqzHStFsT+2C42TVL/xSglGw7pe79vSw97zRAPG 07l0vQv5Hz3kwEVJjJBWC+eiwXbHCC00wjQOAKsKfBbJHr8aEI9gbNvGijPpTVCZy/uH i4B0CgJRUYUlqZVB9NUjf+1eb5tR6irDkXqJ5MSajNj1zZ7VAHwLo84x5e4iRr/x/HCk BqYbts4D1HGjalUhceR4/MyTwt9jp5EKjWwERss65s7xQbxTMowVRJ1c6b9x9B8rHDzf bOEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n9SfnBNK7++phCmtcKevbKVGSOVpGMUcv89wLidWWNI=; b=nSO5ervnIbxCnRJyN0aN3/aWxy8/RFDqXyhhUxPNFL0MlJjne2KnMSyBk0eWIzODrE NxrrQqovOw46FZJfdKn0KS5wW23zZVg0auOV9Awm/iFMEfRHrafKHmj5nTTDP1I1gVP/ z3OzTb6VxKkqAWL2B4VY9eeJ2gjrLb1maSLfi+ahC048Kv2SMlIQno7Ckd/JGa5+rv8q 7R4MxjOnjShURCoi2oZSfFvBbPq+zg+uyT09GBk8al0n/O7qKppq3Bmqinhc/tZMWM6Q /UyqYQbUaHM+LbVStofNMMU33IGnj0nXS64z5U8r0HRy//yRxslXtlLuWly0kTQgP2Fq 1fIg== X-Gm-Message-State: AOAM533hF78tH9EZF2AeLKr1C6JmxTCdZF2bZHFgKuczW1hQUEbasfkf uiyvMnqG32XsYlx9genGOhniWrQ7s5s= X-Google-Smtp-Source: ABdhPJxT8H+yarSsFUyk8fWXr9CvOe3AnocKAzOOw8tVteHHLlJDz0mOoOdyyD5JZKI4tYSdGTnPSg== X-Received: by 2002:a17:906:355a:: with SMTP id s26mr23337571eja.528.1620629942252; Sun, 09 May 2021 23:59:02 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.58.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:59:01 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 08/13] lib: kconfig: Limit BINMAN_FDT for OF_SEPARATE or OF_EMBED Date: Mon, 10 May 2021 14:58:32 +0800 Message-Id: <20210510065837.2008556-9-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 --- (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 06:58: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: 1476180 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=fCbyV8bX; 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 4FdsQC3s2Cz9sXS for ; Mon, 10 May 2021 17:00:35 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8118682EF8; Mon, 10 May 2021 08:59: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="fCbyV8bX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D2F9882ECA; Mon, 10 May 2021 08:59: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-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) (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 B492182ED6 for ; Mon, 10 May 2021 08:59: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-ej1-x632.google.com with SMTP id f24so22846318ejc.6 for ; Sun, 09 May 2021 23:59:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vRkuh0+h6g9u18qN/5lNNAOHkoy+Bv+zoU53bqGT/p0=; b=fCbyV8bX2Eer0RBsbXnsM8miQ5nRyeI06PP+l0IFCz5q6Kg3gXj/KvF3n/O1LsbMCU xzdamb2K79/9aIS62XvzrVRTTHf3qSp0RVUrZUkPt8D7/3CKouhmcaMuAcOvHXbl0rbR eCrgvvdlSi7UhTaSZRMFgoHcYK4FcwlJm3wAe27GrJtidh2yPblWfwat84K5tELquBCS u+oyJFHfOqfoXcnOvuHA5cDMvEnN2GYHdsvHQ/vsZre3OeafpbHLJKpl6Pfv8ml4rQiS ArBao0raU+JqmkPtTTqMMFV2HUgY6Hg+hBJHpj+mDofJ7LwxWgibJhps96lTC2+bFgH8 j2Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vRkuh0+h6g9u18qN/5lNNAOHkoy+Bv+zoU53bqGT/p0=; b=d0OcL3ATyobG4HmBgYGBVkQdwJIakdqTS5nRr2iiBS2o0An1pPAZQUay7OWhPcs5WI FSDoc6EIgFQfcW2OOGwTejkisWa71AFGM5Tfbh21ayiMC5Lxe1e3kp2KhXl/CZ/sw5f3 vERHWuscYnZapIcgUYohNN1ynoQ7iZYD7ax/epu4HIYuVnDkjoAyx/yvpU8Tn7Evv76E HurRfIjl50Ai3lVOrA1kgDYLidkQj4vmclz9hQdQJdrk9dFGL4+yuk9LzE7izxdOGUL9 mfhKfYp3fCukwKaNHA+8S32I8cSMwiWigk/ZUYyUij8sA374lgAHKnmSGLZ1Hohl+lsY I4xw== X-Gm-Message-State: AOAM533ZWLL8urXhcHc84lxp72e/5UgI4n4j4FkRG1FB/t3LwqVDSsuQ SfnH9trh8UctvySf7ELO1FnAl9JK9NQ= X-Google-Smtp-Source: ABdhPJx+HQCOG5DywWvT9lKcx0e4G5HebYNUXOFn8p0zGDxONOEfUcFuyNtcS5wQBVA/+unabtYPoA== X-Received: by 2002:a17:906:d28e:: with SMTP id ay14mr24008544ejb.33.1620629945454; Sun, 09 May 2021 23:59:05 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:59:04 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 09/13] binman: Support packaging U-Boot for scenarios like OF_BOARD or OF_PRIOR_STAGE Date: Mon, 10 May 2021 14:58:33 +0800 Message-Id: <20210510065837.2008556-10-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 --- 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 ++++++++++++++++++ 2 files changed, 20 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 From patchwork Mon May 10 06:58: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: 1476181 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=Q4NZPUGg; 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 4FdsQS2Kpqz9sXH for ; Mon, 10 May 2021 17:00:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 47DFC82F0B; Mon, 10 May 2021 08:59:25 +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="Q4NZPUGg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E9B5382EEB; Mon, 10 May 2021 08:59:11 +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-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450: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 9935982EF1 for ; Mon, 10 May 2021 08:59: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-ej1-x631.google.com with SMTP id u3so22806481eja.12 for ; Sun, 09 May 2021 23:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=K+iJzDfHdPgV9ZdCLi+EqnbzWcp2tEBzhL8cdsrJTRo=; b=Q4NZPUGg7ScCCM1Kny3RvApeLWmF4aHWEinyd6KOQtn+efRyCng5/1hdJZRqV1Shcd CBomxVlb/tfRrch84wjPwBVLQaxhx1yAUkZnKFgPtKPsfQX1BSbSZdZUqjmrVgQLlKH/ TsxIBoKkTRky+1PGH3AS/Iq2Nj5sF4gFsWKIAmUnEht82nuyzzVhoPC84gSf2xxPLdHv n27Zn4rSyQQ9RvivXAbCQUYvT7lhMgOck3UQ343MB8PtK9GbFuzrDpFoHL46y75buxou XLi8CCI0UI3GU3TYUFXnA0HbkzyGuhrGWkAkZg9ONWDR4eVkpANqsRgFsnFqMAyO4/Af w/4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K+iJzDfHdPgV9ZdCLi+EqnbzWcp2tEBzhL8cdsrJTRo=; b=tnKpsnM/AmQUaeGbcu31ahUsptdsYaMJ+FWleDi5+3DEr2nizRFYpyIndTjYQU8O7w hS6JMPUYZaLntxpL9pA9mmbbQogdll8rcJMuMsHujfAL2eUT2sLRN7RlGZA+FFEe+5QB 6oMRagXsR4T9MyW3H3iPuWQ9TKpAnm2mNk+2tEDxc9CQkZFaBI6E+22yC/g10ROqr6Iu CEnf0E/MZHodjMtxMPaZhpR7BR92KbBYPD6KyLv+Ov2vK8cc8CW+UJSTUQdaH+o6WOO/ Ifq9M45y+jGpiiIQqNYOgC7/yhnOP57RwUmmfRJKx+HPDZqNonp5afpULb4I4KAByRlj 5KEA== X-Gm-Message-State: AOAM531WapK6dlFGyTyjnf9rE7qXZjzLPD1DNA4KGK4AwNU+hzXtTqo+ PxXqpjeQ6nBE2Xhh7vHL148= X-Google-Smtp-Source: ABdhPJx/ULqqopThNxWVhd60ade+FF0z8pzF17oc4KC73hqB29jPAiU84LL8n6SIagtwwPpFBSujJQ== X-Received: by 2002:a17:906:80d6:: with SMTP id a22mr23395286ejx.159.1620629948288; Sun, 09 May 2021 23:59:08 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:59:07 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 10/13] riscv: dts: Sort build targets in alphabetical order Date: Mon, 10 May 2021 14:58:34 +0800 Message-Id: <20210510065837.2008556-11-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 --- (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 06:58: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: 1476182 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=srTaVCLz; 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 4FdsQj1SzQz9sXL for ; Mon, 10 May 2021 17:01:01 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B4BA282EB9; Mon, 10 May 2021 08:59:27 +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="srTaVCLz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B216682EF3; Mon, 10 May 2021 08:59:15 +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-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) (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 E388E82EB7 for ; Mon, 10 May 2021 08:59:11 +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-ej1-x632.google.com with SMTP id w3so22870857ejc.4 for ; Sun, 09 May 2021 23:59:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nIZE/GOtFB7EXYcsi1mY/xcMRLRlvj+uDchxOuEWoxY=; b=srTaVCLzfoJoapx+93WqqHGSs9yVrZuYSXEws6i60CHb8XEwEcfynex49Ocsvrp3/y p9NHd2FfeFLR7PEspC6CJGM2H5R0ASam3eJXv02/KjklLZZnzNTXPWJH5wGjkPkdjtRt X3BwpRQPQSMeETgu6HUGjSbUfCTmW/jpOXEADlPOBYtpb0hgfnqkkKtOFSpY1sQJv5Ml BEz+0urtzd1kN0EGqvw3eAIV9D5fHJuVJBW/WtNS/QCcZgy8RMHbaTTYpHbxMUcE3D+k MWjQrpTbnJbY0o7jApiTjj/K3ClCQBepHMRn5WEgRHM5EsmZzPT2RHzJONdowZ2jVK58 LbCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nIZE/GOtFB7EXYcsi1mY/xcMRLRlvj+uDchxOuEWoxY=; b=i/7shgFq9rF8TawhxAa1PtHDTLTAWdO14yRa+D9VJ+ECS5UaQRRhd1yVJA+ZYj6Zuo V1Z40jM78EsQSpqMWevUZMZqTpu7vDMSpM8Y14QJsYcMyCktt2WoCQxpq9J/6ya6qitB XM4Fug6yURODXJSuSN42xw4syK7jXJwM9mM5tbTDLjvKRTO7WBhjWmaHA1UXhPAcZfGr 9xvUDxOw5p8vF28A6/LxeiIqR3bbXFOKPVrT0PlV2EpIV4jwVWqpTirtx7CetArVdZQh dK5EuOaPkXNs6Apr/dP/w/h17l3xJN2Vh5vYgzuFVlWhXEoj2xPUFDTx9RbWV4Ck/wH7 moeQ== X-Gm-Message-State: AOAM5337qRiGn8N7ghES1DxiFKGJ48NJs1SWTklnKE33yQdd6f6LKJsM EzqVQuZbVR/QC8SjUEPbrtU= X-Google-Smtp-Source: ABdhPJyLceJT5tVZUbqYMwnBc1t1V4S+s3YeCi/ESohr3Kio/t9iz/q4IHf89DG9xHDuLVGJJfFZrQ== X-Received: by 2002:a17:906:e2d6:: with SMTP id gr22mr24762373ejb.356.1620629951592; Sun, 09 May 2021 23:59:11 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.59.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:59:11 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 11/13] riscv: qemu: Switch to use binman to generate u-boot.itb Date: Mon, 10 May 2021 14:58:35 +0800 Message-Id: <20210510065837.2008556-12-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 06:58: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: 1476183 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=cwjuPwih; 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 4FdsQy14PJz9sXH for ; Mon, 10 May 2021 17:01:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BB06682F0D; Mon, 10 May 2021 08:59: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="cwjuPwih"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4FC8A82EF8; Mon, 10 May 2021 08:59: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-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) (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 1F4E882EED for ; Mon, 10 May 2021 08:59:15 +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-ej1-x62b.google.com with SMTP id gx5so22820751ejb.11 for ; Sun, 09 May 2021 23:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=o7txZaVVf98wOMvsx5+bip3lUd+JP1ZTpQFXWJHz3wA=; b=cwjuPwih7W27pf59sNTDr0alrkZH9q7DrDYa3+jUREVRKliuz3zcvHcC8izNgCDP0M SRBBBl156vcqHA+zjetWLP6tl4M5dxesJW6rDS9mruSd3MNbv0/H9UbtseiQ9saaJHgI sfEktEIl/0eherrHXS4/ydi3n5JgbeuR0jsh5cp+UzHbOiXDrJwszBRFSS+UcWlZ/g6c +kGBF/OuTFzHzb+MGT2vA2VqYDHYXkQjhvPKhC5JaX/2KW6n9IsTjfGmNnHKEmDIVJlH TTAZ18wslJ4NiISoVje1dVHD+R2xAQb29pboMbmg6lCp0eAF0UW7UAAHbk4sw2L1jITN bn6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o7txZaVVf98wOMvsx5+bip3lUd+JP1ZTpQFXWJHz3wA=; b=Ko4r13Rib5aRf2OVLT9BS4fQaXiJC9St1i/XKVjgnoMa6Yjqh0jJ6o/W3gxAHziFrS qsJvzmQ1cWbhEQg3AuNhmi0HDoAAa8BnIVIrcOBpnCgNC5TIddG6DQCZEJhVvWD7Oo3P bqbzhSGuuXKerX8nq/nwStqRlCSiEYfDfXQAxqSiffB9PN1GKjveTZseXeUA0Gmv0cZy V9y1avfL1ZF47Gp8PAPeqlxlsBqAW6MSgFeeF6sbl6tD/KvBDQCiSdQ5eMfeo+uDN3et E0tOsKtSvu7yTVD5111QvwH7oK9O8sHSbkLz1CSFIkxOKRbFq6Dv9EyJ+uKFBoydhf9A koVg== X-Gm-Message-State: AOAM533BpdLGuqaGzyrshOIFeQXKdJjkPAk2X8NocRsjL+O+l7IAUy3P RgJqOJKv5pmzbQTRC/unLuY= X-Google-Smtp-Source: ABdhPJw//PdYu8WhpzeP9BmKvvpgcKoobp8jsAh7NuRFkpxUw7c4cIygiVrCE1sgi4eV5RAJs8YcKg== X-Received: by 2002:a17:906:79a:: with SMTP id l26mr24015942ejc.268.1620629954717; Sun, 09 May 2021 23:59:14 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:59:14 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 12/13] riscv: ae350: Switch to use binman to generate u-boot.itb Date: Mon, 10 May 2021 14:58:36 +0800 Message-Id: <20210510065837.2008556-13-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 --- (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 06:58: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: 1476184 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=UE2grKyQ; 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 4FdsRB28sDz9sXH for ; Mon, 10 May 2021 17:01:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0F47182F13; Mon, 10 May 2021 08:59:32 +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="UE2grKyQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6A9DC82EB9; Mon, 10 May 2021 08:59:25 +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-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) (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 C7FC482EB9 for ; Mon, 10 May 2021 08:59: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=bmeng.cn@gmail.com Received: by mail-ej1-x632.google.com with SMTP id r9so22865041ejj.3 for ; Sun, 09 May 2021 23:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=h5gtE9xs+7STHuODAlov8RdPjxLWFzt14Oe3t1juHAI=; b=UE2grKyQS85p0XIf+3Vmkytn5pqyPCFduoyPC53BeBMoG4qEEbZtUIipwK1NhCWzxz zQLNQ5LJ98vs2+pkVFEJe4+51kuGcLXyRh4AAVXBXryikh+stBolPi/q6ki2f9MCaaB6 3+FpUbDKFqDIAaMNI5PCWEhTyqlaQCRyHiln71o5T6/XEDzdUPM5CD74U6a5xj7HKQh4 eLXJWabpXWbHokQmarNPEcfEuW07vVoG7ha9+oT8gNMU6vFFVINQG9mtOQHC2XmqKMB0 G1iKdRtUKlQxolr7zoUncmA+5OKfPNrExSIO4FJW35EyFaJGRvzGR0OSKsOKJ2LqBjZs zQeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h5gtE9xs+7STHuODAlov8RdPjxLWFzt14Oe3t1juHAI=; b=S1yGPzJ+0l7p9ACXHq9mIAbs1oqUKmEl0ZqmXsBc1JKLHRvbyzYDe8MTRoQZSJY6Ll d2WcRd12jN7ZE5oOA180kY+WU6y0YvEjI0YUIfQEAzAatgEV0jQZ3z1wyQZwt6t1CdkU gJVvmqbf+tV6YXZHFib/aM+BKK1fDKfjmjJiQazYE8R3+/fW9t5lBvXhvB1JX1x77yKw ASnuyNhbQGSf0PGJmqM3M9JWkh/Ft4ftnnvfue3IncDBTLc9uFchZhJ/mqpUNvLDgvzO 5m/tyxrVL0sjfD03rwiFBezEh642vElpzBeL0T2FQL/nj7QkkV6cuuw0Oic8yS4WctVp sOlA== X-Gm-Message-State: AOAM5336LpSD2KWcutx1aeQfaiw+6U3fF6Qprnzv5/dREPO7asirAWn+ CKRkawaUvUddCM//6o4onehnT1if/Qs= X-Google-Smtp-Source: ABdhPJzt56bv+DoQGdVwTRs1IE+zRyY2MlMOYWU2e6/6ZwMfBL0VTmk+yENqWPAgNhksGpJr2LT6aA== X-Received: by 2002:a17:906:7e51:: with SMTP id z17mr24642960ejr.92.1620629958480; Sun, 09 May 2021 23:59:18 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id c5sm4744944eds.94.2021.05.09.23.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 23:59:17 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v4 13/13] riscv: Drop USE_SPL_FIT_GENERATOR Date: Mon, 10 May 2021 14:58:37 +0800 Message-Id: <20210510065837.2008556-14-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com> References: <20210510065837.2008556-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 --- (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