From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 21C8CC05027 for ; Tue, 14 Feb 2023 20:35:42 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 88F6E8589A; Tue, 14 Feb 2023 21:35:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se 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=kwiboo.se header.i=@kwiboo.se header.b="abC+qgjd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A5712858BF; Tue, 14 Feb 2023 21:35:38 +0100 (CET) Received: from xvfrqvdb.outbound-mail.sendgrid.net (xvfrqvdb.outbound-mail.sendgrid.net [168.245.72.219]) (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 4622F85868 for ; Tue, 14 Feb 2023 21:35:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=mime-version:subject:references:from:in-reply-to:to:cc:content-type: content-transfer-encoding:cc:content-type:from:subject:to; s=s1; bh=G782zhPE1RuaQUc5vDMPtPcCIOqwLgxin0HXG35Y9wQ=; b=abC+qgjduIakgDiych0Soyk2aYwIb53Tn3h1EzPzv6ykTvTK87HJcNrvVn8SQ66eKp+K knXwmmsmefeB2wFb/hgT/96Mu3yF6+Om8JbqfM//SbhfaEqD8y6hVmFsHRo/iOijbuxyYH XaR9bFMBoMphKomU+MqQtX/XNU0GBZOcZJi3FVUs7iGmhIjHvrfGnfnvAgyklZ7tz0rfNh 7f4SvIEWsj1GlWuCj1ab6mTnIp/3U/iBlAwUJXDzfuewNJzdOqkY3JrMlMbJVH8g+a8zJx eh7iNJiseXcn569x8Nbx4xqOYo0nmgQWHz5BYZqebrNFzgkGCTWu+1Zjmztv7Sog== Received: by filterdrecv-7dfc98557c-7pwl4 with SMTP id filterdrecv-7dfc98557c-7pwl4-1-63EBF092-1B 2023-02-14 20:35:30.610044766 +0000 UTC m=+351382.534176967 Received: from [192.168.1.50] (unknown) by geopod-ismtpd-6-1 (SG) with ESMTP id uJn_KP3XR5qLBks1gqVMRA Tue, 14 Feb 2023 20:35:30.227 +0000 (UTC) Message-ID: <8cdb777b-dde5-67da-0a7f-46793b5738bc@kwiboo.se> Date: Tue, 14 Feb 2023 20:35:30 +0000 (UTC) MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.7.2 Subject: Re: [PATCH v2 1/6] binman: Add support for a rockchip-tpl entry References: <20230205202116.2891673-1-jonas@kwiboo.se> <20230214103300.690542-1-jonas@kwiboo.se> <20230214103300.690542-2-jonas@kwiboo.se> Content-Language: en-US From: Jonas Karlman In-Reply-To: X-SG-EID: =?us-ascii?Q?TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxA?= =?us-ascii?Q?fZekEeQsTe+RrMu3cja6a0h6pLJEcbKcjKpy2q4?= =?us-ascii?Q?3j5LwiAznNsMTtrmNeAkNCtTsUnT247RcUVuzbk?= =?us-ascii?Q?CcBiLV9RYknOM1dSvJY615FAfP9Plu0cW7y554X?= =?us-ascii?Q?3bO1QGkDLhNFR54VyTo69fTGa4kP=2FQRR0VM88fm?= =?us-ascii?Q?p=2F0UbsW3RSRfhdeTc0ayaq1tZ=2F7LRj2HGSF4pu?= To: Simon Glass Cc: Philipp Tomsich , Kever Yang , Joseph Chen , Alper Nebi Yasak , Quentin Schulz , Jagan Teki , Heinrich Schuchardt , u-boot@lists.denx.de X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Hi Simon, On 2023-02-14 20:48, Simon Glass wrote: > Hi Jonas, > > On Tue, 14 Feb 2023 at 03:33, Jonas Karlman wrote: >> >> The rockchip-tpl entry can be used when an external TPL binary should be >> used instead of the normal U-Boot TPL. >> >> Signed-off-by: Jonas Karlman >> --- >> v2: >> - rename external-tpl to rockchip-tpl >> - missing message moved to this patch >> >> tools/binman/entries.rst | 14 ++++++++++++++ >> tools/binman/etype/rockchip_tpl.py | 20 ++++++++++++++++++++ >> tools/binman/ftest.py | 7 +++++++ >> tools/binman/missing-blob-help | 5 +++++ >> tools/binman/test/277_rockchip_tpl.dts | 16 ++++++++++++++++ >> 5 files changed, 62 insertions(+) >> create mode 100644 tools/binman/etype/rockchip_tpl.py >> create mode 100644 tools/binman/test/277_rockchip_tpl.dts > > Reviewed-by: Simon Glass > nit below > >> >> diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst >> index 7a04a613992d..e177860a6a82 100644 >> --- a/tools/binman/entries.rst >> +++ b/tools/binman/entries.rst >> @@ -1386,6 +1386,20 @@ For example, this creates an image with a pre-load header and a binary:: >> >> >> >> +.. _etype_rockchip_tpl: >> + >> +Entry: rockchip-tpl: Rockchip TPL binary >> +---------------------------------------- >> + >> +Properties / Entry arguments: >> + - rockchip-tpl-path: Filename of file to read into the entry, >> + typically _ddr_.bin >> + >> +This entry holds an external TPL binary used by some Rockchip SoCs >> +instead of normal U-Boot TPL, typically to initialize DRAM. >> + >> + >> + >> .. _etype_scp: >> >> Entry: scp: System Control Processor (SCP) firmware blob >> diff --git a/tools/binman/etype/rockchip_tpl.py b/tools/binman/etype/rockchip_tpl.py >> new file mode 100644 >> index 000000000000..74f58ba8570c >> --- /dev/null >> +++ b/tools/binman/etype/rockchip_tpl.py >> @@ -0,0 +1,20 @@ >> +# SPDX-License-Identifier: GPL-2.0+ >> +# >> +# Entry-type module for Rockchip TPL binary >> +# >> + >> +from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg >> + >> +class Entry_rockchip_tpl(Entry_blob_named_by_arg): >> + """Rockchip TPL binary >> + >> + Properties / Entry arguments: >> + - rockchip-tpl-path: Filename of file to read into the entry, >> + typically _ddr_.bin >> + >> + This entry holds an external TPL binary used by some Rockchip SoCs >> + instead of normal U-Boot TPL, typically to initialize DRAM. >> + """ >> + def __init__(self, section, etype, node): >> + super().__init__(section, etype, node, 'rockchip-tpl') >> + self.external = True >> diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py >> index 062f54adb0ed..ed4b5c987557 100644 >> --- a/tools/binman/ftest.py >> +++ b/tools/binman/ftest.py >> @@ -90,6 +90,7 @@ TEE_OS_DATA = b'this is some tee OS data' >> ATF_BL2U_DATA = b'bl2u' >> OPENSBI_DATA = b'opensbi' >> SCP_DATA = b'scp' >> +ROCKCHIP_TPL_DATA = b'rockchip-tpl' >> TEST_FDT1_DATA = b'fdt1' >> TEST_FDT2_DATA = b'test-fdt2' >> ENV_DATA = b'var1=1\nvar2="2"' >> @@ -205,6 +206,7 @@ class TestFunctional(unittest.TestCase): >> TestFunctional._MakeInputFile('bl2u.bin', ATF_BL2U_DATA) >> TestFunctional._MakeInputFile('fw_dynamic.bin', OPENSBI_DATA) >> TestFunctional._MakeInputFile('scp.bin', SCP_DATA) >> + TestFunctional._MakeInputFile('rockchip-tpl.bin', ROCKCHIP_TPL_DATA) >> >> # Add a few .dtb files for testing >> TestFunctional._MakeInputFile('%s/test-fdt1.dtb' % TEST_FDT_SUBDIR, >> @@ -4097,6 +4099,11 @@ class TestFunctional(unittest.TestCase): >> data = self._DoReadFile('172_scp.dts') >> self.assertEqual(SCP_DATA, data[:len(SCP_DATA)]) >> >> + def testPackRockchipTpl(self): >> + """Test that an image with a Rockchip TPL binary can be created""" >> + data = self._DoReadFile('277_rockchip_tpl.dts') >> + self.assertEqual(ROCKCHIP_TPL_DATA, data[:len(ROCKCHIP_TPL_DATA)]) >> + > > nit: please put new tests at the end of the file Thanks, I will move the test to the end of the file. Regards, Jonas > >> def testFitFdt(self): >> """Test an image with an FIT with multiple FDT images""" >> def _CheckFdt(seq, expected_data): >> diff --git a/tools/binman/missing-blob-help b/tools/binman/missing-blob-help >> index c61ca02a35ee..e8c991206fe5 100644 >> --- a/tools/binman/missing-blob-help >> +++ b/tools/binman/missing-blob-help >> @@ -34,6 +34,11 @@ If CONFIG_WDT_K3_RTI_LOAD_FW is enabled, a firmware image is needed for >> the R5F core(s) to trigger the system reset. One possible source is >> https://github.com/siemens/k3-rti-wdt>>> >> +rockchip-tpl: >> +An external TPL is required to initialize DRAM. Get the external TPL >> +binary and build with ROCKCHIP_TPL=/path/to/ddr.bin. One possible source >> +for the external TPL binary is https://github.com/rockchip-linux/rkbin>>> + >> tee-os: >> See the documentation for your board. You may need to build Open Portable >> Trusted Execution Environment (OP-TEE) with TEE=/path/to/tee.bin >> diff --git a/tools/binman/test/277_rockchip_tpl.dts b/tools/binman/test/277_rockchip_tpl.dts >> new file mode 100644 >> index 000000000000..269f56e2545c >> --- /dev/null >> +++ b/tools/binman/test/277_rockchip_tpl.dts >> @@ -0,0 +1,16 @@ >> +// SPDX-License-Identifier: GPL-2.0+ >> + >> +/dts-v1/; >> + >> +/ { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + >> + binman { >> + size = <16>; >> + >> + rockchip-tpl { >> + filename = "rockchip-tpl.bin"; >> + }; >> + }; >> +}; >> -- >> 2.39.1 >> > > Regards, > Simon