LF-10397 imx8: Fix SCU container file offset issue

The offset of container image files needs to align with boot device
sector size. The previous change for iMX95 OEI violates the alignment
for 8DXL when booting from NAND

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

src/imx8qxb0.c

@@ -706,7 +706,8 @@ int get_container_image_start_pos(image_t *image_stack, uint32_t align, soc_type
 				} else {
 					file_off = header.img[header.num_images - 1].offset + header.img[header.num_images - 1].size;
 					*scu_cont_hdr_off = i * CONTAINER_ALIGNMENT + ALIGN(header.length, CONTAINER_ALIGNMENT);
-					file_off = i * CONTAINER_ALIGNMENT + ALIGN(file_off, align);
+					file_off += i * CONTAINER_ALIGNMENT;
+					file_off = ALIGN(file_off, align);
 				}
 
 				i++;