[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [ImageBuilder] uboot-script-gen: fix arm64 xen u-boot image generation
- To: Alejandro Vallejo <agarciav@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>
- From: Grygorii Strashko <grygorii_strashko@xxxxxxxx>
- Date: Wed, 16 Apr 2025 19:10:43 +0300
- 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=53o3St1ec3DU+qcceFQiTWCqqM4QOi3wbhMgOhCOgDg=; b=L5EMFLKrkMhU1pEIXozd5N7XChpkvQ27csINpWXS8ZrMG9AapK5N16G8bPdwGZxKZO0s4o2Z0kiIsyqBrZKC/Hkb7ZENzjsrLi4EW6WUuvhjeACnPm7wLYiCqAjJlipQCpVPjWKSobiJvhbk3Wm4tQY7nAGjD8VkIeFBJLVLdddq0iNMjKZAXLNG8nFLUEtrOEVsewpsrN2HLiPyy3bTViN0CVGe+vv24akIrI1aFotsDhzULBeywZq0Wer3OvNErDkgrmYKF11KKWjItLF09mrlFO/nEwywktAIK8smRkCMkXSiMgk34hRNlH4iP670AbZsesgZKIE19nCmenVI3w==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NjZcgQNAi/gq9SRsqgsLKT/12IaVoxZPx24pbNAo02RrgwWSPmx4ioOEN4MYtbQnWJtnIipkQfPMmnni746YXo+FPVaDLUqqECpiJds98lz5byJSkmjtYJVq6I3Ybk0wrab+zt+ZAc4gtaKhmGB2pQAgHHOGmbEgUknqTKYnPlNO16z3LZgkbkzypzvuwcUgPN/SvXLaxXLmK6fCumQsKmZv1RE1kl/wwT/N+iqUm8S9N4TqzQ997chiQai0v3Kf/K6vucihtnYoXumFQVJE2Y/akR18tahGGzpP76c6jmKXphanlpodp+pJ2fZB15HTNAl8FfgGFWZRuBR+1O3aHA==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=epam.com;
- Cc: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>, Xen-devel <xen-devel-bounces@xxxxxxxxxxxxxxxxxxxx>
- Delivery-date: Wed, 16 Apr 2025 16:11:05 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
On 16.04.25 17:26, Alejandro Vallejo wrote:
On Wed Apr 16, 2025 at 11:44 AM BST, Grygorii Strashko wrote:
On 16.04.25 04:03, Stefano Stabellini wrote:
On Mon, 14 Apr 2025, Grygorii Strashko wrote:
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")
My file -L gives:
for arm32: ARM OpenFirmware [...]
for arm64: Aarch64
So the ARM64 grep wouldn't work as intended. Is the version of `file'
that you are using really printing ARM64?
Hm, yes.
file -L xen
xen: Linux kernel ARM64 boot executable Image, little-endian, 4K pages
file -v
file-5.41
u-boot boot command:
bootm 0x4EA00000 - 0x4EE00000
If so, we can do:
file -L $XEN | grep -E 'ARM64|Aarch64'
sure. I'll update.
Missing escape? I think it's needed even with single quotes.
file -L $XEN | grep -E 'ARM64\|Aarch64'
No. It's extended regular expressions ("-E") no need for escape.
Also it works with both '' and "".
--
Best regards,
-grygorii
|
