EmbeddedPkg/AndroidFastboot: split android boot header

[mirror_edk2.git] / EmbeddedPkg / Application / AndroidFastboot / AndroidBootImg.c

diff --git a/EmbeddedPkg/Application/AndroidFastboot/AndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/AndroidBootImg.c
index f3e770bcc98028d7b54623ca2daf57c5514773b6..2f7f093ed87da3cfecf9af012f9683360d634885 100644 (file)
--- a/EmbeddedPkg/Application/AndroidFastboot/AndroidBootImg.c
+++ b/EmbeddedPkg/Application/AndroidFastboot/AndroidBootImg.c
@@ -14,32 +14,6 @@
 \r
 #include "AndroidFastbootApp.h"\r
 \r
-#define BOOT_MAGIC        "ANDROID!"\r
-#define BOOT_MAGIC_LENGTH sizeof (BOOT_MAGIC) - 1\r
-\r
-// Check Val (unsigned) is a power of 2 (has only one bit set)\r
-#define IS_POWER_OF_2(Val) (Val != 0 && ((Val & (Val - 1)) == 0))\r
-\r
-// No documentation for this really - sizes of fields has been determined\r
-// empirically.\r
-#pragma pack(1)\r
-typedef struct {\r
-  CHAR8   BootMagic[BOOT_MAGIC_LENGTH];\r
-  UINT32  KernelSize;\r
-  UINT32  KernelAddress;\r
-  UINT32  RamdiskSize;\r
-  UINT32  RamdiskAddress;\r
-  UINT32  SecondStageBootloaderSize;\r
-  UINT32  SecondStageBootloaderAddress;\r
-  UINT32  KernelTaggsAddress;\r
-  UINT32  PageSize;\r
-  UINT32  Reserved[2];\r
-  CHAR8   ProductName[16];\r
-  CHAR8   KernelArgs[BOOTIMG_KERNEL_ARGS_SIZE];\r
-  UINT32  Id[32];\r
-} ANDROID_BOOTIMG_HEADER;\r
-#pragma pack()\r
-\r
 // Find the kernel and ramdisk in an Android boot.img.\r
 // return EFI_INVALID_PARAMTER if the boot.img is invalid (i.e. doesn't have the\r
 //  right magic value),\r
@@ -64,7 +38,8 @@ ParseAndroidBootImg (
 \r
   Header = (ANDROID_BOOTIMG_HEADER *) BootImg;\r
 \r
-  if (AsciiStrnCmp (Header->BootMagic, BOOT_MAGIC, BOOT_MAGIC_LENGTH) != 0) {\r
+  if (AsciiStrnCmp ((CONST CHAR8 *)Header->BootMagic, ANDROID_BOOT_MAGIC,\r
+                    ANDROID_BOOT_MAGIC_LENGTH) != 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -72,7 +47,7 @@ ParseAndroidBootImg (
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  ASSERT (IS_POWER_OF_2 (Header->PageSize));\r
+  ASSERT (IS_VALID_ANDROID_PAGE_SIZE (Header->PageSize));\r
 \r
   *KernelSize = Header->KernelSize;\r
   *Kernel = BootImgBytePtr + Header->PageSize;\r
@@ -84,8 +59,8 @@ ParseAndroidBootImg (
                  + ALIGN_VALUE (Header->KernelSize, Header->PageSize));\r
   }\r
 \r
-  AsciiStrnCpyS (KernelArgs, BOOTIMG_KERNEL_ARGS_SIZE, Header->KernelArgs,\r
-    BOOTIMG_KERNEL_ARGS_SIZE);\r
+  AsciiStrnCpyS (KernelArgs, ANDROID_BOOTIMG_KERNEL_ARGS_SIZE, Header->KernelArgs,\r
+    ANDROID_BOOTIMG_KERNEL_ARGS_SIZE);\r
 \r
   return EFI_SUCCESS;\r
 }\r