[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ImageBuilder] uboot-script-gen: fix arm64 xen u-boot image generation
- To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>
- From: Grygorii Strashko <grygorii_strashko@xxxxxxxx>
- Date: Mon, 14 Apr 2025 08:12:25 +0000
- Accept-language: en-US
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none
- 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=jjqsOGtN0AX9PhuCyH7NEGIpTjCWtuA4RAzjPTtEQZE=; b=wdq9+1/UfFjAXLZi2WFGaLGsT3B6I5BTMQ/vWNGZLg9jqLc1m3MjZ43EJjHp3tPBxj16FT4kWHgQyDH1Bs5F5obyzyW6iXs7IiNreAxKxKc0NqOlPD5xFr4P+BAzz7M//MWKFQjfgEUSBA629WOkKDhQ78uyXtQtOzmqegC8gvNTphvKfg362PD8KvjGV3ACqIb1uzz/gVkGN+aG84uq4XxptyHqLlyxOTNatMBBff19P72J8pnbyzf34FPFHm5qP7OC+7tO76IK43r5YmtejzwVDloVwF+o6EqqySy+enTIpmwxPIQLC7dfKQ0ZJw7zwT8KhOmQ4Tojo1PbB6FXkA==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bm1Nz2B/kc1OtIud9IGp//wJoeXD8W4L6IAC6Upf0fLXInfe0JFA0j1OmUiXqCt2vbQUoH9DZ0HmFvt1O9xTzLmMFgwKMEIhPsv4Ou1TGL1MjblBATbVw7BMaqTxfwQd03yrlCJhsu2RpP4XThJhJ/POgasuDx5c7kMNUgj6ueF8R93orcSkQUorJbZ/RtXZGHzIImLFueaQ1LOUZi4g/09Z0bU4naFv91YMoQxPGaO/ECflPqywsDlZgKBtchrEjWL7oWFX1w+GWx01zULOTiQWWe5XjOCeL9CSRmIfoM1KedQGWYf3/66kyRhU3ZxkBe+TP5TVpFdiaowWgKzHRg==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=epam.com;
- Cc: Grygorii Strashko <grygorii_strashko@xxxxxxxx>
- Delivery-date: Mon, 14 Apr 2025 08:12:39 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Thread-index: AQHbrRT0Xiz3Rqv37EutLWpfpuPiGw==
- Thread-topic: [ImageBuilder] uboot-script-gen: fix arm64 xen u-boot image generation
From: Grygorii Strashko <grygorii_strashko@xxxxxxxx>
The current code in generate_uboot_images() does not detect arm64 properly
and always generates ARM u-boot image. This causes Xen boot issues.
Fix it by searching for "ARM64" for AArch64 binary detection.
- mkimage -l xen.ub
Before:
Image Type: ARM Linux Kernel Image (uncompressed)
After:
Image Type: AArch64 Linux Kernel Image (uncompressed)
Signed-off-by: Grygorii Strashko <grygorii_strashko@xxxxxxxx>
---
scripts/uboot-script-gen | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen
index a9f698f00fd1..c4d26caf5e0e 100755
--- a/scripts/uboot-script-gen
+++ b/scripts/uboot-script-gen
@@ -815,13 +815,13 @@ function linux_config()
generate_uboot_images()
{
- local arch=$(file -L $XEN | grep "ARM")
+ local arch=$(file -L $XEN | grep -o "ARM64")
if test "$arch"
then
- arch=arm
- else
arch=arm64
+ else
+ arch=arm
fi
mkimage -A $arch -T kernel -C none -a $memaddr -e $memaddr -d $XEN
"$XEN".ub
--
2.34.1
|
