From a709adfaf0bebbaf3d989f56b500e3985687d0e3 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Tue, 29 Dec 2009 06:16:53 +0000 Subject: Sync tool code to BuildTools project r1783. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9623 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/C/GenFv/GenFv.c | 4 ++-- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'BaseTools/Source/C/GenFv') diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/GenFv.c index f2ff2d29cd..135c9ed23f 100644 --- a/BaseTools/Source/C/GenFv/GenFv.c +++ b/BaseTools/Source/C/GenFv/GenFv.c @@ -134,11 +134,11 @@ Returns: fprintf (stdout, " -m logfile, --map logfile\n\ Logfile is the output fv map file name. if it is not\n\ given, the FvName.map will be the default map file name\n"); - fprintf (stdout, " -g Guid, --guid GuidValue\n\ + fprintf (stdout, " -g Guid, --guid Guid\n\ GuidValue is one specific capsule guid value\n\ or fv file system guid value.\n\ Its format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\n"); - fprintf (stdout, " --FvNameGuid GuidValue is the Fv Name Guid value.\n\ + fprintf (stdout, " --FvNameGuid Guid Guid is used to specify Fv Name.\n\ Its format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\n"); fprintf (stdout, " --capflag CapFlag Capsule Reset Flag can be PersistAcrossReset,\n\ or PopulateSystemTable or InitiateReset or not set\n"); diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index 6b5d6bda2a..d17a2ff1a8 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c @@ -2975,7 +2975,7 @@ Returns: return EFI_OUT_OF_RESOURCES; } memset ((VOID *) MemoryImagePointer, 0, (UINTN) ImageContext.ImageSize + ImageContext.SectionAlignment); - ImageContext.ImageAddress = ((UINTN) MemoryImagePointer + ImageContext.SectionAlignment - 1) & (~(ImageContext.SectionAlignment - 1)); + ImageContext.ImageAddress = ((UINTN) MemoryImagePointer + ImageContext.SectionAlignment - 1) & (~((INT64)ImageContext.SectionAlignment - 1)); Status = PeCoffLoaderLoadImage (&ImageContext); if (EFI_ERROR (Status)) { -- cgit v1.2.3