ArmPlatformPkg/Bds: Fixed condition on LOAD_OPTION_CATEGORY_BOOT

The condition tries to identify if we were starting a EFI
OS Loader or EFI Application.
But LOAD_OPTION_CATEGORY_BOOT was used as a mask to check the
attributes of the boot options while it is not a mask.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15900 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/Bds/BootOption.c b/ArmPlatformPkg/Bds/BootOption.c
index aa8be74bc9b6376b5cfa97d4b5c86c4812d82317..8ed636b53bbbd744d7628e34f70ca86396bcb3e2 100644 (file)
--- a/ArmPlatformPkg/Bds/BootOption.c
+++ b/ArmPlatformPkg/Bds/BootOption.c
@@ -39,7 +39,7 @@ BootOptionStart (
     LoaderType = ReadUnaligned32 ((CONST UINT32*)&OptionalData->Header.LoaderType);\r
 \r
     if (LoaderType == BDS_LOADER_EFI_APPLICATION) {\r
     LoaderType = ReadUnaligned32 ((CONST UINT32*)&OptionalData->Header.LoaderType);\r
 \r
     if (LoaderType == BDS_LOADER_EFI_APPLICATION) {\r

-      if ((BootOption->Attributes & LOAD_OPTION_CATEGORY_BOOT) == 0) {\r
+      if ((BootOption->Attributes & LOAD_OPTION_CATEGORY) == LOAD_OPTION_CATEGORY_APP) {\r

         // Need to connect every drivers to ensure no dependencies are missing for the application\r
         BdsConnectAllDrivers ();\r
       }\r
         // Need to connect every drivers to ensure no dependencies are missing for the application\r
         BdsConnectAllDrivers ();\r
       }\r


@@ -91,7 +91,7 @@ BootOptionStart (
     }\r
   } else {\r
     // Connect all the drivers if the EFI Application is not a EFI OS Loader\r
     }\r
   } else {\r
     // Connect all the drivers if the EFI Application is not a EFI OS Loader\r

-    if ((BootOption->Attributes & LOAD_OPTION_CATEGORY_BOOT) == 0) {\r
+    if ((BootOption->Attributes & LOAD_OPTION_CATEGORY) == LOAD_OPTION_CATEGORY_APP) {\r

       BdsConnectAllDrivers ();\r
     }\r
 \r
       BdsConnectAllDrivers ();\r
     }\r
 \r