From 0815e23c6b4f97b711d73e08575ed0816d0854e3 Mon Sep 17 00:00:00 2001
From: Daniel Brondani <daniel.brondani@arm.com>
Date: Wed, 18 Feb 2026 10:45:13 +0100
Subject: [PATCH] [cbuild-run] Emit `blank-val` and `fill-val` with 64bit width
 (#1420)

---
 test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc         | 2 +-
 tools/projmgr/src/ProjMgrCbuildRun.cpp                        | 4 ++--
 .../data/TestRunDebug/ref/run-debug+TestHW3.cbuild-run.yml    | 4 ++--
 .../test/data/WestSupport/ref/solution+CM0.cbuild-run.yml     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc b/test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc
index d2f500b35..c0139dca8 100644
--- a/test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc
+++ b/test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc
@@ -154,7 +154,7 @@
           <datapatch  __dp="0" __ap="0" address="0xE0040FF0" value="0x0D" info="CIDR0"/>
         </debug>
         <algorithm name="Device/ARM/Flash/CortexM4Dual.FLM" start="0x000A0000" size="0x00020000" RAMstart="0x000C0000" RAMsize="0x00040000" Pname="cm0_core1" default="1"/>
-        <flashinfo name="Internal Flash 16KB" start="0x0000F000" blankval="0x00000000" filler="0xCCCCCCCC" pagesize="0x00000040" ptime="100000" etime="1000000" Pname="cm0_core1">
+        <flashinfo name="Internal Flash 16KB" start="0x0000F000" blankval="0x0000000000000000" filler="0xCCCCCCCCCCCCCCCC" pagesize="0x00000040" ptime="100000" etime="1000000" Pname="cm0_core1">
           <block count="64" size="0x100" arg="0"/>
         </flashinfo>
       </device>
diff --git a/tools/projmgr/src/ProjMgrCbuildRun.cpp b/tools/projmgr/src/ProjMgrCbuildRun.cpp
index 8d8fe1be9..9baf1d9a4 100644
--- a/tools/projmgr/src/ProjMgrCbuildRun.cpp
+++ b/tools/projmgr/src/ProjMgrCbuildRun.cpp
@@ -91,10 +91,10 @@ void ProjMgrCbuildRun::SetFlashInfoNode(YAML::Node node, const std::vector<Flash
       }
     }
     if (item.blankVal.has_value()) {
-      SetNodeValue(flashInfoNode[YAML_BLANK_VAL], ProjMgrUtils::ULLToHex(item.blankVal.value()));
+      SetNodeValue(flashInfoNode[YAML_BLANK_VAL], ProjMgrUtils::ULLToHex(item.blankVal.value(), 16));
     }
     if (item.fillVal.has_value()) {
-      SetNodeValue(flashInfoNode[YAML_FILL_VAL], ProjMgrUtils::ULLToHex(item.fillVal.value()));
+      SetNodeValue(flashInfoNode[YAML_FILL_VAL], ProjMgrUtils::ULLToHex(item.fillVal.value(), 16));
     }
     if (item.ptime.has_value()) {
       flashInfoNode[YAML_PTIME] = item.ptime.value();
diff --git a/tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW3.cbuild-run.yml b/tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW3.cbuild-run.yml
index 553b70ba0..9b4f09902 100644
--- a/tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW3.cbuild-run.yml
+++ b/tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW3.cbuild-run.yml
@@ -154,8 +154,8 @@ cbuild-run:
         - count: 64
           size: 0x00000100
           arg: 0
-      blank-val: 0x00000000
-      fill-val: 0xCCCCCCCC
+      blank-val: 0x0000000000000000
+      fill-val: 0xCCCCCCCCCCCCCCCC
       ptime: 100000
       etime: 1000000
       pname: cm0_core1
diff --git a/tools/projmgr/test/data/WestSupport/ref/solution+CM0.cbuild-run.yml b/tools/projmgr/test/data/WestSupport/ref/solution+CM0.cbuild-run.yml
index 4d18e459a..bd5c9fdb4 100644
--- a/tools/projmgr/test/data/WestSupport/ref/solution+CM0.cbuild-run.yml
+++ b/tools/projmgr/test/data/WestSupport/ref/solution+CM0.cbuild-run.yml
@@ -153,8 +153,8 @@ cbuild-run:
         - count: 64
           size: 0x00000100
           arg: 0
-      blank-val: 0x00000000
-      fill-val: 0xCCCCCCCC
+      blank-val: 0x0000000000000000
+      fill-val: 0xCCCCCCCCCCCCCCCC
       ptime: 100000
       etime: 1000000
       pname: cm0_core1