{"id":2222688,"url":"http://patchwork.ozlabs.org/api/patches/2222688/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260413130007.1987326-3-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":"<20260413130007.1987326-3-sjg@chromium.org>","list_archive_url":null,"date":"2026-04-13T12:59:53","name":"[v3,2/8] test: fit: Avoid restarting U-Boot","commit_ref":null,"pull_url":null,"state":"new","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/20260413130007.1987326-3-sjg@chromium.org/mbox/","series":[{"id":499699,"url":"http://patchwork.ozlabs.org/api/series/499699/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=499699","date":"2026-04-13T12:59:52","name":"test: Refactor FIT test for clarity and extensibility","version":3,"mbox":"http://patchwork.ozlabs.org/series/499699/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222688/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222688/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=UOuwX+7n;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=\"UOuwX+7n\";\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\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fvSGb4qRnz1xtJ\n\tfor ; Mon, 13 Apr 2026 23:01:43 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id A85E8841FF;\n\tMon, 13 Apr 2026 15:01:33 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 9BC2D841D7; Mon, 13 Apr 2026 15:01:31 +0200 (CEST)","from mail-ot1-x336.google.com (mail-ot1-x336.google.com\n [IPv6:2607:f8b0:4864:20::336])\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 692EC84198\n for ; Mon, 13 Apr 2026 15:01:29 +0200 (CEST)","by mail-ot1-x336.google.com with SMTP id\n 46e09a7af769-7dbca22dbfeso2251754a34.1\n for ; Mon, 13 Apr 2026 06:01:29 -0700 (PDT)","from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n 46e09a7af769-7dc2696532bsm8369144a34.21.2026.04.13.06.01.25\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 13 Apr 2026 06:01:26 -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.6 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=1776085287; x=1776690087; 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=rJohr6U/rQ1BWdImYqelCwf68CJzOQHRgvLd10+2QfE=;\n b=UOuwX+7nowEMeIWu0/rnxBPMDTvG+zKjxm2JJtQ9jc6pjv2v4jJqkc6jqIyFdDunL0\n 950Z96yvtNIE6J6DhYrcYySrBlnGjNzzWnRRB9lXLB+1gV1o/y3UMhnU3hxHSWxNdBLh\n qlbwrBGeQve5Fb/VCCJIVvflQPl1itJrlYYuI=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776085287; x=1776690087;\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=rJohr6U/rQ1BWdImYqelCwf68CJzOQHRgvLd10+2QfE=;\n b=VCvakMqV52aYsW/WhO/nkYFO0Dvz1rbHFozBMrFbPlTqqqXJU+i/R51JcMqJUCBnjU\n /Fo/OjXjG5Ar+E3ULOAlwAX14lSWF5y/gFaLlQQsQmmFP4noCHlTuJCsNxrksBxiw/vl\n C8aahB5qZM7hdkYOW9TUXDCVV2KGiB09Ilkv9hxxQ19x5JtV8Zeobcl51dKJ2kgt+aKG\n o7lN3yhpObTclVvn2eyYsqeEyR7gQNPEi2XYRisKuSu7eUUUTZoKd9xugVI+3Ya9IjkK\n hDo2QKzZx1PeZjx+c1L4+5nz0X1t/LmwXNM0ibh0QrWAMUQIXqJxy3GxkB7PLRPxdR/y\n 2pHg==","X-Gm-Message-State":"AOJu0YxLPM9e39lepgzt481WGbHpvrNcipNtoHdjpCre8bdO5eQAIINC\n VH2PX1AEeJP4Nm2Tkhszm7lTMQD0M7h3+xBhvqZTLx/eKH+SCgifbKOSXMJ4txQ7XquLMyQx76c\n ly65EKw==","X-Gm-Gg":"AeBDiesv44PynMG1ECIQVF5P+ZTmlDkH2PsMOKw7Dwaw3RaAOIDuHA5tXZswDFGMOX1\n prsERiSWeq9RtphfZrfRAuwjnCQFOHG27wc+MkVOiwzx9V0bLCcovcCi15mszbufDybaav11yhC\n 6zk7mB/8VhMds4ed3ecwud06r0eShuqqZWgHm9R2071aXLz1lkk7IumpQ37PwDc889wVIcRNZ67\n S8vIKlbYEqDc7TOKSC7gesDq8Vku7FBqoVae5RSZj8QvnrS4DguRt45Tb+/EZGBsU9AUyKdZP5o\n wjOpSK3BAKB5g6gjcGuK0fcdDp5/mPYpMsvcXWnFU4Ksgv2wBKXAaNdyTp24dYuVS0HI7bAvd+0\n OQKP1jFXWvUZ2EzhkV395gGcWnqRBEKfiFsu2np6j4UqkpLPo/rV0XzBRuubYOeaP5Kv02M+42H\n BBYQ+WFRgKdw/NQ8d7cg==","X-Received":"by 2002:a05:6830:675a:b0:7dc:3db6:eee with SMTP id\n 46e09a7af769-7dc3db62270mr3433149a34.20.1776085287283;\n Mon, 13 Apr 2026 06:01:27 -0700 (PDT)","From":"Simon Glass ","To":"u-boot@lists.denx.de","Cc":"Simon Glass ,\n\tTom Rini ","Subject":"[PATCH v3 2/8] test: fit: Avoid restarting U-Boot","Date":"Mon, 13 Apr 2026 06:59:53 -0600","Message-ID":"<20260413130007.1987326-3-sjg@chromium.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260413130007.1987326-1-sjg@chromium.org>","References":"<20260413130007.1987326-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(no changes since v1)\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 71c98be27cf..4a19bd5cb49 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":["v3","2/8"]}