[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ImageBuilder] Make 'bootefi' work again
- To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Michal Orzel <michal.orzel@xxxxxxx>
- Date: Tue, 16 Jul 2024 10:47:59 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9dTaxVqWvr20aPgF89ytjp6cwcQR8o6lIZitSUf3gOs=; b=FcGrnOtiWzc0uvUCniKqCSU4/zoziVNfAFpAD4fYMQa379p5/sQcGWYed1aMoYoWw1xP61urRnO3/wcYyN8d3D3IWzpoByiD89WK8InXa29paCtNr2jKpoJ/1WT9uTXVSUV80/+vYEdVhljLhzLwzdKj4SVacsKq8pRs+KxpxKPJibS+l40miKpiyuJaTXZ3AGPHTO9ljiWMmfbDMsJejhm6xPkno/nAivp38vFnJgnsKBnMarWRQez4KKHsd8RMGWnUWs9sLrV1ZnkHCS4c/I2fH30Yco5RaEaoBBJ5rDPzENSAqxHnjvm3nUZOtvJnanDWQOaRaRleKfdyRG3J8w==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hVJAWxvQRgI+QcnoIK/WmcExmLppDMCrZAd5BkPO+sAw6iDEfy5WBgYoe0h1WZ8uN1CHUFcnQ6iIPLslI8zrY1QrlWXeLxrukFEKH0ABjaD9rSxUU/e+QcHntWjOcYotRnK/ZxnZQim6D05lBINLWR47mnpSoGU80glLliIXougd1N+Dx62K3blc7U5DPzOmJCDrXnwEgSCV6ipnnPP0M2nCl8yLXutT+1tZpikGNZOaARy8zZ1t5I9VUFUjA0EvQngqOgbp3c/71HLeW6QJSG6RIYggj97d1G7vGnYSNNk+b8sckzIzx5Hda57BFidd0k4XXR4lAjl0icQWMaTrSA==
- Cc: <sstabellini@xxxxxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>
- Delivery-date: Tue, 16 Jul 2024 08:48:28 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
When $BOOT_CMD is bootefi, there shall be no '-' between $kernel_addr
and $device_tree_addr.
Fixes: 3fa89f8f9853 ("Add support for BOOT_CMD")
Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>
---
Note: using this command would be a good opportunity for a Xen EFI boot CI test
on Arm64 when the stub is not responsible for loading modules.
---
scripts/uboot-script-gen | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen
index 8b664e711b10..f8a087b881ce 100755
--- a/scripts/uboot-script-gen
+++ b/scripts/uboot-script-gen
@@ -1391,7 +1391,7 @@ fi
if [ "$BOOT_CMD" != "none" ]
then
- echo "$BOOT_CMD $kernel_addr - $device_tree_addr" >> $UBOOT_SOURCE
+ echo "$BOOT_CMD $kernel_addr $([ "$BOOT_CMD" = "bootefi" ] || echo '-')
$device_tree_addr" >> $UBOOT_SOURCE
else
# skip boot command but store load addresses to be used later
echo "setenv host_kernel_addr $kernel_addr" >> $UBOOT_SOURCE
--
2.25.1
|
