[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[ImageBuilder] Add 'bootz' to a list of supported boot commands


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Michal Orzel <michal.orzel@xxxxxxx>
  • Date: Tue, 14 Nov 2023 16:15:35 +0100
  • 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=arcselector9901; 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=DasBI6LeyKgugWeCwBkYzotJQvEFYR+pBHAsv5kFKHA=; b=CkAXbI1VBF4IwKGuRL0mt4CKJj3Ooeboz3CrY20J5Ldre2d3HZ0zucpTeuVwfJE+oboKtiSREOjB7U7HJqxfni0xUGjWLm9u15HuA/RDu1o6Pg8+ldX5IetnmWrao1OuAyQZSDjXYcbxD5vvKnu5gyVnuMeIIuoGOuEjI9Hcu38I9Yi6vWbAdcSSW+LcVsNB/uD4IrWNLt8J1LhpafKN71msw6j03JgpMJ2pvKU8fyTwfIvFLl6Y9VfoDpzhMGEPhI/tpCVlYXQLVQg6fpKGlUhpz3SQgwbmFctRtNf9q9cdBqB6nXvXSlkhH4IUhIxerks3FGaKfjOFMDa6eR7VsQ==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VoTHtH2woT/zmxOywLdCgslMKPzQ3lL2rwRj73oevyFWws+cTw+yG7TLiycZ6hf/39BDB5CCWFVs4su8q7oVuHkfv1qAPxfKvFX4CPeeYHYfva3H6ZH0qpS/cfuRNgpjkDDQD5FBKTwtmR6HA8IqL1JCXM33RhzSQywAfBiRVl2gZifoTwc6D882kGLaJnTaxiCeiiojdNephAK3LWdq8NczWrhC8+lhqbyb1yOpOvr/+YPwKdLgOGtfHodK3nM4XKmWJpeTwyEHERHWRkdYU1WwOSnDLrUw9Dv2j/GOn99Aa1zxkGpzUJwG1SUdcAj5GWqTZ9FREtlDy3Ujx7J1Eg==
  • Cc: <sstabellini@xxxxxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>
  • Delivery-date: Tue, 14 Nov 2023 15:16:02 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

At the moment, in order to boot 32-bit images, we need to set BOOT_CMD
to 'bootm' which results in adding a u-boot header on top of an image.
Add 'bootz' to a list of supported boot commands, so that we can skip
this extra step. In most cases, specifying 'bootm' should only be needed
for images without Linux kernel Image/zImage header. Otherwise, we can
use 'booti'/'bootz'.

Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>
---
 README.md                | 4 ++--
 scripts/uboot-script-gen | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fe5d2052cc69..3b4b16f1f7e4 100644
--- a/README.md
+++ b/README.md
@@ -80,8 +80,8 @@ Where:
   though.
 
 - BOOT_CMD specifies the u-boot command used to boot the binaries.
-  By default, it is 'booti'. The acceptable values are 'booti', 'bootm'
-  and 'bootefi' and 'none'. If the value is 'none', the BOOT_CMD is not
+  By default, it is 'booti'. The acceptable values are 'booti', 'bootm',
+  'bootz' and 'bootefi' and 'none'. If the value is 'none', the BOOT_CMD is not
   added to the boot script, and the addresses for the Xen binary and the
   DTB are stored in 'host_kernel_addr' and 'host_fdt_addr' u-boot
   env variables respectively, to be used manually when booting.
diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen
index 6e52da5e2aca..9e3d86e4743a 100755
--- a/scripts/uboot-script-gen
+++ b/scripts/uboot-script-gen
@@ -1041,7 +1041,7 @@ function check_depends()
 
 function check_boot_cmd()
 {
-    if ! [[ " bootm booti bootefi none " =~ " ${BOOT_CMD}" ]]
+    if ! [[ " bootm booti bootz bootefi none " =~ " ${BOOT_CMD}" ]]
     then
         echo "\"BOOT_CMD=$BOOT_CMD\" is not valid"
         exit 1
-- 
2.25.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.