Fix patch file

Hi Tristan,

   efi-vfirmware.hg fails to apply all the patches for me. 
I need the
patch below to make it apply against edk2 rev 2398 as
specified in the
README.  This just removes a couple chunks of the patch that
appear to
already be there.  Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamsonhp.com>
---

diff -r 5f6d57d09318 edk2-patches/load_fpswa.patch
--- a/edk2-patches/load_fpswa.patch	Mon Aug 27 06:07:30 2007
+0200
+++ b/edk2-patches/load_fpswa.patch	Mon Aug 27 12:29:20 2007
-0600
 -4,23
+4,7  diff -r aa821adafd29 EdkModulePkg/Librar
 diff -r aa821adafd29
EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c
 --- a/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c	Thu
Jul 19 11:14:46 2007 +0800
 +++ b/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c	Thu
Jul 19 11:16:01 2007 +0800
- -193,7 +193,6  Returns:
-                   0,
-                   &ImageHandle
-                   );
--  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "
BdsLibBootViaBootOption1n" ));
- 
-   //
-   // If we didn't find an image, we may need to load the
default
- -248,7 +247,6  Returns:
-                         0,
-                         &ImageHandle
-                         );
--		DEBUG ((EFI_D_INFO | EFI_D_LOAD, "
BdsLibBootViaBootOption2n" ));
-         if (EFI_ERROR (Status)) {
-           //
-           // The DevicePath failed, and it's not a valid
- -746,6 +744,74  Returns:
+ -744,6 +742,74  Returns:
    return Status;
  }
  
 -95,7
+79,7  diff -r aa821adafd29 EdkModulePkg/Librar
  EFI_STATUS
  BdsLibEnumerateAllBootOption (
    IN OUT LIST_ENTRY      *BdsBootOptionList
- -800,6 +866,10  Returns:
+ -798,6 +864,10  Returns:
      BdsLibBuildOptionFromVar (BdsBootOptionList,
L"BootOrder");
      return EFI_SUCCESS;
    }
 -106,11
+90,3  diff -r aa821adafd29 EdkModulePkg/Librar
    //
    // Notes: this dirty code is to get the legacy boot
option from the
    // BBS table and create to variable as the EFI boot
option, it should
- -851,7 +921,6  Returns:
-                     0,
-                     &ImageHandle
-                     );
--  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "
BdsLibBootViaBootOption3n" ));
-     if (!EFI_ERROR(Status)) {
-       //
-       // Verify the image is a EFI application (and not a
driver)



_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devellists.xensource.com
http://list
s.xensource.com/xen-ia64-devel

Quoting Alex Williamson <alex.williamsonhp.com>:

> Hi Tristan,
>
>    efi-vfirmware.hg fails to apply all the patches for
me.  I need the
> patch below to make it apply against edk2 rev 2398 as
specified in the
> README.  This just removes a couple chunks of the patch
that appear to
> already be there.  Thanks,
Yes, I saw this issue when I manually tried to apply this
patch.
Thank you for fixing this.

Tristan.

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devellists.xensource.com
http://list
s.xensource.com/xen-ia64-devel

On Mon, Aug 27, 2007 at 01:15:30PM -0600, Alex Williamson
wrote:
> Hi Tristan,
> 
>    efi-vfirmware.hg fails to apply all the patches for
me.  I need the
> patch below to make it apply against edk2 rev 2398 as
specified in the
> README.  This just removes a couple chunks of the patch
that appear to
> already be there.  Thanks,
Hi Alex,

I have just applied your patches.  Unfortunately I had to
apply the first and
third ones manually because of rn issues (Most EFI files
uses DOS
convention).  I suppose you should send them as attachement
rather that
inline.

Thank you for working on the GFW.
Tristan.

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devellists.xensource.com
http://list
s.xensource.com/xen-ia64-devel