{"id":2219806,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2219806/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260404140328.3724864-9-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<20260404140328.3724864-9-sjg@chromium.org>","list_archive_url":null,"date":"2026-04-04T14:03:12","name":"[08/14] test: Split out core of Fedora image into a new function","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"06363793d01c8130df82f4310a8709fdb34f24c7","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/1.2/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260404140328.3724864-9-sjg@chromium.org/mbox/","series":[{"id":498729,"url":"http://patchwork.ozlabs.org/api/1.2/series/498729/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=498729","date":"2026-04-04T14:03:04","name":"test: Convert tests to use FsHelper and DiskHelper","version":1,"mbox":"http://patchwork.ozlabs.org/series/498729/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2219806/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219806/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=IqhRo3YA;\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=\"IqhRo3YA\";\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 4fny5z129Xz1yCs\n\tfor ; Sun, 05 Apr 2026 01:05:11 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id BA1B284148;\n\tSat, 4 Apr 2026 16:04:13 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id CFE9480325; Sat, 4 Apr 2026 16:04:12 +0200 (CEST)","from mail-oa1-x33.google.com (mail-oa1-x33.google.com\n [IPv6:2001:4860:4864:20::33])\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 923C38416F\n for ; Sat, 4 Apr 2026 16:04:10 +0200 (CEST)","by mail-oa1-x33.google.com with SMTP id\n 586e51a60fabf-40427db1300so2043755fac.0\n for ; Sat, 04 Apr 2026 07:04:10 -0700 (PDT)","from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n 586e51a60fabf-4232eb3d0e4sm2348235fac.6.2026.04.04.07.04.05\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sat, 04 Apr 2026 07:04:06 -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=1775311448; x=1775916248; 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=dqwz1cwEmGOV/l/Yqgr12oKJNpxiUUnhBJ2Dz2GVEtM=;\n b=IqhRo3YAbH/Lp/OVjo5dDUViubJZwqpUouzc6BVcdX+VJsUPpH3oj3YqXiLONnE1l6\n sdqM7D9kSDUd5SW80ZLqk7cTw9aTRY3xcuy7l7MchuD3FJjFnwRBq0wH4/gGyHjplFJv\n iOy8o0yh0vJa+1ghttl0GSAvxm8FTYFNMGAeI=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775311448; x=1775916248;\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=dqwz1cwEmGOV/l/Yqgr12oKJNpxiUUnhBJ2Dz2GVEtM=;\n b=ZZ72x84wQpUNHr7jmQfRrlvdaq8LgB/eb+V/MDwOwARU2s/+UAQ8WP/h89B4ByMZ1F\n ruFYomMZ4FFaAEzL/pViiEi4dbF3BueNQwdu79Tqy1NIFogIQI0+F+tlxZC/URMrSXDB\n 1lKgS0/pAsUkeJ2xPD10U/swbEea20GrpZ2iaMjKH7TbSzsDbO1AS+beIuDf6VqZaCip\n FdBqlFjleNZbJlzZop7j/Dn6x1may7H367s1h1+9TpD+DWqkRRYrKL1uJgKSIKenCHWh\n ZVrcovex1bvQHii/mvkljuCSLve6VcvMqe2trp7pprPav0ZLZuyhkPhpjPxMO0LNZTzl\n D54w==","X-Gm-Message-State":"AOJu0YwOhgBArJAmYwTAkzRyXnl/d6NPigcNQijgfdxV6j5xujL0pVO9\n PIzyxNU2exK02L1LGfc0W8dmtdayPZY4JXxqDN/cvYVp7vwadVvqGbbEJ0xYjIdKaijvhjc3XY8\n thtg=","X-Gm-Gg":"AeBDievatO3MP3jaGKg7wxCgmauSZKNeXw13LploIFkf0AFLyHygxVqKRFVcYgsbYZs\n 7lYxBM9kNvk7oSOei0IHlQsMcOIExdFh47FQS7O1FrpK72B/qR+8ksHvRGUX6s6w2NRXoWD2y7o\n QpCWpPPp5NwTC6oq7tahjft0mBcgRHd8ViXGZbpnpjBmEJhXAK/yoPAddsSjVw6otoay7RCEFmv\n drHESEugfa4yeosUDFlhpfSf3yUJqDFfiuLisSZYV0p8XvhH64SLH2XL9opogRgh2JssFkz4dDr\n H3lJ+JvLdZ9boZ8nDvYE1bc81juBiKfwv6XqmZMHE0sEEfudkokPMGxMSEVPsajkn0O+b+te1nj\n ypMUA71ASyse6GxFsTYw8QefKRgeL0lrFXZrZt+pd6UZKRTZDfkjgT8mP90GZoJJqdc1JBTVnyY\n gbPSNUzpOLqk49JkCuZA==","X-Received":"by 2002:a05:6870:fb88:b0:422:fb29:8248 with SMTP id\n 586e51a60fabf-4231022965cmr3420668fac.43.1775311448477;\n Sat, 04 Apr 2026 07:04:08 -0700 (PDT)","From":"Simon Glass ","To":"u-boot@lists.denx.de","Cc":"Simon Glass , Heinrich Schuchardt ,\n Marek Vasut ,\n Martin Schwan ,\n Mattijs Korpershoek ,\n Tom Rini ","Subject":"[PATCH 08/14] test: Split out core of Fedora image into a new\n function","Date":"Sat, 4 Apr 2026 08:03:12 -0600","Message-ID":"<20260404140328.3724864-9-sjg@chromium.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260404140328.3724864-1-sjg@chromium.org>","References":"<20260404140328.3724864-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":"To permit easier adding of other images, move the Fedora-specific\nportions of setup_bootflow_image() into a separate function.\n\nSigned-off-by: Simon Glass \n---\n\n test/py/tests/test_ut.py | 71 ++++++++++++++++++++++++++--------------\n 1 file changed, 47 insertions(+), 24 deletions(-)","diff":"diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py\nindex a1c4af1b096..758f99cbfce 100644\n--- a/test/py/tests/test_ut.py\n+++ b/test/py/tests/test_ut.py\n@@ -159,27 +159,22 @@ booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\n fsh.cleanup()\n \n \n-def setup_bootflow_image(ubman):\n- \"\"\"Create a 20MB disk image with a single FAT partition\"\"\"\n- mmc_dev = 1\n- fname, mnt = fs_helper.setup_image(ubman, mmc_dev, 0xc, second_part=True)\n+def setup_bootflow_image(ubman, devnum, basename, vmlinux, initrd, dtbdir,\n+ script):\n+ \"\"\"Create a 20MB disk image with a single FAT partition\n \n- vmlinux = 'vmlinuz-5.3.7-301.fc31.armv7hl'\n- initrd = 'initramfs-5.3.7-301.fc31.armv7hl.img'\n- dtbdir = 'dtb-5.3.7-301.fc31.armv7hl'\n- script = '''# extlinux.conf generated by appliance-creator\n-ui menu.c32\n-menu autoboot Welcome to Fedora-Workstation-armhfp-31-1.9. Automatic boot in # second{,s}. Press a key for options.\n-menu title Fedora-Workstation-armhfp-31-1.9 Boot Options.\n-menu hidden\n-timeout 20\n-totaltimeout 600\n+ Args:\n+ ubman (ConsoleBase): Console to use\n+ devnum (int): Device number to use, e.g. 1\n+ basename (str): Base name to use in the filename, e.g. 'mmc'\n+ vmlinux (str): Kernel filename\n+ initrd (str): Ramdisk filename\n+ dtbdir (str or None): Devicetree filename\n+ script (str): Script to place in the extlinux.conf file\n+ \"\"\"\n+ fname, mnt = fs_helper.setup_image(ubman, devnum, 0xc, second_part=True,\n+ basename=basename)\n \n-label Fedora-Workstation-armhfp-31-1.9 (5.3.7-301.fc31.armv7hl)\n- kernel /%s\n- append ro root=UUID=9732b35b-4cd5-458b-9b91-80f7047e0b8a rhgb quiet LANG=en_US.UTF-8 cma=192MB cma=256MB\n- fdtdir /%s/\n- initrd /%s''' % (vmlinux, dtbdir, initrd)\n ext = os.path.join(mnt, 'extlinux')\n mkdir_cond(ext)\n \n@@ -197,11 +192,12 @@ label Fedora-Workstation-armhfp-31-1.9 (5.3.7-301.fc31.armv7hl)\n with open(os.path.join(mnt, initrd), 'w', encoding='ascii') as fd:\n print('initrd', file=fd)\n \n- mkdir_cond(os.path.join(mnt, dtbdir))\n+ if dtbdir:\n+ mkdir_cond(os.path.join(mnt, dtbdir))\n \n- dtb_file = os.path.join(mnt, f'{dtbdir}/sandbox.dtb')\n- utils.run_and_log(\n- ubman, f'dtc -o {dtb_file}', stdin=b'/dts-v1/; / {};')\n+ dtb_file = os.path.join(mnt, f'{dtbdir}/sandbox.dtb')\n+ utils.run_and_log(\n+ ubman, f'dtc -o {dtb_file}', stdin=b'/dts-v1/; / {};')\n \n fsfile = 'vfat18M.img'\n utils.run_and_log(ubman, f'fallocate -l 18M {fsfile}')\n@@ -211,6 +207,33 @@ label Fedora-Workstation-armhfp-31-1.9 (5.3.7-301.fc31.armv7hl)\n utils.run_and_log(ubman, f'rm -rf {mnt}')\n utils.run_and_log(ubman, f'rm -f {fsfile}')\n \n+def setup_fedora_image(ubman, devnum, basename):\n+ \"\"\"Create a 20MB Fedora disk image with a single FAT partition\n+\n+ Args:\n+ ubman (ConsoleBase): Console to use\n+ devnum (int): Device number to use, e.g. 1\n+ basename (str): Base name to use in the filename, e.g. 'mmc'\n+ \"\"\"\n+ vmlinux = 'vmlinuz-5.3.7-301.fc31.armv7hl'\n+ initrd = 'initramfs-5.3.7-301.fc31.armv7hl.img'\n+ dtbdir = 'dtb-5.3.7-301.fc31.armv7hl'\n+ script = '''# extlinux.conf generated by appliance-creator\n+ui menu.c32\n+menu autoboot Welcome to Fedora-Workstation-armhfp-31-1.9. Automatic boot in # second{,s}. Press a key for options.\n+menu title Fedora-Workstation-armhfp-31-1.9 Boot Options.\n+menu hidden\n+timeout 20\n+totaltimeout 600\n+\n+label Fedora-Workstation-armhfp-31-1.9 (5.3.7-301.fc31.armv7hl)\n+ kernel /%s\n+ append ro root=UUID=9732b35b-4cd5-458b-9b91-80f7047e0b8a rhgb quiet LANG=en_US.UTF-8 cma=192MB cma=256MB\n+ fdtdir /%s/\n+ initrd /%s''' % (vmlinux, dtbdir, initrd)\n+ setup_bootflow_image(ubman, devnum, basename, vmlinux, initrd, dtbdir,\n+ script)\n+\n def setup_cros_image(ubman):\n \"\"\"Create a 20MB disk image with ChromiumOS partitions\"\"\"\n Partition = collections.namedtuple('part', 'start,size,name')\n@@ -606,7 +629,7 @@ def setup_rauc_image(ubman):\n def test_ut_dm_init_bootstd(ubman):\n \"\"\"Initialise data for bootflow tests\"\"\"\n \n- setup_bootflow_image(ubman)\n+ setup_fedora_image(ubman, 1, 'mmc')\n setup_bootmenu_image(ubman)\n setup_cedit_file(ubman)\n setup_cros_image(ubman)\n","prefixes":["08/14"]}