diff options
| author | Guo Dong <guo.dong@intel.com> | 2021-10-15 12:10:11 -0700 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-10-19 04:27:41 +0000 |
| commit | 6ef57974472de604cf436ce904a88f0667cee8bd (patch) | |
| tree | 175db3ec47711ae8ffdf71feab8e51c6282c7aed /UefiPayloadPkg/Include | |
| parent | 91a978ce7e0c7a327cff1d9411b0e1c9dae8824a (diff) | |
| download | edk2-6ef57974472de604cf436ce904a88f0667cee8bd.tar.gz edk2-6ef57974472de604cf436ce904a88f0667cee8bd.tar.bz2 edk2-6ef57974472de604cf436ce904a88f0667cee8bd.zip | |
UefiPayloadPkg: Fix ECC reported issues
V2: Fix more header files on #ifdef variable
ECC reported some issues on UefiPayloadPkg, this patch fixed
most of them except several files including ElfLib\Elf32.h,
coreboot.h, CbParseLib.c, etc.
It also removed unused functions in ResetSystemLib and Hob.c.
Signed-off-by: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>
Diffstat (limited to 'UefiPayloadPkg/Include')
| -rw-r--r-- | UefiPayloadPkg/Include/Coreboot.h | 1 | ||||
| -rw-r--r-- | UefiPayloadPkg/Include/Guid/AcpiBoardInfoGuid.h | 4 | ||||
| -rw-r--r-- | UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h | 4 | ||||
| -rw-r--r-- | UefiPayloadPkg/Include/Guid/SerialPortInfoGuid.h | 4 | ||||
| -rw-r--r-- | UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h | 4 | ||||
| -rw-r--r-- | UefiPayloadPkg/Include/Library/BlParseLib.h | 8 | ||||
| -rw-r--r-- | UefiPayloadPkg/Include/Library/DxeHobListLib.h | 4 | ||||
| -rw-r--r-- | UefiPayloadPkg/Include/Library/PlatformSupportLib.h | 4 |
8 files changed, 17 insertions, 16 deletions
diff --git a/UefiPayloadPkg/Include/Coreboot.h b/UefiPayloadPkg/Include/Coreboot.h index 8a6c300cde..86e14a1a4d 100644 --- a/UefiPayloadPkg/Include/Coreboot.h +++ b/UefiPayloadPkg/Include/Coreboot.h @@ -245,5 +245,6 @@ struct cb_cbmem_tab { (void *)(((UINT8 *) (_rec)) + sizeof(*(_rec)) \
+ (sizeof((_rec)->map[0]) * (_idx)))
+typedef struct cb_memory CB_MEMORY;
#endif // _COREBOOT_PEI_H_INCLUDED_
diff --git a/UefiPayloadPkg/Include/Guid/AcpiBoardInfoGuid.h b/UefiPayloadPkg/Include/Guid/AcpiBoardInfoGuid.h index 043b748ae4..2ff0677165 100644 --- a/UefiPayloadPkg/Include/Guid/AcpiBoardInfoGuid.h +++ b/UefiPayloadPkg/Include/Guid/AcpiBoardInfoGuid.h @@ -6,8 +6,8 @@ **/
-#ifndef __ACPI_BOARD_INFO_GUID_H__
-#define __ACPI_BOARD_INFO_GUID_H__
+#ifndef ACPI_BOARD_INFO_GUID_H_
+#define ACPI_BOARD_INFO_GUID_H_
///
/// Board information GUID
diff --git a/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h b/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h index 47922b1851..1dda3ee7c5 100644 --- a/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h +++ b/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h @@ -6,8 +6,8 @@ **/
-#ifndef __MEMORY_MAP_INFO_GUID_H__
-#define __MEMORY_MAP_INFO_GUID_H__
+#ifndef MEMORY_MAP_INFO_GUID_H_
+#define MEMORY_MAP_INFO_GUID_H_
#include <Library/PcdLib.h>
diff --git a/UefiPayloadPkg/Include/Guid/SerialPortInfoGuid.h b/UefiPayloadPkg/Include/Guid/SerialPortInfoGuid.h index a15d5b8671..10197134a3 100644 --- a/UefiPayloadPkg/Include/Guid/SerialPortInfoGuid.h +++ b/UefiPayloadPkg/Include/Guid/SerialPortInfoGuid.h @@ -6,8 +6,8 @@ **/
-#ifndef __SERIAL_PORT_INFO_GUID_H__
-#define __SERIAL_PORT_INFO_GUID_H__
+#ifndef SERIAL_PORT_INFO_GUID_H_
+#define SERIAL_PORT_INFO_GUID_H_
///
/// Serial Port Information GUID
diff --git a/UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h b/UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h index 2446820285..e742dd0ca5 100644 --- a/UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h +++ b/UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h @@ -6,8 +6,8 @@ **/
-#ifndef __SYSTEM_TABLE_INFO_GUID_H__
-#define __SYSTEM_TABLE_INFO_GUID_H__
+#ifndef SYSTEM_TABLE_INFO_GUID_H_
+#define SYSTEM_TABLE_INFO_GUID_H_
///
/// System Table Information GUID
diff --git a/UefiPayloadPkg/Include/Library/BlParseLib.h b/UefiPayloadPkg/Include/Library/BlParseLib.h index 433a83f8b8..7198e419bd 100644 --- a/UefiPayloadPkg/Include/Library/BlParseLib.h +++ b/UefiPayloadPkg/Include/Library/BlParseLib.h @@ -6,6 +6,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
+#ifndef BOOTLOADER_PARSE_LIB_
+#define BOOTLOADER_PARSE_LIB_
+
#include <PiPei.h>
#include <Guid/GraphicsInfoHob.h>
#include <Guid/MemoryMapInfoGuid.h>
@@ -13,9 +16,6 @@ #include <Guid/SystemTableInfoGuid.h>
#include <Guid/AcpiBoardInfoGuid.h>
-#ifndef __BOOTLOADER_PARSE_LIB__
-#define __BOOTLOADER_PARSE_LIB__
-
#define GET_BOOTLOADER_PARAMETER() PcdGet64 (PcdBootloaderParameter)
typedef RETURN_STATUS \
@@ -73,7 +73,7 @@ ParseSystemTable ( /**
Find the serial port information
- @param SERIAL_PORT_INFO Pointer to serial port info structure
+ @param SerialPortInfo Pointer to serial port info structure
@retval RETURN_SUCCESS Successfully find the serial port information.
@retval RETURN_NOT_FOUND Failed to find the serial port information .
diff --git a/UefiPayloadPkg/Include/Library/DxeHobListLib.h b/UefiPayloadPkg/Include/Library/DxeHobListLib.h index 7e9b23f6d7..139b11e329 100644 --- a/UefiPayloadPkg/Include/Library/DxeHobListLib.h +++ b/UefiPayloadPkg/Include/Library/DxeHobListLib.h @@ -15,8 +15,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/
-#ifndef __DXE_HOB_LIST_LIB_H__
-#define __DXE_HOB_LIST_LIB_H__
+#ifndef DXE_HOB_LIST_LIB_H_
+#define DXE_HOB_LIST_LIB_H_
///
/// Cache copy of the start of HOB list
diff --git a/UefiPayloadPkg/Include/Library/PlatformSupportLib.h b/UefiPayloadPkg/Include/Library/PlatformSupportLib.h index d9f0b83075..73263722eb 100644 --- a/UefiPayloadPkg/Include/Library/PlatformSupportLib.h +++ b/UefiPayloadPkg/Include/Library/PlatformSupportLib.h @@ -8,8 +8,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/
-#ifndef __BOOTLOADER_PLATFORM_SUPPORT_LIB__
-#define __BOOTLOADER_PLATFORM_SUPPORT_LIB__
+#ifndef BOOTLOADER_PLATFORM_SUPPORT_LIB_
+#define BOOTLOADER_PLATFORM_SUPPORT_LIB_
/**
Parse platform specific information from bootloader
|