Nt32Pkg: Add LoadFileOnFv2 driver in DSC/FDF

After add LoadFileOnFv2, PlatformBootManagerLib doesn't need to find Shell
application from FV.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

3 files changed, 19 insertions, 107 deletions

diff --git a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
index 007e18a956..e2c3a4e5f4 100644
--- a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
+++ b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
@@ -58,91 +58,6 @@ PlatformBootManagerDiagnostics (
 }

 

 /**

-  Return the index of the load option in the load option array.

-

-  The function consider two load options are equal when the 

-  OptionType, Attributes, Description, FilePath and OptionalData are equal.

-

-  @param Key    Pointer to the load option to be found.

-  @param Array  Pointer to the array of load options to be found.

-  @param Count  Number of entries in the Array.

-

-  @retval -1          Key wasn't found in the Array.

-  @retval 0 ~ Count-1 The index of the Key in the Array.

-**/

-INTN

-PlatformFindLoadOption (

-  IN CONST EFI_BOOT_MANAGER_LOAD_OPTION *Key,

-  IN CONST EFI_BOOT_MANAGER_LOAD_OPTION *Array,

-  IN UINTN                              Count

-  )

-{

-  UINTN                             Index;

-

-  for (Index = 0; Index < Count; Index++) {

-    if ((Key->OptionType == Array[Index].OptionType) &&

-        (Key->Attributes == Array[Index].Attributes) &&

-        (StrCmp (Key->Description, Array[Index].Description) == 0) &&

-        (CompareMem (Key->FilePath, Array[Index].FilePath, GetDevicePathSize (Key->FilePath)) == 0) &&

-        (Key->OptionalDataSize == Array[Index].OptionalDataSize) &&

-        (CompareMem (Key->OptionalData, Array[Index].OptionalData, Key->OptionalDataSize) == 0)) {

-      return (INTN) Index;

-    }

-  }

-

-  return -1;

-}

-

-VOID

-PlatformRegisterFvBootOption (

-  EFI_GUID                         *FileGuid,

-  CHAR16                           *Description,

-  UINT32                           Attributes

-  )

-{

-  EFI_STATUS                        Status;

-  UINTN                             OptionIndex;

-  EFI_BOOT_MANAGER_LOAD_OPTION      NewOption;

-  EFI_BOOT_MANAGER_LOAD_OPTION      *BootOptions;

-  UINTN                             BootOptionCount;

-  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;

-  EFI_LOADED_IMAGE_PROTOCOL         *LoadedImage;

-  EFI_DEVICE_PATH_PROTOCOL          *DevicePath;

-

-  Status = gBS->HandleProtocol (gImageHandle, &gEfiLoadedImageProtocolGuid, (VOID **) &LoadedImage);

-  ASSERT_EFI_ERROR (Status);

-

-  EfiInitializeFwVolDevicepathNode (&FileNode, FileGuid);

-  DevicePath = AppendDevicePathNode (

-                 DevicePathFromHandle (LoadedImage->DeviceHandle),

-                 (EFI_DEVICE_PATH_PROTOCOL *) &FileNode

-                 );

-

-  Status = EfiBootManagerInitializeLoadOption (

-             &NewOption,

-             LoadOptionNumberUnassigned,

-             LoadOptionTypeBoot,

-             Attributes,

-             Description,

-             DevicePath,

-             NULL,

-             0

-             );

-  if (!EFI_ERROR (Status)) {

-    BootOptions = EfiBootManagerGetLoadOptions (&BootOptionCount, LoadOptionTypeBoot);

-

-    OptionIndex = PlatformFindLoadOption (&NewOption, BootOptions, BootOptionCount);

-

-    if (OptionIndex == -1) {

-      Status = EfiBootManagerAddLoadOptionVariable (&NewOption, (UINTN) -1);

-      ASSERT_EFI_ERROR (Status);

-    }

-    EfiBootManagerFreeLoadOption (&NewOption);

-    EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);

-  }

-}

-

-/**

   Do the platform specific action before the console is connected.

 

   Such as:

@@ -159,9 +74,6 @@ PlatformBootManagerBeforeConsole (
   UINTN                        Index;

   EFI_STATUS                   Status;

   WIN_NT_SYSTEM_CONFIGURATION  *Configuration;

-  EFI_INPUT_KEY                Enter;

-  EFI_INPUT_KEY                F2;

-  EFI_BOOT_MANAGER_LOAD_OPTION BootOption;

 

   GetVariable2 (L"Setup", &gEfiWinNtSystemConfigGuid, (VOID **) &Configuration, NULL);

   if (Configuration != NULL) {

@@ -200,24 +112,6 @@ PlatformBootManagerBeforeConsole (
       EfiBootManagerUpdateConsoleVariable (ErrOut, gPlatformConsole[Index].DevicePath, NULL);

     }

   }

-

-  //

-  // Register ENTER as CONTINUE key

-  //

-  Enter.ScanCode    = SCAN_NULL;

-  Enter.UnicodeChar = CHAR_CARRIAGE_RETURN;

-  EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL);

-  //

-  // Map F2 to Boot Manager Menu

-  //

-  F2.ScanCode    = SCAN_F2;

-  F2.UnicodeChar = CHAR_NULL;

-  EfiBootManagerGetBootManagerMenu (&BootOption);

-  EfiBootManagerAddKeyOptionVariable (NULL, (UINT16) BootOption.OptionNumber, 0, &F2, NULL);

-  //

-  // Register UEFI Shell

-  //

-  PlatformRegisterFvBootOption (PcdGetPtr (PcdShellFile), L"UEFI Shell", LOAD_OPTION_ACTIVE);

 }

 

 /**

@@ -238,6 +132,9 @@ PlatformBootManagerAfterConsole (
 {

   EFI_GRAPHICS_OUTPUT_BLT_PIXEL  Black;

   EFI_GRAPHICS_OUTPUT_BLT_PIXEL  White;

+  EFI_INPUT_KEY                  Enter;

+  EFI_INPUT_KEY                  F2;

+  EFI_BOOT_MANAGER_LOAD_OPTION   BootOption;

 

   Black.Blue = Black.Green = Black.Red = Black.Reserved = 0;

   White.Blue = White.Green = White.Red = White.Reserved = 0xFF;

@@ -245,6 +142,20 @@ PlatformBootManagerAfterConsole (
   EfiBootManagerConnectAll ();

   EfiBootManagerRefreshAllBootOption ();

 

+  //

+  // Register ENTER as CONTINUE key

+  //

+  Enter.ScanCode    = SCAN_NULL;

+  Enter.UnicodeChar = CHAR_CARRIAGE_RETURN;

+  EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL);

+  //

+  // Map F2 to Boot Manager Menu

+  //

+  F2.ScanCode    = SCAN_F2;

+  F2.UnicodeChar = CHAR_NULL;

+  EfiBootManagerGetBootManagerMenu (&BootOption);

+  EfiBootManagerAddKeyOptionVariable (NULL, (UINT16) BootOption.OptionNumber, 0, &F2, NULL);

+

   PlatformBootManagerDiagnostics (QUICK, TRUE);

   

   PrintXY (10, 10, &White, &Black, L"F2    to enter Boot Manager Menu.                                            ");

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index ada0a2dd03..e3f9326e22 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -469,6 +469,7 @@
   MdeModulePkg/Application/VariableInfo/VariableInfo.inf

 

   MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf

+  MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf

 

 ###################################################################################################

 #

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index d7b2696ce3..39046ec4bc 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -282,7 +282,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp

   }

 

-

+INF MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf

 ################################################################################

 #

 # Rules are use with the [FV] section's module INF type to define