Platforms/HiKey960FastbootDxe: clean code
Remove unnecessary code.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
diff --git a/Platforms/Hisilicon/HiKey960/HiKey960FastbootDxe/HiKey960FastbootDxe.c b/Platforms/Hisilicon/HiKey960/HiKey960FastbootDxe/HiKey960FastbootDxe.c
index 0986900..648b72b 100644
--- a/Platforms/Hisilicon/HiKey960/HiKey960FastbootDxe/HiKey960FastbootDxe.c
+++ b/Platforms/Hisilicon/HiKey960/HiKey960FastbootDxe/HiKey960FastbootDxe.c
@@ -37,22 +37,8 @@
#include <Library/PrintLib.h>
#include <Library/TimerLib.h>
-#include <Guid/HiKey960Variable.h>
+#define PARTITION_NAME_MAX_LENGTH (72/2)
-#define FLASH_DEVICE_PATH_SIZE(DevPath) ( GetDevicePathSize (DevPath) - \
- sizeof (EFI_DEVICE_PATH_PROTOCOL))
-
-#define PARTITION_NAME_MAX_LENGTH 72/2
-
-#define IS_ALPHA(Char) (((Char) <= L'z' && (Char) >= L'a') || \
- ((Char) <= L'Z' && (Char) >= L'Z'))
-#define IS_HEXCHAR(Char) (((Char) <= L'9' && (Char) >= L'0') || \
- IS_ALPHA(Char))
-
-#define HIKEY_ERASE_SIZE (16 * 1024 * 1024)
-#define HIKEY_ERASE_BLOCKS (HIKEY_ERASE_SIZE / EFI_PAGE_SIZE)
-
-#define SERIAL_NUMBER_BLOCK_SIZE EFI_PAGE_SIZE
#define SERIAL_NUMBER_LBA 20
#define RANDOM_MAX 0x7FFFFFFFFFFFFFFF
#define RANDOM_MAGIC 0x9A4DBEAF
@@ -249,7 +235,10 @@
InsertTailList (&mPartitionListHead, &Entry->Link);
}
Exit:
- FreePages ((VOID *)((UINTN)PartitionEntries - (2 * EFI_PAGE_SIZE)), EFI_SIZE_TO_PAGES (6 * EFI_PAGE_SIZE));
+ FreePages (
+ (VOID *)((UINTN)PartitionEntries - (2 * mFlashBlockIo->Media->BlockSize)),
+ EFI_SIZE_TO_PAGES (6 * mFlashBlockIo->Media->BlockSize)
+ );
return Status;
}
diff --git a/Platforms/Hisilicon/HiKey960/HiKey960FastbootDxe/HiKey960FastbootDxe.inf b/Platforms/Hisilicon/HiKey960/HiKey960FastbootDxe/HiKey960FastbootDxe.inf
index 2391265..a8aa908 100644
--- a/Platforms/Hisilicon/HiKey960/HiKey960FastbootDxe/HiKey960FastbootDxe.inf
+++ b/Platforms/Hisilicon/HiKey960/HiKey960FastbootDxe/HiKey960FastbootDxe.inf
@@ -40,23 +40,19 @@
[Protocols]
gAndroidFastbootPlatformProtocolGuid
gEfiBlockIoProtocolGuid
- gEfiDiskIoProtocolGuid
- gEfiSimpleTextOutProtocolGuid
- gEfiEraseBlockProtocolGuid
gEfiDevicePathToTextProtocolGuid
+ gEfiDiskIoProtocolGuid
+ gEfiEraseBlockProtocolGuid
+ gEfiSimpleTextOutProtocolGuid
[Packages]
+ ArmPlatformPkg/ArmPlatformPkg.dec
+ ArmPkg/ArmPkg.dec
EmbeddedPkg/EmbeddedPkg.dec
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- ArmPlatformPkg/ArmPlatformPkg.dec
- ArmPlatformPkg/ArmVExpressPkg/ArmVExpressPkg.dec
- ArmPkg/ArmPkg.dec
OpenPlatformPkg/Platforms/Hisilicon/HiKey960/HiKey960.dec
-[Guids]
- gHiKey960VariableGuid
-
[Pcd]
gArmPlatformTokenSpaceGuid.PcdFirmwareVendor
gHiKey960TokenSpaceGuid.PcdAndroidFastbootNvmDevicePath
