EmbeddedPkg: fix gcc build errors in AndroidBootImgLib

Commit dbd546a32d5a
("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 <pierre.gondois@arm.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Bob Feng<bob.c.feng@intel.com>
Reported-by: Pierre Gondois <pierre.gondois@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
index e1036954ee586dfc30266eec2897d71bfc949038..bbc240c3632ab21195d449f0f524519970a55de4 100644 (file)
--- 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));\r
 \r
   *KernelSize = Header->KernelSize;\r
-  *Kernel = BootImg + Header->PageSize;\r
+  *Kernel = (VOID *)((UINTN)BootImg + Header->PageSize);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -341,7 +341,7 @@ AndroidBootImgUpdateFdt (
 \r
   Status = AndroidBootImgSetProperty64 (UpdatedFdtBase, ChosenNode,\r
                                         "linux,initrd-end",\r
-                                        (UINTN)(RamdiskData + RamdiskSize));\r
+                                        (UINTN)RamdiskData + RamdiskSize);\r
   if (EFI_ERROR (Status)) {\r
     goto Fdt_Exit;\r
   }\r