Merge pull request #2 from SDK/xlnx_rel_v2025.1

Shaik Salauddin · GitHub Enterprise · commit 225d861b3b4d · 2025-04-27T00:02:38.000+05:30
Xlnx rel v2025.1
diff --git a/zynq/include/partitionheadertable-zynq.h b/zynq/include/partitionheadertable-zynq.h
@@ -91,7 +91,7 @@ class ZynqPartitionHeader : public PartitionHeader
     void SetEncryptedPartitionLength(uint32_t len);
     void SetUnencryptedPartitionLength(uint32_t len);
     void SetTotalPartitionLength(uint32_t len);
-    void SetLoadAddress(uint64_t addr);
+    void SetLoadAddress(uint64_t addr, bool = false);
     void SetExecAddress(uint64_t addr);
     void SetPartitionWordOffset(uint32_t addr);
     void SetPartitionAttributes(void);
diff --git a/zynq/src/partitionheadertable-zynq.cpp b/zynq/src/partitionheadertable-zynq.cpp
@@ -138,7 +138,7 @@ void ZynqPartitionHeader::SetTotalPartitionLength(uint32_t len)
 }
 
 /******************************************************************************/
-void ZynqPartitionHeader::SetLoadAddress(uint64_t addr)
+void ZynqPartitionHeader::SetLoadAddress(uint64_t addr, bool arch)
 {
     pHTable->destinationLoadAddress = (uint32_t)addr;
 }
diff --git a/zynqmp/include/partitionheadertable-zynqmp.h b/zynqmp/include/partitionheadertable-zynqmp.h
@@ -106,7 +106,7 @@ class ZynqMpPartitionHeader : public PartitionHeader
     void SetEncryptedPartitionLength(uint32_t len);
     void SetUnencryptedPartitionLength(uint32_t len);
     void SetTotalPartitionLength(uint32_t len);
-    void SetLoadAddress(uint64_t addr);
+    void SetLoadAddress(uint64_t addr, bool arch = false);
     void SetExecAddress(uint64_t addr);
     void SetPartitionWordOffset(uint32_t addr);
     void SetPartitionAttributes(void);
diff --git a/zynqmp/src/partitionheadertable-zynqmp.cpp b/zynqmp/src/partitionheadertable-zynqmp.cpp
@@ -183,7 +183,7 @@ void ZynqMpPartitionHeader::SetExecAddress(uint64_t addr)
 }
 
 /******************************************************************************/
-void ZynqMpPartitionHeader::SetLoadAddress(uint64_t addr)
+void ZynqMpPartitionHeader::SetLoadAddress(uint64_t addr, bool arch)
 {
     pHTable->destinationLoadAddress = addr;
 }

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ void ZynqPartitionHeader::SetTotalPartitionLength(uint32_t len)`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`/******************************************************************************/`
`141`		`-void ZynqPartitionHeader::SetLoadAddress(uint64_t addr)`
	`141`	`+void ZynqPartitionHeader::SetLoadAddress(uint64_t addr, bool arch)`
`142`	`142`	`{`
`143`	`143`	`pHTable->destinationLoadAddress = (uint32_t)addr;`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ void ZynqMpPartitionHeader::SetExecAddress(uint64_t addr)`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`/******************************************************************************/`
`186`		`-void ZynqMpPartitionHeader::SetLoadAddress(uint64_t addr)`
	`186`	`+void ZynqMpPartitionHeader::SetLoadAddress(uint64_t addr, bool arch)`
`187`	`187`	`{`
`188`	`188`	`pHTable->destinationLoadAddress = addr;`
`189`	`189`	`}`