{"id":2215581,"url":"http://patchwork.ozlabs.org/api/patches/2215581/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260324194323.2335679-2-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260324194323.2335679-2-sjg@chromium.org>","list_archive_url":null,"date":"2026-03-24T19:43:16","name":"[1/6] test: fit: Avoid restarting U-Boot","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d0d6ab449602f21f9e75924dcdc3ef0c88268fa5","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260324194323.2335679-2-sjg@chromium.org/mbox/","series":[{"id":497338,"url":"http://patchwork.ozlabs.org/api/series/497338/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=497338","date":"2026-03-24T19:43:15","name":"test: Refactor FIT test for clarity and extensibility","version":1,"mbox":"http://patchwork.ozlabs.org/series/497338/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2215581/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2215581/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256\n header.s=google header.b=j2IPQoCD;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=85.214.62.61; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org\n header.b=\"j2IPQoCD\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=sjg@chromium.org"],"Received":["from phobos.denx.de (phobos.denx.de [85.214.62.61])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fgL7k0FZMz1xy1\n\tfor ; Wed, 25 Mar 2026 06:43:46 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id D2C3E83A91;\n\tTue, 24 Mar 2026 20:43:35 +0100 (CET)","by phobos.denx.de (Postfix, from userid 109)\n id 767DA83A91; Tue, 24 Mar 2026 20:43:34 +0100 (CET)","from mail-oa1-x32.google.com (mail-oa1-x32.google.com\n [IPv6:2001:4860:4864:20::32])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id EA837807C0\n for ; Tue, 24 Mar 2026 20:43:31 +0100 (CET)","by mail-oa1-x32.google.com with SMTP id\n 586e51a60fabf-41c0aae84e5so2610842fac.3\n for ; Tue, 24 Mar 2026 12:43:31 -0700 (PDT)","from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n 586e51a60fabf-41c88218654sm3714784fac.17.2026.03.24.12.43.28\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 24 Mar 2026 12:43:29 -0700 (PDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham\n autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=chromium.org; s=google; t=1774381410; x=1774986210; darn=lists.denx.de;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=NILORe32emUD36Vj/AQChsmD1Reuak2r3d6DVAa7JJM=;\n b=j2IPQoCDPAvAgI9xsxK0MLGlkh3ywvT0cvzufDRuRImY9i5iTNH7FbhjSQf+Jh5tfw\n IIM3UHRJ8MmsUcOFAA4/WQsVsdemepdv6n5jnbtWEChBMOVEMwLDgnfVRQYn5+yGebcq\n Dn4WjTsRjmhI966uDoHOFO5xIaRab4Tl2rMso=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1774381410; x=1774986210;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=NILORe32emUD36Vj/AQChsmD1Reuak2r3d6DVAa7JJM=;\n b=RZTGOFJCo6E3/KmfV+KoinfbJEVK1Ntl7n+NE9X9AXfxvnppkYp42BqgnfXhtL7uDA\n lm1HBL8xluKkzjYMGMGs7+seJpRrlSYvza9NPZbbEew9AIqsyl8BKI4f/+2F0R1BQiqq\n 2UR7gc/qRLX/TkizPXQSK2f2IvuCHpt9EeKtj1A/5ZokQu85JGIsJBNizbAfRw6iV3BA\n r08WcVtR2Dx8y5pG6EZ59LZBWbpzEUDt9CoHkLBA/6xAU1FyXBZdUR9SKksQu1I5ob6N\n l6vRJYYwqT3VNDXDqYOZCF61VL0VZ8GeJQhnziUepXSSwPdD9CC8m91mwREIbnjAUmcS\n sIJA==","X-Gm-Message-State":"AOJu0Yw/3Gl7UIVecB/F9NbsYybDSuXffdmdYvBOVUZvRM2cs2ql5V4q\n PQKmRwQjIZcrw9LHL6UhGNdX8CqEfMhfoJMzRbyMY9zD5Ni+cSQUErhnqrTzpFNxKL2rsUXHDYm\n K3Nuvwg==","X-Gm-Gg":"ATEYQzzvMKIJtX/LC6qHTtTSeNzXNj2wAb91hzFNCiuOUOTn09tR/8ZXQ7zZpM96ny5\n 87NEShHRN5f21zjyoSM84O6AIprV7NY/7QPSiO28ZhwVs8PuGdzU4lWUG9XiZwltkwCnfwkMD/5\n m+fQo5/47sb6xnFDgj+cE8UzVQDdPl8t76BoQWlYSKf0W/5RbYA9RvGSZchR3ZLZYBHU/+c8+Yg\n mI+k2KjBpO6Gezm5k1b9amiTWF7ZyfuHv6iKD/SE+8Sv964k6R2hK3eRmjV63Kmu4YqIL2fP7tm\n 74kgeLIRuTfd8owYN531NHYpDOmpjkyUeHtcS22Cpmk3SeBMlfz1m+W2Xarni1zDXECL/knzJbf\n azidHHNDQWNk9BNBqWTopuUAFO5WZwwSf6BdJ+j1v9gVBdMf0wiB6xXlT4mChfaQyrEoe00e7V9\n 9CU0cql2Sjqo5JjWUamQ==","X-Received":"by 2002:a05:6871:3841:b0:41b:ff2c:de25 with SMTP id\n 586e51a60fabf-41ca6d72e23mr559771fac.9.1774381409824;\n Tue, 24 Mar 2026 12:43:29 -0700 (PDT)","From":"Simon Glass ","To":"u-boot@lists.denx.de","Cc":"Simon Glass ,\n\tTom Rini ","Subject":"[PATCH 1/6] test: fit: Avoid restarting U-Boot","Date":"Tue, 24 Mar 2026 13:43:16 -0600","Message-ID":"<20260324194323.2335679-2-sjg@chromium.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260324194323.2335679-1-sjg@chromium.org>","References":"<20260324194323.2335679-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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","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"},"content":"We don't actually need to use the test FDT as the control FDT. It slows\ndown the test since U-Boot needs to be restarted each time.\n\nInstead of restarting, update the test to clear memory before it loads\nthe FIT.\n\nRename the data-variable to fdt_data since is it no-longer the control\nFDT.\n\nSigned-off-by: Simon Glass \n---\n\n test/py/tests/test_fit.py | 29 ++++++++---------------------\n 1 file changed, 8 insertions(+), 21 deletions(-)","diff":"diff --git a/test/py/tests/test_fit.py b/test/py/tests/test_fit.py\nindex 619f73153a0..42aa3b76ddd 100755\n--- a/test/py/tests/test_fit.py\n+++ b/test/py/tests/test_fit.py\n@@ -104,6 +104,7 @@ base_fdt = '''\n # then run the 'bootm' command, then save out memory from the places where\n # we expect 'bootm' to write things. Then quit.\n base_script = '''\n+mw.b 0 0 160000\n host load hostfs 0 %(fit_addr)x %(fit)s\n fdt addr %(fit_addr)x\n bootm start %(fit_addr)x\n@@ -260,7 +261,7 @@ def test_fit(ubman):\n - run code coverage to make sure we are testing all the code\n \"\"\"\n # Set up invariant files\n- control_dtb = fit_util.make_dtb(ubman, base_fdt, 'u-boot')\n+ fdt_data = fit_util.make_dtb(ubman, base_fdt, 'u-boot')\n kernel = fit_util.make_kernel(ubman, 'test-kernel.bin', 'kernel')\n ramdisk = make_ramdisk('test-ramdisk.bin', 'ramdisk')\n loadables1 = fit_util.make_kernel(ubman, 'test-loadables1.bin', 'lenrek')\n@@ -284,7 +285,7 @@ def test_fit(ubman):\n 'fdt' : fdt,\n 'fdt_out' : fdt_out,\n 'fdt_addr' : 0x80000,\n- 'fdt_size' : filesize(control_dtb),\n+ 'fdt_size' : filesize(fdt_data),\n 'fdt_load' : '',\n \n 'ramdisk' : ramdisk,\n@@ -317,12 +318,10 @@ def test_fit(ubman):\n \n # First check that we can load a kernel\n # We could perhaps reduce duplication with some loss of readability\n- ubman.config.dtb = control_dtb\n- ubman.restart_uboot()\n with ubman.log.section('Kernel load'):\n output = ubman.run_command_list(cmd.splitlines())\n check_equal(kernel, kernel_out, 'Kernel not loaded')\n- check_not_equal(control_dtb, fdt_out,\n+ check_not_equal(fdt_data, fdt_out,\n 'FDT loaded but should be ignored')\n check_not_equal(ramdisk, ramdisk_out,\n 'Ramdisk loaded but should not be')\n@@ -351,10 +350,9 @@ def test_fit(ubman):\n with ubman.log.section('Kernel + FDT load'):\n params['fdt_load'] = 'load = <%#x>;' % params['fdt_addr']\n fit = fit_util.make_fit(ubman, mkimage, base_its, params)\n- ubman.restart_uboot()\n output = ubman.run_command_list(cmd.splitlines())\n check_equal(kernel, kernel_out, 'Kernel not loaded')\n- check_equal(control_dtb, fdt_out, 'FDT not loaded')\n+ check_equal(fdt_data, fdt_out, 'FDT not loaded')\n check_not_equal(ramdisk, ramdisk_out,\n 'Ramdisk loaded but should not be')\n \n@@ -363,7 +361,6 @@ def test_fit(ubman):\n params['ramdisk_config'] = 'ramdisk = \"ramdisk-1\";'\n params['ramdisk_load'] = 'load = <%#x>;' % params['ramdisk_addr']\n fit = fit_util.make_fit(ubman, mkimage, base_its, params)\n- ubman.restart_uboot()\n output = ubman.run_command_list(cmd.splitlines())\n check_equal(ramdisk, ramdisk_out, 'Ramdisk not loaded')\n \n@@ -375,7 +372,6 @@ def test_fit(ubman):\n params['loadables2_load'] = ('load = <%#x>;' %\n params['loadables2_addr'])\n fit = fit_util.make_fit(ubman, mkimage, base_its, params)\n- ubman.restart_uboot()\n output = ubman.run_command_list(cmd.splitlines())\n check_equal(loadables1, loadables1_out,\n 'Loadables1 (kernel) not loaded')\n@@ -389,21 +385,12 @@ def test_fit(ubman):\n params['fdt'] = make_compressed(fdt)\n params['ramdisk'] = make_compressed(ramdisk)\n fit = fit_util.make_fit(ubman, mkimage, base_its, params)\n- ubman.restart_uboot()\n output = ubman.run_command_list(cmd.splitlines())\n check_equal(kernel, kernel_out, 'Kernel not loaded')\n- check_equal(control_dtb, fdt_out, 'FDT not loaded')\n+ check_equal(fdt_data, fdt_out, 'FDT not loaded')\n check_not_equal(ramdisk, ramdisk_out, 'Ramdisk got decompressed?')\n check_equal(ramdisk + '.gz', ramdisk_out, 'Ramdist not loaded')\n \n \n- # We need to use our own device tree file. Remember to restore it\n- # afterwards.\n- old_dtb = ubman.config.dtb\n- try:\n- mkimage = ubman.config.build_dir + '/tools/mkimage'\n- run_fit_test(mkimage)\n- finally:\n- # Go back to the original U-Boot with the correct dtb.\n- ubman.config.dtb = old_dtb\n- ubman.restart_uboot()\n+ mkimage = ubman.config.build_dir + '/tools/mkimage'\n+ run_fit_test(mkimage)\n","prefixes":["1/6"]}