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 2C2DDC433F5 for ; Mon, 7 Feb 2022 22:08:38 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D2BD583BBC; Mon, 7 Feb 2022 23:08:29 +0100 (CET) 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="LMoITyIZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EFBD183BBC; Mon, 7 Feb 2022 23:08:27 +0100 (CET) Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450: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 3628B838FC for ; Mon, 7 Feb 2022 23:08:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=alpernebiyasak@gmail.com Received: by mail-ed1-x531.google.com with SMTP id cn6so10523811edb.5 for ; Mon, 07 Feb 2022 14:08:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rgdf53Z2nqK95QmT86qhbalNQI3sXoyq9sk1retkQQ0=; b=LMoITyIZCqTqkoTmJdSk6+2xtJzFXSCjvWF2S/9obwVpyUUyz4SiKRpk1BCqEtRwrR 5CYuTXPt0/+cdn8+suSEh6r6myeXdleXIdUgSoUy4SEvyrAeyn07gnpyfOH8wCI3AzYN D1K+8K0L9TXEZkOGjf987J5C+XpSplIZZjzigC24V4vN1/6Cw6wuKS/4NclStjTpd7N/ uaNvGxH4mC6SCjK7CtGj0UOq5LMcdrdZwdw329YmQP2gA3jtIpOgnHck9jzxWETbGoL3 IMo2oAjj27KZw2XibVU7eifwpr9mKeIJhjPCpfqG7Sgn17I+V13AxS04q3l0plounrN9 lUHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rgdf53Z2nqK95QmT86qhbalNQI3sXoyq9sk1retkQQ0=; b=BNDSYIuQRUyZLbfNQhcF8ND5faBksNjSNX8DZQjnxfqWNDOfjWUPsB5EBvMLOgIudr KgTIj8WuBJN1OfdOLh2L+x7X8UrvfhBKr/c0dwGlukJCLU2GEEfC9zO1MlPXOLpR50N4 W3RubstaVgi9kO2rBhS32t7InOo0KoSO0hV8mmQPvgnK052e3P79ZuQBY5u9xJZvns3x QPMLBAzhG03ruGoiPD6QaxsBD7BaFa2X/f4F8Ov0+TtV05zgH6tlHTD0eK3Xo2H3cQh7 LJM5eY09gXZC7r9whR0j5lmi3/lu0QH9xFtH11ezCJPfgvg/c+voGs2LZ0TDRsZuPi9f dkAA== X-Gm-Message-State: AOAM533qPNkI9YNzgQEsnGvsJ9OzKbiuxEARZA0MjSLR4ngKytrElRSV hHOfuLM2qyVq/6peU7Mp/QeSwj7XBWE= X-Google-Smtp-Source: ABdhPJxXSTvY+Nfr/ycxZ9qzzE2rYF6PnSkIjhe9RDEUtqztOEd8jNpilby1cj0RyupJOiOJgn9MDA== X-Received: by 2002:aa7:cd18:: with SMTP id b24mr1566081edw.294.1644271703888; Mon, 07 Feb 2022 14:08:23 -0800 (PST) Received: from localhost.localdomain ([178.233.26.119]) by smtp.gmail.com with ESMTPSA id v16sm4081300ejo.156.2022.02.07.14.08.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 14:08:23 -0800 (PST) From: Alper Nebi Yasak To: u-boot@lists.denx.de Cc: Heiko Thiery , Jan Kiszka , Simon Glass , Alper Nebi Yasak Subject: [PATCH v2 1/5] binman: Fix subentry expansion for FIT entry type Date: Tue, 8 Feb 2022 01:08:04 +0300 Message-Id: <20220207220809.4497-2-alpernebiyasak@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220207220809.4497-1-alpernebiyasak@gmail.com> References: <20220207220809.4497-1-alpernebiyasak@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.5 at phobos.denx.de X-Virus-Status: Clean Binman tries to expand some entries into parts that make it up, e.g. 'u-boot' into a 'u-boot-expanded' section that contains 'u-boot-nodtb' and 'u-boot-dtb'. Entries with child entries must call ExpandEntries() on them to build a correct image, as it's possible that unexpanded child entries have no data of their own. The FIT entry type doesn't currently do this, which means putting a "u-boot" entry inside it doesn't work as expected. Implement ExpandEntries() for FIT and add a copy of a simple FIT image test that checks subentry expansion in FIT entries. Signed-off-by: Alper Nebi Yasak --- Changes in v2: - Split reused testSimpleFit code into a helper function tools/binman/etype/fit.py | 5 +++++ tools/binman/ftest.py | 33 ++++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py index 6ad4a686df55..38bc2a2d784e 100644 --- a/tools/binman/etype/fit.py +++ b/tools/binman/etype/fit.py @@ -237,6 +237,11 @@ def _AddNode(base_node, depth, node): self._fdt = Fdt.FromData(fdt.as_bytearray()) self._fdt.Scan() + def ExpandEntries(self): + super().ExpandEntries() + for section in self._fit_sections.values(): + section.ExpandEntries() + def ObtainContents(self): """Obtain the contents of the FIT diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 5400f76c676a..626df786c8c9 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -61,6 +61,9 @@ U_BOOT_NODTB_DATA = b'nodtb with microcode pointer somewhere in here' U_BOOT_SPL_NODTB_DATA = b'splnodtb with microcode pointer somewhere in here' U_BOOT_TPL_NODTB_DATA = b'tplnodtb with microcode pointer somewhere in here' +U_BOOT_EXP_DATA = U_BOOT_NODTB_DATA + U_BOOT_DTB_DATA +U_BOOT_SPL_EXP_DATA = U_BOOT_SPL_NODTB_DATA + U_BOOT_SPL_DTB_DATA +U_BOOT_TPL_EXP_DATA = U_BOOT_TPL_NODTB_DATA + U_BOOT_TPL_DTB_DATA FSP_DATA = b'fsp' CMC_DATA = b'cmc' VBT_DATA = b'vbt' @@ -3713,13 +3716,7 @@ def testPackOverlap(self): """Test that zero-size overlapping regions are ignored""" self._DoTestFile('160_pack_overlap_zero.dts') - def testSimpleFit(self): - """Test an image with a FIT inside""" - data = self._DoReadFile('161_fit.dts') - self.assertEqual(U_BOOT_DATA, data[:len(U_BOOT_DATA)]) - self.assertEqual(U_BOOT_NODTB_DATA, data[-len(U_BOOT_NODTB_DATA):]) - fit_data = data[len(U_BOOT_DATA):-len(U_BOOT_NODTB_DATA)] - + def _CheckSimpleFitData(self, fit_data, kernel_data, fdt1_data): # The data should be inside the FIT dtb = fdt.Fdt.FromData(fit_data) dtb.Scan() @@ -3752,8 +3749,26 @@ def testSimpleFit(self): self.assertIsNotNone(data_sizes) self.assertEqual(2, len(data_sizes)) # Format is "4 Bytes = 0.00 KiB = 0.00 MiB" so take the first word - self.assertEqual(len(U_BOOT_DATA), int(data_sizes[0].split()[0])) - self.assertEqual(len(U_BOOT_SPL_DTB_DATA), int(data_sizes[1].split()[0])) + self.assertEqual(len(kernel_data), int(data_sizes[0].split()[0])) + self.assertEqual(len(fdt1_data), int(data_sizes[1].split()[0])) + + def testSimpleFit(self): + """Test an image with a FIT inside""" + data = self._DoReadFile('161_fit.dts') + self.assertEqual(U_BOOT_DATA, data[:len(U_BOOT_DATA)]) + self.assertEqual(U_BOOT_NODTB_DATA, data[-len(U_BOOT_NODTB_DATA):]) + fit_data = data[len(U_BOOT_DATA):-len(U_BOOT_NODTB_DATA)] + + self._CheckSimpleFitData(fit_data, U_BOOT_DATA, U_BOOT_SPL_DTB_DATA) + + def testSimpleFitExpandsSubentries(self): + """Test that FIT images expand their subentries""" + data = self._DoReadFileDtb('161_fit.dts', use_expanded=True)[0] + self.assertEqual(U_BOOT_EXP_DATA, data[:len(U_BOOT_EXP_DATA)]) + self.assertEqual(U_BOOT_NODTB_DATA, data[-len(U_BOOT_NODTB_DATA):]) + fit_data = data[len(U_BOOT_EXP_DATA):-len(U_BOOT_NODTB_DATA)] + + self._CheckSimpleFitData(fit_data, U_BOOT_EXP_DATA, U_BOOT_SPL_DTB_DATA) def testFitExternal(self): """Test an image with an FIT with external images""" -- 2.34.1