EmbeddedPkg: fix gcc build errors in AndroidBootImgLib

Commit dbd546a ("BaseTools: Add gcc flag to warn on void* pointer arithmetic") does its work and triggers build errors in this library. Update the affected code to build correctly again. Cc: Pierre Gondois <[email protected]> Cc: Laszlo Ersek <[email protected]> Cc: Bob Feng<[email protected]> Reported-by: Pierre Gondois <[email protected]> Signed-off-by: Leif Lindholm <[email protected]> Reviewed-by: Laszlo Ersek <[email protected]>
shenglei10 · Jul 23, 2020 · e43d088 · e43d088
1 parent 7ff0459
commit e43d088
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
@@ -97,7 +97,7 @@ AndroidBootImgGetKernelInfo (
   ASSERT (IS_VALID_ANDROID_PAGE_SIZE (Header->PageSize));
 
   *KernelSize = Header->KernelSize;
-  *Kernel = BootImg + Header->PageSize;
+  *Kernel = (VOID *)((UINTN)BootImg + Header->PageSize);
   return EFI_SUCCESS;
 }
 
@@ -341,7 +341,7 @@ AndroidBootImgUpdateFdt (
 
   Status = AndroidBootImgSetProperty64 (UpdatedFdtBase, ChosenNode,
                                         "linux,initrd-end",
-                                        (UINTN)(RamdiskData + RamdiskSize));
+                                        (UINTN)RamdiskData + RamdiskSize);
   if (EFI_ERROR (Status)) {
     goto Fdt_Exit;
   }