From patchwork Tue Sep 23 19:38:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 409 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656325; bh=nXrcaquzAEnuG6ngj1mcxqryV8z0cvV3WYBCsbbNwlQ=; h=From:To:Date:CC:Subject:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=vPW0OEIvT7XFOXqVfYjI0pZQ6fbLTTjQrA6HjeW5W55bJTW1H8c8KDRrs/LB2eFx8 33tTecbQfZwU35DUcjIvRnhwPzercubuGHFYZChLOXmb/yK/AwjyLayug/McQx20yD emH2CHPWf9CwVduUo/oD3/ClKJqhUcPQknntMjv2BzoGHWAqz+zeZ+lymMYyL7sh7z mYw15+JVPndt7BjdqNEnKX0Kb4JBxXI+RE0f2+ghdv7iljZwTzbazAX/FBj+OAGCJV a2k3XxGIbJItnmJWPGGYBeMgR8s0gW8qmDsbiKnmodeNzL8ycdMRY3WMwWQVvIGoNp AACOYclTCK2fw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 5F38A67D32 for ; Tue, 23 Sep 2025 13:38:45 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id JkuMA_4tihLo for ; Tue, 23 Sep 2025 13:38:45 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656325; bh=nXrcaquzAEnuG6ngj1mcxqryV8z0cvV3WYBCsbbNwlQ=; h=From:To:Date:CC:Subject:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=vPW0OEIvT7XFOXqVfYjI0pZQ6fbLTTjQrA6HjeW5W55bJTW1H8c8KDRrs/LB2eFx8 33tTecbQfZwU35DUcjIvRnhwPzercubuGHFYZChLOXmb/yK/AwjyLayug/McQx20yD emH2CHPWf9CwVduUo/oD3/ClKJqhUcPQknntMjv2BzoGHWAqz+zeZ+lymMYyL7sh7z mYw15+JVPndt7BjdqNEnKX0Kb4JBxXI+RE0f2+ghdv7iljZwTzbazAX/FBj+OAGCJV a2k3XxGIbJItnmJWPGGYBeMgR8s0gW8qmDsbiKnmodeNzL8ycdMRY3WMwWQVvIGoNp AACOYclTCK2fw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 4E95567D02 for ; Tue, 23 Sep 2025 13:38:45 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656323; bh=dL13ttxIvfXkxG6DI1FxDzFIGVHVXgaZ4Nrg4pwrksA=; h=From:To:Cc:Subject:Date:From; b=Wkms1hGSxkWnyJH7exGTHlE/Z4RZBVUAx1M28ZPBXSVn6Ep3VPpWbKrCSfoduUlqQ wpKlerqrolrH+qh6JKM/TiJXkznhpiKiA0sEY4/8GZmG608CcfCTlQXabW6gL+BD0d JNh75l9N7cJ/PgGTFxe0dC+Pc1hdInzri5hft0bK2N59qoozm3G2DYkmQBI71H7O3l GZpF/zRRq28Un+ntH+UFVTzGMrEH3qtpAg/s6nZUrbmCdLTFfjXZR0W28XnnKXHA1W W0Lunwa6SDB4/gcjtEc9QXD61cNnbhDqsbewta1iz9q8pHySoT7jJhAkwPeARA6s41 sy1hkRXQ3CM0A== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id DA4E067A42; Tue, 23 Sep 2025 13:38:43 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id G_Fely9S1Etj; Tue, 23 Sep 2025 13:38:43 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656319; bh=wzJQB/4NLRIUEMVwOZZuOUTaPraueNdE/s3QcLs7z1o=; h=From:To:Cc:Subject:Date:From; b=IZg5EoeWdHaci1Xbh1gHPMa48FfrO3zDeUqcMGCgXAoFApg9XEAxufLPf+oispUDQ ZQwHeaw0YfakLN2dQLiq3C2GkM2lX06Rqx5TyKu9gJdeeTuFAoyHEvbev6gDBRRyyQ GIbtZioQt4hNost++8MKSVPJx6lWoxFTaOL/SuZmXQLRaiG1VcRv0NVkm/zprgndRd hg3zQ3mM6zpoEuutXcGjfc7MCrPOPofxtmxNBUlf2vZ/AFVkeLa6uJgzisiRfRPjtD djxgApDPJs4AQPh0ipjQPKGSlsdni7joRmYc3ACaixWw4MPWGGYtuD/CmeqCmNGAgh DaULDzZIODpGg== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 9710867CD3; Tue, 23 Sep 2025 13:38:39 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 23 Sep 2025 13:38:27 -0600 Message-ID: <20250923193833.1506358-1-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Message-ID-Hash: CYTSXRCUSE3INCNKSVGZRKZ6F3DMTR7H X-Message-ID-Hash: CYTSXRCUSE3INCNKSVGZRKZ6F3DMTR7H X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 1/4] colibri-imx8x: Increase the boot delay List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass A delay of one second makes it hard for the lab to interrupt boot, thus causing test failures. Increase it to 5s Signed-off-by: Simon Glass --- configs/colibri-imx8x_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 3d576da05b3..210bb83d5f8 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -24,7 +24,7 @@ CONFIG_REMAKE_ELF=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTDELAY=1 +CONFIG_BOOTDELAY=5 CONFIG_OF_SYSTEM_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-${fdt_board}.dtb" From patchwork Tue Sep 23 19:38:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 410 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656331; bh=3RYsMKSWL0KZQIBfEc9onk8CYVSBpdh7uKUemoRVOEM=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=DB0utivRf63WfuRGUCeUMM9eOiuLA0SqO6ylNOtLwoHcIY3ZwDwLTLegOZ2a9pxQQ TEbDsXz6N5BxQn58X7AdfglkXevgTObYdBM0f4lqv9DppgkYcOyLJhVpBX3e3avN0g iur/E9wXq48Mkf41dQxAKmdWxGeViiz7D09DmFmkXJequNEEGH1j8H98pRGuqGVbXs F+J5LeU1FkJwwOd9fY6LH77jrinS8ifinofnWw4oxmNbxOMubFUXIKTCpO6HUsu1ye NGt6nYJPZLi1fhzXwzBmgydoxjGTwnJC6UNASi9FaTAK9psYZC5JJhD7ybaSwdX9KY poLiw07Hr8iIw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 03F5067D32 for ; Tue, 23 Sep 2025 13:38:51 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id t6aG9DibV0Ln for ; Tue, 23 Sep 2025 13:38:50 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656330; bh=3RYsMKSWL0KZQIBfEc9onk8CYVSBpdh7uKUemoRVOEM=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=cqgclpBIq+ZZ7W8sQVo2oZWx5V7SgIzFKGCHKFlqQcNh82V+eCRES3AnA1z65EV7y hCcliV1BrTgRlD72Lhq7x907MMtnS6wMD4DKwlq36tGstfO097S+R7h+BHXbbNhQP7 XZju2//+TfRibLwQ5eELMHFU/FbNRFneMCSYYntIGALXsloxYOUrTixwCXI/Ujp8ST mcuZD4jk7lf6JpHN9WMwkuUCSssRn20QHMEIi3ZmhRvbzNDzUVV//h3r36Vv3agcKY osgMgh/It/dOivAHRd2eed8csUdS2n+L3vlolNdnzyo9JnA60WI3M8U9EkoALX/sCZ 0ofk71JzOAAvw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id E74C867D02 for ; Tue, 23 Sep 2025 13:38:50 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656328; bh=vrv5qhj9u1z4y/nPgup4xwlGBtA1L61Qtu750WT+lro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PR/ef6FI0KGv0GY1H1aoyDflJXf2BL8ZL74be7P+pltgyS8uR2FsJ8rLXOm21sMpp 02JZHM9FNbe7cciWseUpvltyZ3G1Ubky8UJJJyhXJHc7qubrpiob0yWIPhpezT0M7r bN3ZsKt5xMz9LxR6s1hgzypr7mnNewbxnuJC5TkiKEueoRhifvzNv36YdP7HcHQMp6 Ied41Iiu2KA4TI9sX80k/uh8xJA5Dc8LEyyouOFLPMtuzRzj6jxkKb/17bWh9v81Ct qVVo8sTlNsqX4KMqKr9p+HG+2vckvlEEKPcNg/UfxE1vwsUPw9nTxYXEHvp3cWoZXO bLtOROn13tqPw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 74AC367A42; Tue, 23 Sep 2025 13:38:48 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id COxnBJpVKnMa; Tue, 23 Sep 2025 13:38:48 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656324; bh=uiw0fbFtbZmyvxL2pDHeGku5UCY+RPI5c5XmKONzLRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g0VcclHv7rZyPjqgkTvxBO1QpquRj+YMElzQH2emDnT+bPECO1r6lHuEn5OF2PZBw 5K4bolGxZIPCnHd5c7CP2Zm8PLjOV8AInaaI3sxO+5FoTG+Qafx1zXhz91Qn2D9ZkE caaEwjBKbcr08ysL8TysXbSYr7AW4Vh46s9GuFJEd4EZvrkICf1PfnZ9Z2JeCqYspC kbcv6fA+LHmgFfkTd0KHVgrT/noLJRC11a2d15Jq38IDH/rsgRkudbw19tmkOaknxx o5jIaasaoa0Utvab+TgeAlvNCZ8bmVdUpXRFfkECb3s7FAgBJPzC5OyOGM3O3nMfu+ 7bXmA89MyQH4g== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 2BE8967CD3; Tue, 23 Sep 2025 13:38:44 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 23 Sep 2025 13:38:28 -0600 Message-ID: <20250923193833.1506358-2-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250923193833.1506358-1-sjg@u-boot.org> References: <20250923193833.1506358-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: MBRQ6DAQQ3E5C2FWLNYKVEFMUJCP6ADR X-Message-ID-Hash: MBRQ6DAQQ3E5C2FWLNYKVEFMUJCP6ADR X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 2/4] scripts: Update build-efi/qemu to support disabling pager List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass The pager can interfere with tests and there is a lab test which uses the build-efi script. Add an option to disable the pager so that the labgrid test can request that. Signed-off-by: Simon Glass --- scripts/build-efi | 3 ++- scripts/build-qemu | 2 ++ scripts/build_helper.py | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/build-efi b/scripts/build-efi index 131aad50897..27446295b2d 100755 --- a/scripts/build-efi +++ b/scripts/build-efi @@ -155,7 +155,8 @@ class BuildEfi: def do_build(self, build): """Build U-Boot for the selected board""" - res = command.run_one('buildman', '-w', '-o', self.build_dir, + extra = ['-a', '~CONSOLE_PAGER'] if self.args.no_pager else [] + res = command.run_one('buildman', '-w', '-o', self.build_dir, *extra, '--board', build, '-I', raise_on_error=False) if res.return_code and res.return_code != 101: # Allow warnings raise ValueError( diff --git a/scripts/build-qemu b/scripts/build-qemu index 62f0bc41fad..522325a8d57 100755 --- a/scripts/build-qemu +++ b/scripts/build-qemu @@ -200,6 +200,8 @@ class BuildQemu: self.build_dir.mkdir(parents=True, exist_ok=True) cmd = ['buildman', '-w', '-o', str(self.build_dir), '--board', self.board, '-I'] + if self.args.no_pager: + cmd += ['-a', '~CONSOLE_PAGER'] self.execute_command( cmd, diff --git a/scripts/build_helper.py b/scripts/build_helper.py index 21162e5643e..d401da0215c 100644 --- a/scripts/build_helper.py +++ b/scripts/build_helper.py @@ -301,6 +301,8 @@ def add_common_args(parser): help='Use KVM (Kernel-based Virtual Machine) for acceleration') parser.add_argument('-K', '--kernel', help='Kernel to run using -kernel') + parser.add_argument('-n', '--no-pager', action='store_true', + help="Disable the pager (for testing)") parser.add_argument('-o', '--os', metavar='NAME', choices=['ubuntu'], help='Run a specified Operating System') parser.add_argument('-r', '--run', action='store_true', From patchwork Tue Sep 23 19:38:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 411 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656333; bh=eXafuDBtYdfCm6jeJVHuYiKo4KI1hQ08nKKV18oCp9U=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=OfMr5pAw+Nzw1C8GU+/7+RPkAbdcSSmnezmMUL9GuPeFzMXnolJaPS7YbSL0f9bxi l2fzRx3cMdnvZExqX6T+w2KQ8JSoP+pK/pbYddS7ohtNyl7j/0PO2Aics3SyrZD3/K qtyQjOJL4d2jsXX4B+ROeFt2+mosLZjjIK+j3H4rnXZphLd1IxKpEOcYGcqiubZiL1 WAvnC3gH95p6AsOWGzD9m4gLf72WsYusyGsq9Bwp9OF5/RaLmscPbUKdV3KcosPWbp 1SfwC9mNB9DNzNoXsGmO7tTvCZV6bSj8UQdlqg47vADuSlqLg334XjYXe/DY15i/hx Sj0kLhJlWS+JA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 5BAFA67D29 for ; Tue, 23 Sep 2025 13:38:53 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id tT8oCjHxMa_f for ; Tue, 23 Sep 2025 13:38:53 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656331; bh=eXafuDBtYdfCm6jeJVHuYiKo4KI1hQ08nKKV18oCp9U=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=XNkCp/k6975riofY2fN+J9pF7CKMG9Tbr8EFyuLAF1bpTQtjo2emk+e6XLUyLc0Hl slmlizaHu8y4LCCvRB7KWfZwsgyExz5aOxv5Y0EixzyQA5pnXQZxjpo8tAKOLPaCV+ RGAlqq9YRQ6c7V+EuI7/ZtXh3wEg40L8hjdBKXCM8npjwZ63zxu96eRWIB0NZn3mUV Ma3RvgK1EHvaqDDpSQcfq+wngE881jAO5RUgGHOCnaG8B8rXqdJDm/LvlcLrjMupx2 pfNr2YGJFGeuCUHtukXI06gAme1TT3ZVzqJEPU3z+uaLVvLQOpfOobUuFPk6gW9/Ef f8Vgj0VHs08SA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 547C667A42 for ; Tue, 23 Sep 2025 13:38:51 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656329; bh=uC99D9XgrlYLYGNxpIabZZlQbrvrcA247FOaQQPR3c0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BmKXlMYV+2d6KzXeL3idHzL8Yta0J2fpLdtxTbBIyhyFC9opSt6/oOlkI71XQv81u yQFC1KZEmpHfdqJrr11qu9oQJyKVY2UNIbqrFLQgydzhh9o4hTpN2PjP2GyzJxUbd5 1FG0zH3Q6EJ2fqHqhiCDNBrIQhVC5ANeuzDynMuurZy3OEhjncQyjM6KiiLegbPF8x IT5QaLGIIr6t6pi6TSCTDqijUkT8wwxqH9kgC8F/iiQxbyPSJvx4PoRFU0xvaaY7ei FNtZvvmndQOVAnNt/I+UPiPIZde7/yZurh7WsF+eYYmVzwiUrwhBMRDXZuUry4iK3N 4qlUFZ4q/JKZQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 575F167D02; Tue, 23 Sep 2025 13:38:49 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id TElI6s6lFqR5; Tue, 23 Sep 2025 13:38:49 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656329; bh=sATQvbcCMhVJIUd81xFZ4+SjLgXN+578nmYUlwdiADM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QsjFjnnU0vQRp3wpn3oGljy3QPAQ2ZG25nS3w4CO8eckrQXxkhBBvw6mpUaop4a/A YpBkNyjLSov4aUBN3cJ8zwr3H64Y3vd8e5i8pEzmyvDmA6VKz/9+ZGeyPjh8QelpRa 2/hH6KrGUIqVtCJuFEaJYUU0p526bkmDECmCyvW4T6sJIYnoaIir0mcBgOb/X6XqBR RC3MZMk231GxRVHRMnCZx2lxPpRKqDAvAghREnUx7EXSC0eSA3lntwSKKYSX1iUwLt gqCq2n1W0I+O95wBSDj3bE5cZLFl0ET8PczTr1OWCRsuxrCRdgDGwFRz0aCNGI37cH DuEdkwGVKstgg== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id BCDE267CD3; Tue, 23 Sep 2025 13:38:48 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 23 Sep 2025 13:38:29 -0600 Message-ID: <20250923193833.1506358-3-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250923193833.1506358-1-sjg@u-boot.org> References: <20250923193833.1506358-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: XQ5FOPFYAUG3XTW6C2C6ROPJO5MDD4TU X-Message-ID-Hash: XQ5FOPFYAUG3XTW6C2C6ROPJO5MDD4TU X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 3/4] efi: test: Update distro EFI-app tests for new naming List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass The EFI-media devices names were recently changed to make it easier to tell them apart. Update the tests as well, since this change caused them to fail. Signed-off-by: Simon Glass Fixes: dea4ea00a72 ("efi: Set the efi_media device name when binding") --- test/py/tests/test_distro.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/py/tests/test_distro.py b/test/py/tests/test_distro.py index 77caf32145e..cc4aa265d90 100644 --- a/test/py/tests/test_distro.py +++ b/test/py/tests/test_distro.py @@ -84,7 +84,7 @@ def test_distro_arm_app_extlinux(ubman): ubman.run_command('bootmeth order extlinux') ubman.run_command('boot', wait_for_prompt=False) - ubman.expect(["Booting bootflow 'efi_media.bootdev.part_2' with extlinux"]) + ubman.expect(["Booting bootflow 'efi_media_1.bootdev.part_2' with extlinux"]) ubman.expect(['Exiting EFI']) ubman.expect(['Booting Linux on physical CPU']) @@ -102,7 +102,8 @@ def test_distro_arm_app_efi(ubman): ubman.run_command('bootmeth order efi') ubman.run_command('boot', wait_for_prompt=False) - ubman.expect(["Booting bootflow 'efi_media.bootdev.part_1' with efi"]) + ubman.expect( + ["Booting bootflow 'efi_media_1.bootdev.part_1' with efi"]) # Press Escape to force GRUB to appear, even if the silent menu was # enabled by a previous boot From patchwork Tue Sep 23 19:38:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 412 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656337; bh=CXq6PvxixcXnvZde3ENcpwvv0XoUFo2bKGabDIMilrk=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=IV+9qbxa5RmNKjegkwdhU+QbXLAUZQ6Ezglq7fwVhIx8PWJ8dD7X6fZLfboEd6jou fDDdDOhTjEPxbQ/WRYBkllnWfYWnfVbKw3KMI+IbJJuAE70U4hPhZWL/jfCZypxgpi Ekb9PwRyWpwF9BVGnoA2kvbO7JJ4aqmif8KX0imrOVB2M1o1ar63lLsFxOg6qNZoP/ ZRITt+dchu9sAd7I8CL2mB/96RVGurKa+R/8xrxAYjKXA2NquamQPKRgqiHlUntN+n Z3Ry0ReGZp6ObHhI6Z8FeNUxL/3/AOh3YxHPfgzLLMLHUpYwXh8jwxU9JZuZazILqd X85q6t5MwyCww== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id CC7FD67D2F for ; Tue, 23 Sep 2025 13:38:57 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 3ed_LEygqmPb for ; Tue, 23 Sep 2025 13:38:57 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656337; bh=CXq6PvxixcXnvZde3ENcpwvv0XoUFo2bKGabDIMilrk=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=IV+9qbxa5RmNKjegkwdhU+QbXLAUZQ6Ezglq7fwVhIx8PWJ8dD7X6fZLfboEd6jou fDDdDOhTjEPxbQ/WRYBkllnWfYWnfVbKw3KMI+IbJJuAE70U4hPhZWL/jfCZypxgpi Ekb9PwRyWpwF9BVGnoA2kvbO7JJ4aqmif8KX0imrOVB2M1o1ar63lLsFxOg6qNZoP/ ZRITt+dchu9sAd7I8CL2mB/96RVGurKa+R/8xrxAYjKXA2NquamQPKRgqiHlUntN+n Z3Ry0ReGZp6ObHhI6Z8FeNUxL/3/AOh3YxHPfgzLLMLHUpYwXh8jwxU9JZuZazILqd X85q6t5MwyCww== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id BCCDA67D29 for ; Tue, 23 Sep 2025 13:38:57 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656335; bh=hz+pGaS+nWNMyE2WMt5dA/MpkQLoYJm9zezDMlBcaEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QtBX9zzmLcGd209vAharF9gL3s9dMvNTDNB+7Nu4j2Pe/GKU5kQZ/bE5MUeOSU8r7 HKAtN7lPr7tMYiJI/kZs6d5JYkBKzSD6rUWXYkm4uZilSXr9I7P0WfkghG2nS8k9Lz 8vIQe8kKsE2MUl4QVwUCtFmnAP/VMbKUFnevNKKxNGWZuPQc6zEKXON+W6Crc5+e4r hrHt1yywH4E5AJJZz6dOC9m/x8C8dwBzuOfb6ZSfEPiUZoWl+ATLmrmCMpfH7d6MBw 0GSod9J55Arl7PuFZfk1uSS3oBDu4tX43YtpkJiiMgtLWksgEsGVg+gXzfDzCatHWO wwRlTKYV57/8Q== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 8FAC867A42; Tue, 23 Sep 2025 13:38:55 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id NFGfjwfegwsz; Tue, 23 Sep 2025 13:38:55 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758656329; bh=r6nxEntv8fSJIbGjJmb6hYSJsYtGn2ZUx6s66f4hMfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oNQaJNSw19KPZ+PIOxJx/nO0jx+d29LgtmSTu0wCi/zlCo8yCI2hKF/IUEGZst7eO SpZuI4c2ZbRxHOlhTkHgez/8p9QLatPwr94Asn+WVNkKKTUfn8MB2vQiEln4k9l2EC 4TxBG6P2RYt5iRSXyP6s91XDjoHtmqSIWdDUpQYzoLux7e0q8xnVEGcetMkK3jw0D6 EK5KW4kBCuU72pULRHGUnoWuoFNxXzi6TeVJK5KSebXNEvXed1yK6rLhzsZnGhaZIo 6XTcuhC5WYg3GAkF8N97RwOdXRhZ25T2cv7VxjpxUNDAZHDRt0zVZnVbrXedf710kr lZOjb5qb9AYkw== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 9E59C67CD3; Tue, 23 Sep 2025 13:38:49 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 23 Sep 2025 13:38:30 -0600 Message-ID: <20250923193833.1506358-4-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250923193833.1506358-1-sjg@u-boot.org> References: <20250923193833.1506358-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: 2P4MHY42RDUJ3YQK74KAWACWUJDT5PYW X-Message-ID-Hash: 2P4MHY42RDUJ3YQK74KAWACWUJDT5PYW X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 4/4] test: Deal with the silent menu in grub List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass The distro test for EFI in the EFI ARM app is currently flaky. If the test does not send an 'escape' character, then the board may boot straight into Ubuntu. If it does, but didn't need to, then grub sits at the command prompt. Handle this by pressing escape twice (which should always go to the grub command line), then using the 'normal' command to start the menu. Signed-off-by: Simon Glass --- test/py/tests/test_distro.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/test/py/tests/test_distro.py b/test/py/tests/test_distro.py index cc4aa265d90..d9bc9b18648 100644 --- a/test/py/tests/test_distro.py +++ b/test/py/tests/test_distro.py @@ -106,13 +106,21 @@ def test_distro_arm_app_efi(ubman): ["Booting bootflow 'efi_media_1.bootdev.part_1' with efi"]) # Press Escape to force GRUB to appear, even if the silent menu was - # enabled by a previous boot + # enabled by a previous boot. If the menu is already set to appear, this + # will exit to the grub> prompt + ubman.send('\x1b') + + # Press Escape again, to force it to the grub> prompt ubman.send('\x1b') # Wait until we see the editor appear with ubman.log.section('grub'): - ubman.expect(['ESC to return previous']) - # ubman.expect(['The highlighted entry will be executed automatically in 29s']) + ubman.expect(['grub>']) + + ubman.run_command('normal', wait_for_prompt=False) + + # exp = ubman.expect(['ESC to return previous', 'grub>']) + ubman.expect(['The highlighted entry will be executed automatically in']) # Press 'e' to edit the command line ubman.log.info("Pressing 'e'")