From patchwork Sat Nov 9 10:31:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 2008937 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=CVc+VJ76; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (unknown [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XlsYw3Dgkz1xyk for ; Sat, 9 Nov 2024 21:32:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0501388B99; Sat, 9 Nov 2024 11:31:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.b="CVc+VJ76"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C77E88EAF; Sat, 9 Nov 2024 11:31:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D521A88B99 for ; Sat, 9 Nov 2024 11:31:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=heinrich.schuchardt@canonical.com Received: from LT2ubnt.. (dynamic-046-114-106-072.46.114.pool.telefonica.de [46.114.106.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 2F68240275; Sat, 9 Nov 2024 10:31:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1731148306; bh=3eNFLS3kDBD6jPgmTosBU35CimPVUqp9wW/5wGsRvCA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CVc+VJ76CKtbzkxfrmwGrtLt+E+L2hdD1ClRYVmN0XfJiDjvcm2vY5vMEDQralG6M OvkdEX0i6K2m1xHWpEu7V3IuXMsg0AzZc29U9Yi8TEuEmOlCerc7o9eLUA1/L01ng/ JiMgV2PsVSJYZ9b4aDBvEbArgqBODvkM7rEzOmEk9yPEVCNXtsDpypjPCa4k1f9CVE ustF9VUW1abFoJnSwcm1KSKmAyVhOwMh8YVJbJFYsvByEj8AghZYG/jtvyEC8bl7Io JIKazNYgDjhPilscjkPRfXLS7NDySv60OcWkq5Il/D3Fzt1TtFTE6ZwfOD7IfZuxIV GgKTFCxgUSJMw== From: Heinrich Schuchardt To: Ilias Apalodimas Cc: Tom Rini , Simon Glass , AKASHI Takahiro , Mark Kettenis , Masahisa Kojima , Sughosh Ganu , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] efi_loader: provide valid PXE architecture on sandbox Date: Sat, 9 Nov 2024 11:31:41 +0100 Message-ID: <20241109103141.33983-1-heinrich.schuchardt@canonical.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 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 Before this patch the sandbox uses 0xffffffea as PXE architecture. => efidebug defaults Default boot path: EFI\BOOT\BOOTSBOX.EFI PXE arch: 0xffffffea With this patch it uses the PXE architecture that matches the host. This allows us to use bootmeth EFI on the sandbox to load an EFI binary. Signed-off-by: Heinrich Schuchardt Reviewed-by: Ilias Apalodimas --- lib/efi_loader/efi_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c index bf96f61d3d0..14049378930 100644 --- a/lib/efi_loader/efi_helper.c +++ b/lib/efi_loader/efi_helper.c @@ -75,7 +75,7 @@ const char *efi_get_basename(void) int efi_get_pxe_arch(void) { - if (efi_use_host_arch()) + if (IS_ENABLED(CONFIG_SANDBOX)) return HOST_PXE_ARCH; /* http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml */