Merge branch 'master' into dependabot/github_actions/github/issue-labeler-3.4dependabot/github_actions/github/issue-labeler-3.4

1 files changed, 1 insertions, 77 deletions

diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParser.c
index 376de078bc..8e980dabe3 100644
--- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParser.c
+++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParser.c
@@ -6,82 +6,6 @@
 **/

 

 #include "FdtHwInfoParser.h"

-#include "BootArch/ArmBootArchParser.h"

-#include "GenericTimer/ArmGenericTimerParser.h"

-#include "Gic/ArmGicDispatcher.h"

-#include "Pci/ArmPciConfigSpaceParser.h"

-#include "Serial/ArmSerialPortParser.h"

-

-/** Ordered table of parsers/dispatchers.

-

-  A parser parses a Device Tree to populate a specific CmObj type. None,

-  one or many CmObj can be created by the parser.

-  The created CmObj are then handed to the parser's caller through the

-  HW_INFO_ADD_OBJECT interface.

-  This can also be a dispatcher. I.e. a function that not parsing a

-  Device Tree but calling other parsers.

-*/

-STATIC CONST FDT_HW_INFO_PARSER_FUNC  HwInfoParserTable[] = {

-  ArmBootArchInfoParser,

-  ArmGenericTimerInfoParser,

-  ArmGicDispatcher,

-  ArmPciConfigInfoParser,

-  SerialPortDispatcher

-};

-

-/** Main dispatcher: sequentially call the parsers/dispatchers

-    of the HwInfoParserTable.

-

-  A parser parses a Device Tree to populate a specific CmObj type. None,

-  one or many CmObj can be created by the parser.

-  The created CmObj are then handed to the parser's caller through the

-  HW_INFO_ADD_OBJECT interface.

-  This can also be a dispatcher. I.e. a function that not parsing a

-  Device Tree but calling other parsers.

-

-  @param [in]  FdtParserHandle A handle to the parser instance.

-  @param [in]  FdtBranch       When searching for DT node name, restrict

-                               the search to this Device Tree branch.

-

-  @retval EFI_SUCCESS             The function completed successfully.

-  @retval EFI_ABORTED             An error occurred.

-  @retval EFI_INVALID_PARAMETER   Invalid parameter.

-  @retval EFI_NOT_FOUND           Not found.

-  @retval EFI_UNSUPPORTED         Unsupported.

-**/

-STATIC

-EFI_STATUS

-EFIAPI

-MainDispatcher (

-  IN  CONST FDT_HW_INFO_PARSER_HANDLE  FdtParserHandle,

-  IN        INT32                      FdtBranch

-  )

-{

-  EFI_STATUS  Status;

-  UINT32      Index;

-

-  if (fdt_check_header (FdtParserHandle->Fdt) < 0) {

-    ASSERT (0);

-    return EFI_INVALID_PARAMETER;

-  }

-

-  for (Index = 0; Index < ARRAY_SIZE (HwInfoParserTable); Index++) {

-    Status = HwInfoParserTable[Index](

-                                      FdtParserHandle,

-                                      FdtBranch

-                                      );

-    if (EFI_ERROR (Status)  &&

-        (Status != EFI_NOT_FOUND))

-    {

-      // If EFI_NOT_FOUND, the parser didn't find information in the DT.

-      // Don't trigger an error.

-      ASSERT (0);

-      return Status;

-    }

-  } // for

-

-  return EFI_SUCCESS;

-}

 

 /** Initialise the HwInfoParser.

 

@@ -159,7 +83,7 @@ HwInfoParse (
   }

 

   // Call all the parsers from the root node (-1).

-  Status = MainDispatcher (

+  Status = ArchFdtHwInfoMainDispatcher (

              (FDT_HW_INFO_PARSER_HANDLE)ParserHandle,

              -1

              );