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 56C80C001B0 for ; Mon, 24 Jul 2023 15:20:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8DA0C8684C; Mon, 24 Jul 2023 17:20:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="jH6p+fCM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 14B4586839; Mon, 24 Jul 2023 17:20:24 +0200 (CEST) Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 5A5A3867D9 for ; Mon, 24 Jul 2023 17:20:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-7836272f36eso169192939f.1 for ; Mon, 24 Jul 2023 08:20:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1690212020; x=1690816820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HnF3zE9LzTnHTIcBQpMXc/5A2Efncqvsoylrrih6tzw=; b=jH6p+fCMUkHVHAy8A539BIq4Nfr1LyZvXX1nDtzuzFvm2pgcfeBqknnjW4QGVwJATH rUBllxSwLxMebPs8qMXa1bknx+ttmeJFak5h5/ABQbmMViH1d070GBVtyrD/DXu01Q8L GioB5Ll+dMz3GmYkektt+/SGxmrjINJRjoG5Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690212020; x=1690816820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HnF3zE9LzTnHTIcBQpMXc/5A2Efncqvsoylrrih6tzw=; b=WmoJ4edl/3U+SOoaVQGJsR7AAEpvHiDE6wDagyBNaRqyVwqACde8qLylX3sDHM466N XmrslpBdZJca0c56Sihz2OC7gdml1uuW1Rq6um3MH58kfJUdZPWyGi4cl3u10bB7gzLo Ath55Qfpu73neOewp4pnKGt+duheBJXFSS4fxDKGqMCKmM2yMWXLHvRgpu5fgFBR1HN8 uzNXzdQPIa9e0cSLEyJYyjpeRJZYyOhkcSiqXPNjeQyraiFrw864maLrCWqRWxTLV2/E FPbBlpcpIE5XM3ZJW/29xTqyRTgva87BCgrgJ5SH1snA5sXCWuYQx3D3MvxVMjZ5C1gF oENQ== X-Gm-Message-State: ABy/qLZVEzkYKT+ZmErjgxlenPhMIapgDyoX41FT8Hbn8irOgjFTpj36 BA/xLLJMa9I30HIp7E5wUWcEhP1DeO5ZqdWdxoM= X-Google-Smtp-Source: APBJJlHw/0ailIoPY7yb0amUVrESkgaGztkS8JHo35lyRSN6VB9v1e9cKuMhcsj71WtHAUmhb7uz3w== X-Received: by 2002:a5d:8957:0:b0:76c:8877:861d with SMTP id b23-20020a5d8957000000b0076c8877861dmr252824iot.1.1690212019790; Mon, 24 Jul 2023 08:20:19 -0700 (PDT) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id l21-20020a02ccf5000000b0042b1a9f8480sm2885182jaq.35.2023.07.24.08.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 08:20:19 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Alper Nebi Yasak , Neha Malcom Francis , Peng Fan , Philippe Reynes , Stefan Herbrechtsmeier , Vignesh Raghavendra Subject: [PATCH 3/4] binman: Renumber 277...289 TI test files Date: Mon, 24 Jul 2023 09:19:59 -0600 Message-ID: <20230724152011.310087-3-sjg@chromium.org> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog In-Reply-To: <20230724152011.310087-1-sjg@chromium.org> References: <20230724152011.310087-1-sjg@chromium.org> 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.8 at phobos.denx.de X-Virus-Status: Clean These have ended up with the same numbers as earlier files. Fix them. Signed-off-by: Simon Glass --- tools/binman/ftest.py | 18 +++++++++--------- ...7_ti_board_cfg.dts => 293_ti_board_cfg.dts} | 0 ...bined.dts => 294_ti_board_cfg_combined.dts} | 0 ...o_type.dts => 295_ti_board_cfg_no_type.dts} | 0 .../{279_ti_secure.dts => 296_ti_secure.dts} | 0 ...ti_secure_rom.dts => 297_ti_secure_rom.dts} | 0 ...ined.dts => 298_ti_secure_rom_combined.dts} | 0 ...ecure_rom_a.dts => 299_ti_secure_rom_a.dts} | 0 ...ecure_rom_b.dts => 300_ti_secure_rom_b.dts} | 0 9 files changed, 9 insertions(+), 9 deletions(-) rename tools/binman/test/{277_ti_board_cfg.dts => 293_ti_board_cfg.dts} (100%) rename tools/binman/test/{278_ti_board_cfg_combined.dts => 294_ti_board_cfg_combined.dts} (100%) rename tools/binman/test/{279_ti_board_cfg_no_type.dts => 295_ti_board_cfg_no_type.dts} (100%) rename tools/binman/test/{279_ti_secure.dts => 296_ti_secure.dts} (100%) rename tools/binman/test/{280_ti_secure_rom.dts => 297_ti_secure_rom.dts} (100%) rename tools/binman/test/{281_ti_secure_rom_combined.dts => 298_ti_secure_rom_combined.dts} (100%) rename tools/binman/test/{288_ti_secure_rom_a.dts => 299_ti_secure_rom_a.dts} (100%) rename tools/binman/test/{289_ti_secure_rom_b.dts => 300_ti_secure_rom_b.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 40d2fd5da1b6..26913bb094ae 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -6930,19 +6930,19 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testTIBoardConfig(self): """Test that a schema validated board config file can be generated""" - data = self._DoReadFile('277_ti_board_cfg.dts') + data = self._DoReadFile('293_ti_board_cfg.dts') self.assertEqual(TI_BOARD_CONFIG_DATA, data) def testTIBoardConfigCombined(self): """Test that a schema validated combined board config file can be generated""" - data = self._DoReadFile('278_ti_board_cfg_combined.dts') + data = self._DoReadFile('294_ti_board_cfg_combined.dts') configlen_noheader = TI_BOARD_CONFIG_DATA * 4 self.assertGreater(data, configlen_noheader) def testTIBoardConfigNoDataType(self): """Test that error is thrown when data type is not supported""" with self.assertRaises(ValueError) as e: - data = self._DoReadFile('279_ti_board_cfg_no_type.dts') + data = self._DoReadFile('295_ti_board_cfg_no_type.dts') self.assertIn("Schema validation error", str(e.exception)) def testPackTiSecure(self): @@ -6951,7 +6951,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap entry_args = { 'keyfile': keyfile, } - data = self._DoReadFileDtb('279_ti_secure.dts', + data = self._DoReadFileDtb('296_ti_secure.dts', entry_args=entry_args)[0] self.assertGreater(len(data), len(TI_UNSECURE_DATA)) @@ -6963,7 +6963,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap 'keyfile': keyfile, } with test_util.capture_sys_output() as (_, stderr): - self._DoTestFile('279_ti_secure.dts', + self._DoTestFile('296_ti_secure.dts', force_missing_bintools='openssl', entry_args=entry_args) err = stderr.getvalue() @@ -6975,11 +6975,11 @@ fdt fdtmap Extract the devicetree blob from the fdtmap entry_args = { 'keyfile': keyfile, } - data = self._DoReadFileDtb('280_ti_secure_rom.dts', + data = self._DoReadFileDtb('297_ti_secure_rom.dts', entry_args=entry_args)[0] - data_a = self._DoReadFileDtb('288_ti_secure_rom_a.dts', + data_a = self._DoReadFileDtb('299_ti_secure_rom_a.dts', entry_args=entry_args)[0] - data_b = self._DoReadFileDtb('289_ti_secure_rom_b.dts', + data_b = self._DoReadFileDtb('300_ti_secure_rom_b.dts', entry_args=entry_args)[0] self.assertGreater(len(data), len(TI_UNSECURE_DATA)) self.assertGreater(len(data_a), len(TI_UNSECURE_DATA)) @@ -6991,7 +6991,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap entry_args = { 'keyfile': keyfile, } - data = self._DoReadFileDtb('281_ti_secure_rom_combined.dts', + data = self._DoReadFileDtb('298_ti_secure_rom_combined.dts', entry_args=entry_args)[0] self.assertGreater(len(data), len(TI_UNSECURE_DATA)) diff --git a/tools/binman/test/277_ti_board_cfg.dts b/tools/binman/test/293_ti_board_cfg.dts similarity index 100% rename from tools/binman/test/277_ti_board_cfg.dts rename to tools/binman/test/293_ti_board_cfg.dts diff --git a/tools/binman/test/278_ti_board_cfg_combined.dts b/tools/binman/test/294_ti_board_cfg_combined.dts similarity index 100% rename from tools/binman/test/278_ti_board_cfg_combined.dts rename to tools/binman/test/294_ti_board_cfg_combined.dts diff --git a/tools/binman/test/279_ti_board_cfg_no_type.dts b/tools/binman/test/295_ti_board_cfg_no_type.dts similarity index 100% rename from tools/binman/test/279_ti_board_cfg_no_type.dts rename to tools/binman/test/295_ti_board_cfg_no_type.dts diff --git a/tools/binman/test/279_ti_secure.dts b/tools/binman/test/296_ti_secure.dts similarity index 100% rename from tools/binman/test/279_ti_secure.dts rename to tools/binman/test/296_ti_secure.dts diff --git a/tools/binman/test/280_ti_secure_rom.dts b/tools/binman/test/297_ti_secure_rom.dts similarity index 100% rename from tools/binman/test/280_ti_secure_rom.dts rename to tools/binman/test/297_ti_secure_rom.dts diff --git a/tools/binman/test/281_ti_secure_rom_combined.dts b/tools/binman/test/298_ti_secure_rom_combined.dts similarity index 100% rename from tools/binman/test/281_ti_secure_rom_combined.dts rename to tools/binman/test/298_ti_secure_rom_combined.dts diff --git a/tools/binman/test/288_ti_secure_rom_a.dts b/tools/binman/test/299_ti_secure_rom_a.dts similarity index 100% rename from tools/binman/test/288_ti_secure_rom_a.dts rename to tools/binman/test/299_ti_secure_rom_a.dts diff --git a/tools/binman/test/289_ti_secure_rom_b.dts b/tools/binman/test/300_ti_secure_rom_b.dts similarity index 100% rename from tools/binman/test/289_ti_secure_rom_b.dts rename to tools/binman/test/300_ti_secure_rom_b.dts -- 2.41.0.487.g6d72f3e995-goog