[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ImageBuilder] Use LOAD_CMD by default if not specified in load_file()
- To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Michal Orzel <michal.orzel@xxxxxxx>
- Date: Tue, 9 Sep 2025 09:41:41 +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=MR7vzHeHpkiZA8Ij/yUkkenqrBbLVUu1GJxFj31LfGA=; b=FVLLYSAmV6BJ71PUatiZsSIStOb9UlBQkzkJhTMt1ughfbnSpqzskKLkbmIZj0Q0AvEJm3Il+dXkxt06xbTRxe6BihTG0JsBonIb6I6ltzPORBBjSdMRRk6lBTAYciWvpKLpSA7FyEhTDHqTzOX40UYn+cyuv38MBGR2gnKUtK55PUN6H6Cnf2iaSosqGwlSlJfI6KIEFDxkpiqoOMqeVPL2FfodJXQM/wcfJ/WdNg+QJt6WnKFq4ns4BFoVmLBUvo/0RTgsBiUhACvfNyQQE8/3htNq2t6BXZBREPYQ/IohuZTagm4ru6ux7RyVxBDah3YsIWt4MU8YSzH6uZUJMw==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HpCWpkkbSN4u7Yo0RRkLXjJYUXd3RSw46zE8sTgfssXaSXMvcCWDNmR0rrXKquKYruPHbSyK0wJ/pt8VLBJaJ8bEeBFntqsrFvyuTUDIPMGDdmgiHv8e/fVBGMwDzQ1Xf6KNWe48ai7uCzlRTkE+QBkf6wC+DY3qgqK5Y6w0uUlTIn6RZ08spftsM+kXkgo0P2xnp0LfF4XoaLqkokOvcliiMOY9LUJLw37JLjn60xB5Tly1jQOmaSp5SUnwlwqgyPMuK8k39OWC+kD42YueCxd0p++E8s5gbZgXNcbd8WU6S1of3ESL8qeD47B2GN03l3mOCMKJXjqokMUYW1/NoA==
- Cc: <sstabellini@xxxxxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>
- Delivery-date: Tue, 09 Sep 2025 07:42:32 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Commit 061d6782756f modified load_file() to take load command as
argument but did not change all the invocations (e.g. loading standalone
Linux, bitstream, etc.) which broke the output script (load command
empty). Fix it by defaulting to LOAD_CMD if not specified.
Fixes: 061d6782756f ("Add config option to use separate load commands for Xen,
DOM0 and DOMU binaries")
Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>
---
scripts/uboot-script-gen | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen
index 849b8f939e81..4f9261035d73 100755
--- a/scripts/uboot-script-gen
+++ b/scripts/uboot-script-gen
@@ -736,6 +736,12 @@ function load_file()
local base="$(realpath $PWD)"/
local relative_path=${absolute_path#"$base"}
+ # Default to LOAD_CMD if not specified
+ if test -z "${load_cmd}"
+ then
+ load_cmd="${LOAD_CMD}"
+ fi
+
if test "$FIT"
then
echo "imxtract \$fit_addr $fit_scr_name $memaddr" >> $UBOOT_SOURCE
--
2.43.0
|
