From 3f0edb77f6c6b2ae644fac5526febbf3e2fbef73 Mon Sep 17 00:00:00 2001 From: Maurice Ma Date: Mon, 24 Oct 2016 14:34:52 -0700 Subject: [PATCH] CorebootPayloadPkg DSC: Add build option to disable deprecated APIs Add the following definition in the [BuildOptions] section in package DSC files to disable APIs that are deprecated. As a result replaced PcdSet32 with PcdSet32S accordingly to make the build pass. [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES Cc: Prince Agyeman Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=163 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Maurice Ma Reviewed-by: Prince Agyeman --- CorebootModulePkg/CbSupportPei/CbSupportPei.c | 3 ++- CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 1 + CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CorebootModulePkg/CbSupportPei/CbSupportPei.c b/CorebootModulePkg/CbSupportPei/CbSupportPei.c index 366682b32d..9d5803449e 100755 --- a/CorebootModulePkg/CbSupportPei/CbSupportPei.c +++ b/CorebootModulePkg/CbSupportPei/CbSupportPei.c @@ -329,7 +329,8 @@ CbPeiEntryPoint ( if ((CbParseGetCbHeader (1, &pCbHeader) == RETURN_SUCCESS) && ((UINTN)pCbHeader > BASE_4KB)) { DEBUG((EFI_D_ERROR, "Actual Coreboot header: %p.\n", pCbHeader)); - PcdSet32 (PcdCbHeaderPointer, (UINT32)(UINTN)pCbHeader); + Status = PcdSet32S (PcdCbHeaderPointer, (UINT32)(UINTN)pCbHeader); + ASSERT_EFI_ERROR (Status); } // diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc index 7a4ee2b4d3..83b1f9abbf 100644 --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc @@ -83,6 +83,7 @@ DEFINE SHELL_TYPE = FULL_BIN [BuildOptions] + *_*_*_CC_FLAGS = /D DISABLE_NEW_DEPRECATED_INTERFACES GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG INTEL:RELEASE_*_*_CC_FLAGS = /D MDEPKG_NDEBUG diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc index c49f05ec8a..b0aec3d7b2 100644 --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc @@ -83,6 +83,7 @@ DEFINE SHELL_TYPE = FULL_BIN [BuildOptions] + *_*_*_CC_FLAGS = /D DISABLE_NEW_DEPRECATED_INTERFACES GCC:DEBUG_*_*_CC_FLAGS = -Og -flto GCC:DEBUG_*_*_DLINK_FLAGS = -flto GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG