Upl

MdeModulePkg/Library/HobPrintLib/HobPrintLib.c

@@ -279,8 +279,8 @@ PrintCpuHob (
   Hob.Raw = (UINT8 *)HobStart;
   ASSERT (HobLength >= sizeof (*Hob.Cpu));
 
-  DEBUG ((DEBUG_INFO, "   SizeOfMemorySpace = 0x%lx\n", Hob.Cpu->SizeOfMemorySpace));
-  DEBUG ((DEBUG_INFO, "   SizeOfIoSpace     = 0x%lx\n", Hob.Cpu->SizeOfIoSpace));
+  DEBUG ((DEBUG_INFO, "   SizeOfMemorySpace = 0x%x\n", Hob.Cpu->SizeOfMemorySpace));
+  DEBUG ((DEBUG_INFO, "   SizeOfIoSpace     = 0x%x\n", Hob.Cpu->SizeOfIoSpace));
   return EFI_SUCCESS;
 }
 

UefiPayloadPkg/Library/CustomFdtNodeParserLib/CustomFdtNodeParserLib.c

@@ -124,29 +124,36 @@ CustomFdtNodeParser (
 {
   INT32                 Node, CustomNode;
   INT32                 TempLen;
+  CONST FDT_PROPERTY    *PropertyPtr;
   UINT64                *Data64;
   UINTN                 CHobList;
-  CONST FDT_PROPERTY    *PropertyPtr;
   EFI_PEI_HOB_POINTERS  Hob;
 
   CHobList = (UINTN)HobList;
 
-  DEBUG ((DEBUG_INFO, "%a() #1 \n", __func__));
+  DEBUG ((DEBUG_INFO, "%a() #1 CHobList %p\n", __func__, CHobList));
 
   //
   // Look for if exists hob list node
   //
   Node = FdtSubnodeOffsetNameLen (FdtBase, 0, "options", (INT32)AsciiStrLen ("options"));
   if (Node > 0) {
-    DEBUG ((DEBUG_INFO, "  Found options node (%08X)", Node));
+    DEBUG ((DEBUG_INFO, "  Found options node (%08X)\n", Node));
     CustomNode = FdtSubnodeOffsetNameLen (FdtBase, Node, "upl-custom", (INT32)AsciiStrLen ("upl-custom"));
     if (CustomNode > 0) {
       DEBUG ((DEBUG_INFO, "  Found upl-custom node (%08X)", CustomNode));
       PropertyPtr = FdtGetProperty (FdtBase, CustomNode, "hoblistptr", &TempLen);
-      Data64      = (UINT64 *)(PropertyPtr->Data);
-      CHobList    = (UINTN)Fdt64ToCpu (ReadUnaligned64 (Data64));
-      DEBUG ((DEBUG_INFO, "  Found hob list node (%08X)", CustomNode));
-      DEBUG ((DEBUG_INFO, " -pointer  %016lX\n", CHobList));
+      if (PropertyPtr != NULL) {
+        Data64      = (UINT64 *)(PropertyPtr->Data);
+        CHobList    = (UINTN)Fdt64ToCpu (ReadUnaligned64 (Data64));
+        DEBUG ((DEBUG_INFO, "  Found hob list node (%08X) -pointer  %016lX\n", CustomNode, CHobList));
+      } else {
+        DEBUG ((DEBUG_INFO, "  Not Found hob list node\n"));
+        return CHobList;
+      }
+    } else {
+      DEBUG ((DEBUG_INFO, "  Not Found hob list node\n"));
+      return CHobList;
     }
   }