From patchwork Wed May 5 14:15:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1474355 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ma78Izjx; 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 4FZzKX6f5gz9sSs for ; Thu, 6 May 2021 00:16:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 63E9982D09; Wed, 5 May 2021 16:16: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=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="ma78Izjx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 875B582D05; Wed, 5 May 2021 16:16:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) (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 2DFBC82B77 for ; Wed, 5 May 2021 16:16:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pf1-x433.google.com with SMTP id 10so2218852pfl.1 for ; Wed, 05 May 2021 07:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pBsAdNuRN+6tC81UPmkirBy1Ak+ScG8/+0uxmxf37TE=; b=ma78Izjxvpbv/CVCFulbF13BP2wT+FcHTHQC3gE8ws0pd4Q5p1qEyHTCPIKniS9zn+ agSmejkLTq3KWYaF4qH5i3D7eKVWL9SrY6UkqNw49j6E5EaDG25+oyaa9BLG3z1Hg9cP g+O4jEspchR15ehVfpi5n2ZPZTTchFA+9x3aSogCEBUDMwKI60ZaCOiAZnr7+AYpDMA0 IMRh/gsYs8QyjpaiJWh76Rx1BgO8O45UpiMEh47oLECnEo6mazvqoOXyM+1GE8+AAuE3 L4at7VEUhijuoIp/WKEcn8uo214ac39rH0Zy3zs+xs7vDGRps4kvOdq98FskUJj7Sq3a is2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pBsAdNuRN+6tC81UPmkirBy1Ak+ScG8/+0uxmxf37TE=; b=EELiYo9yT2p7T7yxObD/D/aYGEUJWwu8wFet5D8Nzhd/dYtleNrIZKizwZk8yDS8/p jutA8EHKP2BeKrqxrg346nHoVI2tbNygj8FExjTL9esRXymo+PmsvV+MOpMr7ulQ8uoE DSC0O4IzCFjJlLVRicYY5LWjMyFUoOJL6tlVCeKA8MzzncRmo4UFI0WycsJ5jMChCU2j SliFM3K94ISCPNUlAJZUyz6zD7InH95hsip4oaOkmogyMWZOO4oI7r99Uo4oRmFl0QfL XoCupBwknQBg89dnCSds9h00zMn/FoG3jUjLx6y5YXvQTkAbZkho4yRJlqRq40rhXMRP AGow== X-Gm-Message-State: AOAM532lVg9g6hJ4zXTqyBSgA7hunzTqXBwtjwUf5Q4ataYL791uLszn 4QZ6JQ9axZn2ndqyFw3xwcc= X-Google-Smtp-Source: ABdhPJzBTEMw/0lZW5a93fv6O/Qc85TulwwreYbHmx1maJfp4Cw2a/znPosIvs/+zIXuII02lTOhzg== X-Received: by 2002:a63:e63:: with SMTP id 35mr28205238pgo.27.1620224168740; Wed, 05 May 2021 07:16:08 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id t10sm7831482pju.18.2021.05.05.07.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 07:16:08 -0700 (PDT) From: Bin Meng To: Simon Glass , u-boot@lists.denx.de Cc: Rick Chen , Bin Meng Subject: [PATCH 1/9] common: kconfig: Correct a typo in SPL_LOAD_FIT Date: Wed, 5 May 2021 22:15:49 +0800 Message-Id: <20210505141557.23901-2-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505141557.23901-1-bmeng.cn@gmail.com> References: <20210505141557.23901-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 --- 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 Wed May 5 14:15:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1474356 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=QHNRPemc; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FZzKv4zsqz9sSs for ; Thu, 6 May 2021 00:16:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A1B4A82D15; Wed, 5 May 2021 16:16: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="QHNRPemc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1F54482D16; Wed, 5 May 2021 16:16:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) (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 6C39082B77 for ; Wed, 5 May 2021 16:16:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pl1-x634.google.com with SMTP id n16so1166896plf.7 for ; Wed, 05 May 2021 07:16:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4UD2xNv4q7OmGFxek38MfimhR+M4dGkxHRVb5FIrPmU=; b=QHNRPemc1XYYb05rT9FaBS2Aj5nTEHLWaAFjFJQcZ5YcwMNWEEyYCIycaDh1ylWF7P WFsZHFZRjSnuxu8UBSSwB0qTghsJUUx0rtYo7prZsRfshfyxBqXpaT/GYsEryeRMED2H Ax+fBZGYV6E4eaQCtcA7RPE4nC/1mYunwIjqgfqm4HIcqUOQHugn+/Jg4eHFsxhBB12o F9l2M9NfpQE9gd1jJ/NTz8cosWqNNPJ5JnZBvOS5lnEF8+BMNuF0TMhDfj+emKD8x61S xdjLnb71keXGt5D0W9pjMMV0nWjSe2F/iVC7XFyqeG9PtC+Bn0QGD9rklXHCwUiGz0gB UoHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4UD2xNv4q7OmGFxek38MfimhR+M4dGkxHRVb5FIrPmU=; b=J9qjYu4iyJ9RpO6nLxMvMAASyRuP0JzINoYxliVlTBN2uQH4uqLXN+j6HVkpKCqNgd pXImBAPq5p97yqhpVL8KAea8TZGovglRkZEITp9xJyvnC4YisMTabv5eFK2TCCrwpr4m EniITZ6ns+dzRn8jQvmCdvG79BmF59m0rqIjPJFumvOtGHLB8D9DiILrQEZoFRzsNpa7 2mUq69+ZZj+XydS5X9JHJlxGv28yCqSyKZnJ4N6O9bUKy6VuVKyWVwzfEyHASy+Np5y6 Ap74qgDNAEdlbNKlLI7ojcTYM0okHJ79I5zra/IIMzDsLl3UHNT4DQuSmGRT7SQD3i3v n8fA== X-Gm-Message-State: AOAM530ZfVy5cqmnInfBGWt3EyYTF7KI2bv5b0tj1hE6EusoFaYs7kB+ UOTfIeQDXVZJO0krZxTflpw= X-Google-Smtp-Source: ABdhPJw9QZ8iTbQ31Am36Ugt5apLsVhtZThKj1xHZLKVmlYBqApJW/08/XfsZGIWI7O18Rvysg2oZA== X-Received: by 2002:a17:90a:a61:: with SMTP id o88mr35224340pjo.8.1620224171560; Wed, 05 May 2021 07:16:11 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id t10sm7831482pju.18.2021.05.05.07.16.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 07:16:11 -0700 (PDT) From: Bin Meng To: Simon Glass , u-boot@lists.denx.de Cc: Rick Chen , Bin Meng Subject: [PATCH 2/9] binman: Correct '-a' description in the doc Date: Wed, 5 May 2021 22:15:50 +0800 Message-Id: <20210505141557.23901-3-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505141557.23901-1-bmeng.cn@gmail.com> References: <20210505141557.23901-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 --- 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 Wed May 5 14:15:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1474357 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=efMgj49t; 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 4FZzL16tltz9sRR for ; Thu, 6 May 2021 00:16:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2C21C82D27; Wed, 5 May 2021 16:16: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="efMgj49t"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3D50682D13; Wed, 5 May 2021 16:16:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) (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 4E2AB82D05 for ; Wed, 5 May 2021 16:16: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-pg1-x531.google.com with SMTP id p12so1865821pgj.10 for ; Wed, 05 May 2021 07:16:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DVDeggcalo0KMjTOGUcMgxgWz16PzPk+82RtQBPnk5Q=; b=efMgj49teViSXy1YndWvSLk827JUN8SoUvKIIClKgmXCEkP72KJ0QZDxZbSY1uEjDB wOW8InZYuaOykgtBh+zIV7e/Gz9DMq6gYI3tvg0FeF+68sDOzqWaQftvmiVMqoXwNL/b pt2jvBjWWD5AKRmiFfUQqLsAHhyGffE8WfsVsnoA4FuXWJJLvo12ttDao6UWJ+Y4HZ0M Yxsyb4rgFODuUBUrqzTua5h+pNAbQcXYxf6mvNZ0eJ3oqGz2pBln9xBl8Bcnx2FzdhNP pfY5KsYN1rk8BVVbpHkJp9ia+AyQqJ7oYra/RsXlS/9HXujkdmbui7AGdJV8AGfFyw3I Q84A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DVDeggcalo0KMjTOGUcMgxgWz16PzPk+82RtQBPnk5Q=; b=lUxkMjPrtIRLZENGnzhD0wafUEPWxti2v6evHSc05HBoM5yNNMfzGWpi6InCX3vygw j+Bi0CJTb0i/zn4lN/Awx/RSXwArQdoBJVukLKo3Og0lPO0wtIrTWlltaqfcNid4lGON 3zvWLPvJ8zsvGUlsA0Jqu+lC/MZR5uGEMQWVdDyVdiM3qkjIpAQxK0gsovH51idV7gUc YyOjUStXMqd0Q94ug3BlSS5HWbF5QVDxVbKDHfFbs54kZMiCz839TrHm5UJPAO/I0nps VMqXNXVSbi9p9kZ2cA+iuyp35ZFE8dHFnBuxCgXph/QfXKVwmRDp28RxZQSQ890V4y4c 04cQ== X-Gm-Message-State: AOAM5326Q+8R5YOcq1KRQb9gv9GI/N3ZVDhHAegi1u04va0Cu1H0aSh7 XM+WZw6gJr1cC3Rx1f/5NwE= X-Google-Smtp-Source: ABdhPJymT0rxRgujLIBzWmfvgXkfw0iYSntAgTCPXOuxNtEz41VSFqyhKVVI6cQYgzBtuIcs+hGM8Q== X-Received: by 2002:a62:e50f:0:b029:214:8e4a:ae46 with SMTP id n15-20020a62e50f0000b02902148e4aae46mr29765138pff.73.1620224173900; Wed, 05 May 2021 07:16:13 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id t10sm7831482pju.18.2021.05.05.07.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 07:16:13 -0700 (PDT) From: Bin Meng To: Simon Glass , u-boot@lists.denx.de Cc: Rick Chen , Bin Meng Subject: [PATCH 3/9] binman: Correct the comment for ATF entry type Date: Wed, 5 May 2021 22:15:51 +0800 Message-Id: <20210505141557.23901-4-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505141557.23901-1-bmeng.cn@gmail.com> References: <20210505141557.23901-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 --- 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 Wed May 5 14:15:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1474358 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YDngwAJe; 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 4FZzLG2RScz9sRR for ; Thu, 6 May 2021 00:17:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5750182D2E; Wed, 5 May 2021 16:16:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YDngwAJe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0B57082D1B; Wed, 5 May 2021 16:16:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) (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 B433882D14 for ; Wed, 5 May 2021 16:16:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pf1-x42c.google.com with SMTP id v191so2061645pfc.8 for ; Wed, 05 May 2021 07:16:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HBUtRm41zga2gSDoT1+ExI054r/3axmStjpeDhmCHBA=; b=YDngwAJeNayaGyg2BpV2Kr8hQ0w/kFuWKVZWyUuu+YeFCBXQMaV8DopUb79c9BuHWO dQABqpJ5zs414MLeGAliwGHCzaxIZdS+97KX/dqY/QEDU/JNScodpga1huKWARmQg8OU BBRijsCU9r15DPHKvwl/A35dIsEGf6dWlybC2fTxTtIJwHxMs/oAd/BqgS20YS/FJDBA ejSoTxpMJZZ2U6IqTUI9M0SlYVyRNCs8OzSPYhojt+wkwoheN+DX99wMBE0On1a4nzEr f3P1VCg94BHnH5rtiZVHFe6m00FyIy/RWX+FPeQIW0QoGRK73yFJIYYl912BF+zWgQFP rHpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HBUtRm41zga2gSDoT1+ExI054r/3axmStjpeDhmCHBA=; b=rvwimAwSvXQJ0M1g3g5plyOWhwBimeLAdyxJEzlkvnlIP3KoDZ8McEWESDy4ZKPgmT rjxv14aZCN+3UOESIk5SP0aLArfkkBjFbUGpCQ6RI1hHYfwd2ZhT+hcYLgDU0wNkNdbF C5dNw0mRQ4kuPPPn/SZ8fU1e1doGkMxsmKhStKUH8rVXcgCCSNbLJxoNBJLar25UkKXq aRZm91Z7B8R5P/tRzY8K+tRIjW/L1cq/ey/JzVoeHJTxJx9vTEe1Nm8CdxN+7CQ+oYhW OwgS6CxnM+UPfcFCwYZJ5nVyumsANqA1oM4/qJMNwPuEGCJRjM2DtEMh4H8kXxQLZ2ny sWlw== X-Gm-Message-State: AOAM533vmtRIwk5EzZVwegQWRsI5qJGJl5EmrpYFXlBzTZ4mOnKAf7Nz 58DDF9h/RD2AoijVnddde6cx4jgKNhg= X-Google-Smtp-Source: ABdhPJwdlx6ohrgj+DeV5LOKBGvOzP8rLEJAtCa8Kk5R4T9h1kP0WL7D5lr8aYyTQVqyN+y9YRoESw== X-Received: by 2002:a62:6142:0:b029:28e:b072:6b7 with SMTP id v63-20020a6261420000b029028eb07206b7mr12793154pfb.65.1620224176265; Wed, 05 May 2021 07:16:16 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id t10sm7831482pju.18.2021.05.05.07.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 07:16:16 -0700 (PDT) From: Bin Meng To: Simon Glass , u-boot@lists.denx.de Cc: Rick Chen , Bin Meng Subject: [PATCH 4/9] binman: test: Rename 172_fit_fdt.dts to 170_fit_fdt.dts Date: Wed, 5 May 2021 22:15:52 +0800 Message-Id: <20210505141557.23901-5-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505141557.23901-1-bmeng.cn@gmail.com> References: <20210505141557.23901-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 --- tools/binman/ftest.py | 12 ++++++------ .../binman/test/{172_fit_fdt.dts => 170_fit_fdt.dts} | 0 2 files changed, 6 insertions(+), 6 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..08f84cd32d 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)) @@ -3862,7 +3862,7 @@ class TestFunctional(unittest.TestCase): def testFitFdtMissingProp(self): """Test handling of a missing 'fit,fdt-list' property""" with self.assertRaises(ValueError) as e: - self._DoReadFile('171_fit_fdt_missing_prop.dts') + self._DoReadFile('170_fit_fdt_missing_prop.dts') self.assertIn("Generator node requires 'fit,fdt-list' property", 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 Wed May 5 14:15:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1474359 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=gGjQXi+G; 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 4FZzLV6NHYz9sSs for ; Thu, 6 May 2021 00:17:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 18B4182D2B; Wed, 5 May 2021 16:16:30 +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="gGjQXi+G"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7089782D29; Wed, 5 May 2021 16:16:23 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 181AC82B77 for ; Wed, 5 May 2021 16:16: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=bmeng.cn@gmail.com Received: by mail-pf1-x42b.google.com with SMTP id i190so2022520pfc.12 for ; Wed, 05 May 2021 07:16:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AmRmgkmCmJKBR6hPLyMXeVVm34NE5mRB3fgDqv/81UE=; b=gGjQXi+GHOkimViokDD7OxKYtj1cl6xg2KFQNazSnHeceXuRn6VA3HlDIJmEeo+rQK KkkzxLHQ/b1rL1/ABb/WjdjFFB8ZzD9oMMLFvECmFJpLq/mX4Fg83DDHBy+qDzonTDxa 40XUt2zmJGIkh2UpccmEdT/mjdUD+7VjzrVqKY3/Kw8CMII7FF2+qqF9YDwptkLotoFG Z9GsLX+uh4RpoVRiY7yNhYCpLi/pJRWf5/nlQqilfFkAdr7TXIMTqhdxu8cVxA4WbT8M N88Ys8z6/u9pvcGcF+uykr24C5o+vKVAupAv+Mc7Gf3eMUYQvVEvHecl6I2CfT4Hznan QZEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AmRmgkmCmJKBR6hPLyMXeVVm34NE5mRB3fgDqv/81UE=; b=GjfApcS3+Ggy5cm3G6wKh3ml8HU/uFrq8Tv9lVueIO9L7DddJab6p4m2OM7U3uvhh6 LlcudSI+PNpKfqTJgIbmLe2rwNDbZR+o0ct3qK/nkhGBVuotXKFZ3KyMamVy8+cSNMyi WghogXd5jpzzTzzwIKi5qLEScYUqX6ixLaeWu19VXNd7rzkoFYB+obYuWG2k9G6LbE0f KUZfLosXPIyu0GwZLD1kBd7s6XYd80TxLS44+Od73AF8TDWXsM3Grq8Wrw6QhxTsy8l4 hgAeHTa+KaApunU3NLOWi+DHHqxOkAWH83/e451uNUlUdSd/6Yy05RjYzD1ThQwl/GwS 7H7A== X-Gm-Message-State: AOAM531xXItOkDi1mI1Da4x68Xr1hDteSK26qVW8etnnOTVRGxxemiVa kt214wpCH4ksrUP+iBZ7o9RxwaL+S7M= X-Google-Smtp-Source: ABdhPJxGF4vouF9Gzz7h3pf6QfTAHiC0cGBCtnG0w8hPxg/KMvjTFg8Pz85g3AIXKf75167noToKLw== X-Received: by 2002:a62:6491:0:b029:28e:8c90:6b16 with SMTP id y139-20020a6264910000b029028e8c906b16mr16319037pfb.24.1620224178617; Wed, 05 May 2021 07:16:18 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id t10sm7831482pju.18.2021.05.05.07.16.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 07:16:18 -0700 (PDT) From: Bin Meng To: Simon Glass , u-boot@lists.denx.de Cc: Rick Chen , Bin Meng Subject: [PATCH 5/9] binman: test: Correct the name of 170_fit_fdt_missing_prop.dts Date: Wed, 5 May 2021 22:15:53 +0800 Message-Id: <20210505141557.23901-6-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505141557.23901-1-bmeng.cn@gmail.com> References: <20210505141557.23901-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 171_fit_fdt_missing_prop.dts. Signed-off-by: Bin Meng --- tools/binman/ftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 08f84cd32d..b0daccbc3b 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -3862,7 +3862,7 @@ class TestFunctional(unittest.TestCase): def testFitFdtMissingProp(self): """Test handling of a missing 'fit,fdt-list' property""" with self.assertRaises(ValueError) as e: - self._DoReadFile('170_fit_fdt_missing_prop.dts') + self._DoReadFile('171_fit_fdt_missing_prop.dts') self.assertIn("Generator node requires 'fit,fdt-list' property", str(e.exception)) From patchwork Wed May 5 14:15:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1474360 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=F/Uck6JS; 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 4FZzLm2BnDz9sVb for ; Thu, 6 May 2021 00:17:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7A7F382D3E; Wed, 5 May 2021 16:16:34 +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="F/Uck6JS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D9FA582D2C; Wed, 5 May 2021 16:16:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) (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 7B7FF82D17 for ; Wed, 5 May 2021 16:16:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pl1-x62a.google.com with SMTP id h7so1179515plt.1 for ; Wed, 05 May 2021 07:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ty7v3a4LpxfHGZOStR12XjWB6imfx5va9LZ88lvYhzA=; b=F/Uck6JSLd8vsMB7t15Zi+E3j6tGXv9jm9oZ6ezV/NKrugkqzQKHZmN5wiwqB6q0/N zPAPTcGnBpVDXg9y3/++ZsSabn21EGYjkq61UmqJEnkO4BuhVGRMjMnA+uVfc6tP4w7h Si6aa6dbQdNGxsvpojKtjdxiQpgtOHwA6guPytXsYS27b7DO+yYw73EGSSxLOYKK+mIZ DgtHWQyThraInfQ4vJwaDdl9wTqOQgr/wTCVCMXXeWSJ7p09rFyVx9VZopSJKMLojord aR+5RaGIyNzKw4yB0KtFLiWFc9pDkSr3FAwk99+wK5CYuD0o0TywjPWnxNFvyxmrPNJ4 jw4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ty7v3a4LpxfHGZOStR12XjWB6imfx5va9LZ88lvYhzA=; b=OsOtnBFwIqLJBR/vxKPwEj+QrgbG17GRGR5SRkiMjfSiIYF1kvk+pPC2Qk/f6bcJVD 2FQ4pulnlrTtWOpEXh0Pg/V36rZSjuyeXd93mgyidtqh2gzvo+/qExEOxbkAd2WE4niJ mlrgBVLuZe837DhVOOA23MgjHaa+iXRCpoHtPC8bp2I7TlOG+ESW2f7JP7i7u0JZiT2U Y0P/yj8o+OCsqnlgBB+Dvhxo3msUUO1YR+Bo797d9vhHsGEAoBnbWrV80XBwuIJYGGwe 05A4Lf2RazzVO4hAMZaTzq7GaejrEa78l9ErByBnZh+I5mG8O9+oF1OpNjWEVqhsk7fn m9Cw== X-Gm-Message-State: AOAM530EdFWa4nowtZ35KCjCPx+27G3AJyr4jKOJUh7+0cB0Dkv029yU ZLmieY/qBMesXepkgZK73L8= X-Google-Smtp-Source: ABdhPJzWC73bNQF/QDSKxKczmFk8IMuisKHq1WKA7cRy+lY5S+/eaWY/5rbCI0uBVoW88HDtiNiuIQ== X-Received: by 2002:a17:903:248e:b029:ec:9fd5:eef4 with SMTP id p14-20020a170903248eb02900ec9fd5eef4mr31463437plw.81.1620224181031; Wed, 05 May 2021 07:16:21 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id t10sm7831482pju.18.2021.05.05.07.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 07:16:20 -0700 (PDT) From: Bin Meng To: Simon Glass , u-boot@lists.denx.de Cc: Rick Chen , Bin Meng Subject: [PATCH 6/9] binman: Add support for RISC-V OpenSBI fw_dynamic blob Date: Wed, 5 May 2021 22:15:54 +0800 Message-Id: <20210505141557.23901-7-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505141557.23901-1-bmeng.cn@gmail.com> References: <20210505141557.23901-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 --- tools/binman/entries.rst | 13 +++++++++++++ tools/binman/etype/opensbi.py | 23 +++++++++++++++++++++++ tools/binman/ftest.py | 7 +++++++ tools/binman/test/201_opensbi.dts | 16 ++++++++++++++++ 4 files changed, 59 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..16c01a946a --- /dev/null +++ b/tools/binman/test/201_opensbi.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + opensbi { + filename = "fw_dynamic.bin"; + }; + }; +}; From patchwork Wed May 5 14:15:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1474361 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EaTLxX7k; 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 4FZzM12MPfz9sSs for ; Thu, 6 May 2021 00:17:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DEAA682D0A; Wed, 5 May 2021 16:16:37 +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="EaTLxX7k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C822B82D17; Wed, 5 May 2021 16:16:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) (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 CAE3782D29 for ; Wed, 5 May 2021 16:16:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pg1-x52d.google.com with SMTP id d10so1856874pgf.12 for ; Wed, 05 May 2021 07:16:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HMd4fJ5KjUTmQi9FxkExSHlto/1QVRI8Jg6e8XignOI=; b=EaTLxX7kC19PMKrhN52Eovrc9zeZAVluhQFEy+25XcUiic5O2UJcH7PXvbQLYVQwgn 35I4F7hPVIgIuY7+u78gjs7zA/YdDYxHIlEhVN+O0LbxSBLjfP9+/iTd27nYtreEEDfP IuneTMqPCvamZdaimKye/il6goDeuQB60CbPNwNV/E6cpBWDACsloq7Fieb1ke4OCjag 3bHaEQRwG6Kz+Ozx6fHYnOXYTB/Yb7BWynP5FfVKytFku2dFM0KrRYRM7v0Oq4P+FdOV lq0Wp6EzgS/KGybG/HYRXTkjWkChI6kxcH5nc6sy8l3YvYYkicpRGcr748hcMkoT5gi5 WKlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HMd4fJ5KjUTmQi9FxkExSHlto/1QVRI8Jg6e8XignOI=; b=W7E5kF8upikHJlfvPkCQVbv79m1L+3V0wrV2kn31cRA+sAnUzngC3JHOvRoKaNfqUd G8GRc0UWzU5XAKlKsG9dGBQAnozWkI5ETF9QyZlpOsAhaV7EvA5b9jO84hyM7N4IfxRs 4RoT9ftnw8t3DW6OmCs8rVkTLfKP9F2sLad7Leshiw+9QC2ReEisS5n6SmumBwqfdMJM vzEElpLWKlx+LFWb57WcjvP7EoZVlIHFLiRt5+tkyEIPIaYYTFR7j258zNt/76nT/zGQ mIHPIFdiymy0Z9cvTMikLhksD1YLQW0ki1yIQqvF0jJygeuaHmbl/G0Hc5SXJYVcI5/r hgqA== X-Gm-Message-State: AOAM531iwyjMWpJLFhWkbugNoDeby3gDl1OIIf1YJALV65nGHdg21E08 eggU86FdbVaTcHN3hZYvpwc= X-Google-Smtp-Source: ABdhPJwNfBpbrA3yBxYn73WkS2RI0j9hZWOdmUl8pOxbtNIRlUmSRxnIxaPehd9rm1e33wXI5gjvAA== X-Received: by 2002:a63:ff66:: with SMTP id s38mr28345547pgk.154.1620224183391; Wed, 05 May 2021 07:16:23 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id t10sm7831482pju.18.2021.05.05.07.16.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 07:16:23 -0700 (PDT) From: Bin Meng To: Simon Glass , u-boot@lists.denx.de Cc: Rick Chen , Bin Meng Subject: [PATCH 7/9] makefile: Update clean rule to remove files generated by binman Date: Wed, 5 May 2021 22:15:55 +0800 Message-Id: <20210505141557.23901-8-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505141557.23901-1-bmeng.cn@gmail.com> References: <20210505141557.23901-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 When using binman to generate an FIT image, these intermediate files "*.fit.fit" and "*.fit.itb" are generated from mkimage, which should be cleaned, and git ignored. While we are here, clean the map file generated by "binman -m" as well. Signed-off-by: Bin Meng --- .gitignore | 4 +++- Makefile | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e66aa864da..b9ebe0dfd7 100644 --- a/.gitignore +++ b/.gitignore @@ -40,10 +40,12 @@ fit-dtb.blob* /MLO* /SPL* -/System.map /u-boot* /boards.cfg +/*.fit.fit +/*.fit.itb /*.log +/*.map # # git files that we don't want to ignore even it they are dot-files diff --git a/Makefile b/Makefile index 404977efa5..a5701f6f9a 100644 --- a/Makefile +++ b/Makefile @@ -1998,9 +1998,10 @@ CLEAN_DIRS += $(MODVERDIR) \ $(filter-out include, $(shell ls -1 $d 2>/dev/null)))) CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h tools/version.h \ - boot* u-boot* MLO* SPL System.map fit-dtb.blob* \ + boot* u-boot* MLO* SPL *.map fit-dtb.blob* \ u-boot-ivt.img.log u-boot-dtb.imx.log SPL.log u-boot.imx.log \ - lpc32xx-* bl31.c bl31.elf bl31_*.bin image.map tispl.bin* \ + lpc32xx-* bl31.c bl31.elf bl31_*.bin tispl.bin* \ + *.fit.fit *.fit.itb \ idbloader.img flash.bin flash.log defconfig # Directories & files removed with 'make mrproper' From patchwork Wed May 5 14:15:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1474362 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=LI5mc09I; 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 4FZzMF09k5z9sRR for ; Thu, 6 May 2021 00:18:00 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 74F7982D4A; Wed, 5 May 2021 16:16:42 +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="LI5mc09I"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B6CD982D33; Wed, 5 May 2021 16:16:30 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) (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 467E382D1D for ; Wed, 5 May 2021 16:16: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=bmeng.cn@gmail.com Received: by mail-pj1-x1034.google.com with SMTP id lj11-20020a17090b344bb029015bc3073608so910626pjb.3 for ; Wed, 05 May 2021 07:16:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8mTNwnzw1irdJYy9vo8I6agrwbGhDludgFCF35daFV0=; b=LI5mc09IcgY2qMwsNSoJPb2F5b3QyYeumioBuAo/xF4um9P6vNeEuVDwYmodCGIdUL eg0rgz13glk7ffoS72bFs+mpaN7E1Y9DOp5z0r4hh0hMTrkXJydRVm/WxZqUJGTs0xqS rASi9ojlWFeZTUBuKwt/t3qNfWU2KdMAUIaoQQeImjIYjTCUNj10uVbcAqJ8POVT2+oC 5jp5nfWyfJDBN9v3njB9HY5rQRf4NP3DQg+AGVBuA5yJ03o/7Fc18Nc+eKy0HzAngMwL 6vL5FDOb2N7BljdrwY1lPXSBjFz+gPcgZHZliw6vDWcPeLnmXFrHoteVa3if2HefCpid 29GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8mTNwnzw1irdJYy9vo8I6agrwbGhDludgFCF35daFV0=; b=heJ4a906Ck7e1FP5Cwinvo3OXYep21k5C5X/dkddDSyObHjVF80YKG0/GRlJGi05Pj qBhCAa/LozFXHIrM7XvWQBUBiQOkojdxzUbxj8PKOkYhh8x0BPjBoU8S9yabRGGWVKib 14mhlprblBgpybsxdqgpkHQZjHKsimK62cgL12TjRaNrvd/vQDTw49ic13X2kLwSZpyx 6huwWZzOW5Ap3oTM6NPmCoiKrfS20AAmCMpxKULRXzFdI24j78g5mi/iE1dDBCHX2taw JKvFUmfs1KdxiDUwSdk1TAH0J6r5+G2vB1fBFxfxtS7xuGO4pQkfdq/K9Xo8OfIYC6DL kbQA== X-Gm-Message-State: AOAM533OaKWR+LqrPabTcxmnz3rt1DpAzA2y0NoOC2S41GqlVfDJ9lLV srVFxaBFYEjNbkp3VhcFTwY= X-Google-Smtp-Source: ABdhPJzAPBFL00rhPi38dFQtlORbWhYQPZxBy3C+bbjOlsGgCaeUTNE+vSZiQn923m/OCTo2ihuZLQ== X-Received: by 2002:a17:90b:956:: with SMTP id dw22mr9257653pjb.211.1620224185935; Wed, 05 May 2021 07:16:25 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id t10sm7831482pju.18.2021.05.05.07.16.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 07:16:25 -0700 (PDT) From: Bin Meng To: Simon Glass , u-boot@lists.denx.de Cc: Rick Chen , Bin Meng Subject: [PATCH 8/9] makefile: Pass OpenSBI blob to binman make rules Date: Wed, 5 May 2021 22:15:56 +0800 Message-Id: <20210505141557.23901-9-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505141557.23901-1-bmeng.cn@gmail.com> References: <20210505141557.23901-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 --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a5701f6f9a..c1ddcae22d 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 Wed May 5 14:15:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1474363 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=SIfgSKNl; 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 4FZzMT0fghz9sRR for ; Thu, 6 May 2021 00:18:12 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A1C4E82D50; Wed, 5 May 2021 16:16:45 +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="SIfgSKNl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6534682D43; Wed, 5 May 2021 16:16:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C789882D17 for ; Wed, 5 May 2021 16:16: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=bmeng.cn@gmail.com Received: by mail-pf1-x431.google.com with SMTP id e15so2050448pfv.10 for ; Wed, 05 May 2021 07:16:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uWybWKMal/h2EIqtl3cp8og4DkPcyrst39Y84/5Hh3g=; b=SIfgSKNlkoRCnc5f1GStEo9rtqV4Qv2Rbu8zXn8Ho+fbXAMHoJl9vF8ali7HNY9yFh sJKce11m6GbgUcK1w0U8u3NQAFV97M9iM+Hr6NJLzNzL4KfcS+IJVAw/WWlbFX9Y4lmX caCLSeN+4Clluvvzi2fOcG/P5brglSTBZwhzzbqa3DG4JrfPF6bAtEAtiwEhIMpWcJ45 K0xd8NrurEz1B5Rm/UKDWD4IdzVGTjvfjc+P2Yz1O2X9DUsREICTxOL1Z0Aho5KT549S V8i8VVrHjEEasDKEZhH0xO35KOYBDP7HkzFJqtjal9B/pp7w1OgDYvUHTJKberbd8usJ dlIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uWybWKMal/h2EIqtl3cp8og4DkPcyrst39Y84/5Hh3g=; b=IYbBHMwvW35G1QC7M77AJm02vXm3VB/87JifYNOwwdPX7LkxbLZzoKK+tmDpc93XaB JsjqCzz91vNM+2+hm6c9lvIje87Kum8YHEJkvpspSCSDzPICL8oWY5YMvcfHdBaNI2ey TFiTxdwJ5JIrhlllp8ilq1PlMNlxflVCyXQQdFvpYQJa25G8sQzRh/bXXWJ3YEWV3Gs3 nLzatLUrIsHpFbWVzsYRx5DdA5W+XgmQYF2iXNaMlLknY9WYcHyLZ3JUBv3nqZAOm6Uo v1bLmVvFmvrARAyJjSiN5vfkVm1laHzBVkQtIfJF94k9pzFCIs10dmoSBAutNTd7b4E5 ne+w== X-Gm-Message-State: AOAM531IloQH0tKfcpFfBvi5Mdni0T28svNiPSRskzaAl7+aWgSz8qge C2YLtP7OXCoJPjExJUZCa6E= X-Google-Smtp-Source: ABdhPJwQgtIavWGoLv7Z53s3lPY4/dWfwxEFxFCkTFXdSQeABd8PINHQPIzkNBTIOE4MUMNBjbALmA== X-Received: by 2002:a63:4e43:: with SMTP id o3mr28288820pgl.22.1620224188263; Wed, 05 May 2021 07:16:28 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id t10sm7831482pju.18.2021.05.05.07.16.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 07:16:28 -0700 (PDT) From: Bin Meng To: Simon Glass , u-boot@lists.denx.de Cc: Rick Chen , Bin Meng Subject: [PATCH 9/9] riscv: sifive: unleashed: Switch to use binman to generate u-boot.itb Date: Wed, 5 May 2021 22:15:57 +0800 Message-Id: <20210505141557.23901-10-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505141557.23901-1-bmeng.cn@gmail.com> References: <20210505141557.23901-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 --- 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..f2f8647b24 --- /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: blob-ext { + 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..b08652365f 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 if !USE_SPL_FIT_GENERATOR 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