ref(linker): split lma and vma of data sec for non unified plats

Signed-off-by: Daniel Oliveira <[email protected]>

Author: danielRep

src/linker.ld

@@ -30,9 +30,16 @@ SECTIONS
 		*(.rdata .rodata .rodata.*)
 	}
 
-    . = ALIGN(PAGE_SIZE); /* start RW sections in separate page */
-	
-	.data : {
+	. = ALIGN(PAGE_SIZE); /* start RW sections in separate page */
+	_data_lma_start = .;
+
+#ifdef MEM_NON_UNIFIED
+	. = CONFIG_HYP_DATA_ADDR;	/* Changed location counter to VMA address */
+#endif
+
+	_data_vma_start = .;
+
+	.data : AT (_data_lma_start) {
 		*(.data .data.*)
         PROVIDE(__global_pointer$ = . + 0x800);
 		*(.sdata .sdata.* .sdata2.*)
@@ -49,17 +56,39 @@ SECTIONS
         _ipi_cpumsg_handlers_id_end = .;
 	}
 
-    . = ALIGN(PAGE_SIZE);
+	.pad_load : {
+		/**
+		 * This section ensures the loadable portion of the image (_image_load_end) is page-aligned
+		 * by adding padding if necessary. The BYTE(0x00) forces this section to be PROGBITS rather
+		 * than NOBITS, ensuring any padding bytes are actually written to the file up to the align
+		 */
+		BYTE(0x00)
+		. = ALIGN(PAGE_SIZE);
+	}
+
     _image_load_end = .;
 
+#ifdef MEM_NON_UNIFIED
+	/* Save the current location counter (VMA) and switch to LMA for .vm_images */
+	_vma_before_vm_images = .;
+    _image_load_end = _data_lma_start + (_image_load_end - _data_vma_start);
+	. = _image_load_end;
+#endif
+
 	/* Sections to be allocated only in physical memory, not in VA space */
 
-	.vm_images : SUBALIGN(PAGE_SIZE) {
-		_vm_image_start = .;
-		KEEP(*(.vm_image*))
-	}
+    .vm_images : AT(_image_load_end) SUBALIGN(PAGE_SIZE) {
+        _vm_image_start = .;
+        KEEP(*(.vm_image*))
+    }
+
+#ifdef MEM_NON_UNIFIED
+    /* Restore the location counter (VMA) */
+    . = _vma_before_vm_images;
+#endif
+
 	. = ALIGN(PAGE_SIZE);
-	_vm_image_end = .;
+	_vm_image_end = ALIGN(_vm_image_start + SIZEOF(.vm_images), PAGE_SIZE);
     _image_noload_start = .;
     extra_allocated_phys_mem = _image_noload_start - _image_load_end;
 
@@ -73,28 +102,28 @@ SECTIONS
 #endif
 
 	/* Only no load regions below */
-	
-	.bss (NOLOAD) :  {	
+
+	.bss (NOLOAD) : {
 		_bss_start = .;
-		*(.bss* .sbss*)  
-		*(COMMON)	
+		*(.bss* .sbss*)
+		*(COMMON)
 		_bss_end = .;
-	} 
+	}
 
 	.glb_page_tables (NOLOAD) : ALIGN(PAGE_SIZE) {
 		_page_tables_start = .;
 		*(.glb_page_tables)
 		_page_tables_end = .;
 	}
-	
+
 	. = ALIGN(PAGE_SIZE);
 	_image_end = ABSOLUTE(.);
 	_dmem_phys_beg = ABSOLUTE(.) + extra_allocated_phys_mem;
 
 	. = ALIGN(PAGE_SIZE);
 	_dmem_beg = ABSOLUTE(.);
 
-#ifdef MEM_PROT_MMU	
+#ifdef MEM_PROT_MMU
 	/* Global dynamic memory virtual address space here */
 
 	. = BAO_CPU_BASE;