Changeset 89983 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c

Timestamp:

Jul 1, 2021 8:17:41 AM (4 years ago)

Author:

vboxsync

Message:

Devices/EFI: Merge edk-stable202105 and openssl 1.1.1j and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c

@@ -98 +98 @@
 
   *KernelSize = Header->KernelSize;
-  *Kernel = BootImg + Header->PageSize;
+  *Kernel = (VOID *)((UINTN)BootImg + Header->PageSize);
   return EFI_SUCCESS;
 }
@@ -342 +342 @@
   Status = AndroidBootImgSetProperty64 (UpdatedFdtBase, ChosenNode,
                                         "linux,initrd-end",
-                                        (UINTN)(RamdiskData + RamdiskSize));
+                                        (UINTN)RamdiskData + RamdiskSize);
   if (EFI_ERROR (Status)) {
     goto Fdt_Exit;