From 2e497f750976dbe1f40ef7b354eef1ef82c359cc Mon Sep 17 00:00:00 2001 From: Guo Mang Date: Fri, 27 Apr 2018 15:46:50 +0800 Subject: Upgrading core: Fix GCC build failure Upgrate core to UDK2018: Fix GCC build failure. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Guo Mang --- .../Board/AuroraGlacier/BoardInitPostMem/TypeC.c | 34 ++++---- Platform/BroxtonPlatformPkg/BuildBxtBios.sh | 94 ++++++++++++---------- Platform/BroxtonPlatformPkg/BuildIFWI.sh | 4 +- .../Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c | 36 +-------- .../IntelFsp2WrapperPkg/FspInitPei/SecMain.c | 6 +- .../IntelFsp2WrapperPkg/FspInitPei/SecMain.h | 4 +- .../SecPeiFspPlatformSecLibSample/Ia32/SecEntry.S | 8 +- .../Ia32/SecEntry.asm | 8 +- .../Common/SeCPolicyInitDxe/SeCPolicyInitDxe.c | 38 ++++----- .../BroxtonPlatformPkg/PlatformDsc/Components.dsc | 26 +++++- Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc | 12 +-- 11 files changed, 133 insertions(+), 137 deletions(-) (limited to 'Platform') diff --git a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.c b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.c index 36419ec230..2513738261 100644 --- a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.c +++ b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.c @@ -31,7 +31,7 @@ static MUX_PROGRAMMING_TABLE mAuroraMuxTable[] = { }; VOID -PrintChar ( +AgPrintChar ( IN UINTN DebugMask, IN UINTN Count, IN CHAR16 *Char @@ -47,7 +47,7 @@ PrintChar ( #define DIVIDING_LINE "+----------------------------------------------------+------------------+\n" VOID -DumpParagraph ( +AgDumpParagraph ( IN UINTN DebugMask, IN VOID *Ptr, IN UINTN Count @@ -88,12 +88,12 @@ DumpParagraph ( // // Print header // - PrintChar (DebugMask, PlaceHolders + 5, L" "); + AgPrintChar (DebugMask, PlaceHolders + 5, L" "); DEBUG ((DebugMask, DIVIDING_LINE)); - PrintChar (DebugMask, PlaceHolders + 5, L" "); + AgPrintChar (DebugMask, PlaceHolders + 5, L" "); DEBUG ((DebugMask, "| x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF | String |\n")); DEBUG ((DebugMask, " +")); - PrintChar (DebugMask, PlaceHolders + 3, L"-"); + AgPrintChar (DebugMask, PlaceHolders + 3, L"-"); DEBUG ((DebugMask, DIVIDING_LINE)); // // Print data @@ -105,7 +105,7 @@ DumpParagraph ( if (Index % 0x10 == 0x00) { if ((Index > 0) && ((Index / 0x10) % 0x04 == 0x00) && (Paragraphs > 6)) { DEBUG ((DebugMask, " +")); - PrintChar (DebugMask, PlaceHolders + 3, L"-"); + AgPrintChar (DebugMask, PlaceHolders + 3, L"-"); DEBUG ((DebugMask, DIVIDING_LINE)); } DEBUG ((DebugMask, " | %0*xx | ", PlaceHolders, (Index / 0x10))); @@ -144,14 +144,14 @@ DumpParagraph ( // Print footer // DEBUG ((DebugMask, " +")); - PrintChar (DebugMask, PlaceHolders + 3, L"-"); + AgPrintChar (DebugMask, PlaceHolders + 3, L"-"); DEBUG ((DebugMask, DIVIDING_LINE)); } } EFI_STATUS EFIAPI -ReadMux ( +AgReadMux ( IN UINT8 SlaveAddress, IN UINT8 Offset, OUT UINT8 *Data @@ -171,7 +171,7 @@ ReadMux ( EFI_STATUS EFIAPI -WriteMux ( +AgWriteMux ( IN UINT8 SlaveAddress, IN UINT8 Offset, OUT UINT8 *Data @@ -189,7 +189,7 @@ WriteMux ( } VOID -DumpMux ( +AgDumpMux ( VOID ) { @@ -206,11 +206,11 @@ DumpMux ( DEBUG ((DEBUG_INFO, "\n%a(#%d) - Dump the PS8750 I2C data\n", __FUNCTION__, __LINE__)); for (SlaveAddress = 0x08; SlaveAddress <= 0x0E; SlaveAddress++) { for (Offset = 0x00; Offset <= 0xFF; Offset++) { - Status = ReadMux (SlaveAddress, (UINT8) Offset, &Data[Offset]); + Status = AgReadMux (SlaveAddress, (UINT8) Offset, &Data[Offset]); if (EFI_ERROR (Status)) Data[Offset] = 0xFF; } DEBUG ((DEBUG_INFO, "\nSlaveAddress = 0x%02x\n", (SlaveAddress << 1))); - DumpParagraph (DEBUG_INFO, Data, 256); + AgDumpParagraph (DEBUG_INFO, Data, 256); } DEBUG ((DEBUG_INFO, "\n")); padConfg0.padCnf0 = GpioPadRead (NW_GPIO_199 + BXT_GPIO_PAD_CONF0_OFFSET); @@ -220,7 +220,7 @@ DumpMux ( EFI_STATUS EFIAPI -SetupTypecMuxAux ( +AgSetupTypecMuxAux ( VOID ) { @@ -237,16 +237,16 @@ SetupTypecMuxAux ( // Ptr = (UINT8 *) &MuxData; for (index = 0; index < (sizeof (mAuroraMuxTable) / sizeof (mAuroraMuxTable[0])); index++) { - Status = ReadMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8); + Status = AgReadMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8); DEBUG ((DEBUG_INFO, "%a(#%d) - %.*a [0x%02x:0x%02x] = 0x%02x (%r)\n", __FUNCTION__, __LINE__, MUX_TABLE_STRING_LENGTH, mAuroraMuxTable[index].String, (mAuroraMuxTable[index].Address << 1), mAuroraMuxTable[index].Register, Data8, Status)); Ptr[index] = Data8; if ((mAuroraMuxTable[index].Data != MUX_TABLE_NULL) && (!EFI_ERROR (Status))) { Data8 = (UINT8) (mAuroraMuxTable[index].Data & 0x00FF); - Status = WriteMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8); + Status = AgWriteMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a(#%d) - ERROR: ByteWriteI2C returned %r for %a = 0x%02x\n", __FUNCTION__, __LINE__, Status, mAuroraMuxTable[index].String, Data8)); } else { - Status = ReadMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8); + Status = AgReadMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8); DEBUG ((DEBUG_INFO, "%a(#%d) - %.*a [0x%02x:0x%02x] = 0x%02x (%r)\n", __FUNCTION__, __LINE__, MUX_TABLE_STRING_LENGTH, mAuroraMuxTable[index].String, (mAuroraMuxTable[index].Address << 1), mAuroraMuxTable[index].Register, Data8, Status)); Ptr[index] = Data8; } @@ -272,7 +272,7 @@ SetupTypecMuxAux ( // We need to assert the MUX HPD // Data8 = MuxData.HpdAssert | BIT7; - Status = WriteMux (A_STATUS, R_MUX_HPD_ASSERT, &Data8); + Status = AgWriteMux (A_STATUS, R_MUX_HPD_ASSERT, &Data8); // // Display HPD diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh index fc5a6e2ab1..6358eeb8aa 100755 --- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh +++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh @@ -69,13 +69,17 @@ if [ -e $(pwd)/FlashMap.h ]; then rm $(pwd)/FlashMap.h fi +if [ ! -d $(pwd)/Conf ]; then + mkdir Conf +fi + ## Override tools_def.txt #cp $WORKSPACE\BaseTools\Conf\tools_def.template $WORKSPACE\Conf\tools_def.txt #:: Override tools_def.txt echo Creating Conf folder and build config files... -cp $WORKSPACE/BaseTools/Conf/target.template $WORKSPACE/Conf/target.txt -cp $WORKSPACE/BaseTools/Conf/tools_def.template $WORKSPACE/Conf/tools_def.txt -cp $WORKSPACE/BaseTools/Conf/build_rule.template $WORKSPACE/Conf/build_rule.txt +cp $CORE_PATH/BaseTools/Conf/target.template $WORKSPACE/Conf/target.txt +cp $CORE_PATH/BaseTools/Conf/tools_def.template $WORKSPACE/Conf/tools_def.txt +cp $CORE_PATH/BaseTools/Conf/build_rule.template $WORKSPACE/Conf/build_rule.txt @@ -84,7 +88,10 @@ TOOL_CHAIN_TAG=GCC5 ## Define platform specific environment variables. PLATFORM_NAME=BroxtonPlatformPkg -PLATFORM_PACKAGE=Platform/BroxtonPlatformPkg +PLATFORM_PACKAGE=edk2-platforms/Platform/BroxtonPlatformPkg +PLATFORM_PATH=$WORKSPACE/edk2-platforms +CORE_PATH=$WORKSPACE/edk2 +SILICON_PATH=edk2-platforms/Silicon/BroxtonSoC EFI_SOURCE=$WORKSPACE EDK_SOURCE=$WORKSPACE @@ -156,7 +163,7 @@ fi ENBDT_PF_BUILD=TRUE PLATFORM_NAME=BroxtonPlatformPkg -PLATFORM_PACKAGE=Platform/BroxtonPlatformPkg +PLATFORM_PACKAGE=edk2-platforms/Platform/BroxtonPlatformPkg Platform_Type=$1 ## Create new DefineAtBuildMacros.dsc file @@ -271,7 +278,7 @@ fi if [ -e "$BUILD_PATH/$Arch/BiosId.bin" ]; then rm -f $BUILD_PATH/$Arch/BiosId.bin fi -./Platform/BroxtonPlatformPkg/Common/Tools/GenBiosId/GenBiosId -i Conf/BiosId.env -o $BUILD_PATH/$Arch/BiosId.bin +edk2-platforms/Platform/BroxtonPlatformPkg/Common/Tools/GenBiosId/GenBiosId -i Conf/BiosId.env -o $BUILD_PATH/$Arch/BiosId.bin echo @@ -281,7 +288,7 @@ echo "**** Due to nasm can't execute in Ubuntu ****" echo "Invoking EDK2 build..." -build $Build_Flags +build -t ${TOOL_CHAIN_TAG} $Build_Flags echo "check if Build was successful" @@ -294,13 +301,13 @@ grep "_PCD_VALUE_" $BUILD_PATH/IA32/BroxtonPlatformPkg/Common/PlatformSettings/P # FSP Rebase and Split # # 0xFEF7A000 = gIntelFsp2WrapperTokenSpaceGuid.PcdFlashFvFspBase = $(CAR_BASE_ADDRESS) + $(BLD_RAM_DATA_SIZE) + $(FSP_RAM_DATA_SIZE) + $(FSP_EMP_DATA_SIZE) + $(BLD_IBBM_SIZE) -pushd $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin -python $WORKSPACE/Core/IntelFsp2Pkg/Tools/SplitFspBin.py rebase -f Fsp.fd -c m -b 0xFEF7A000 -o ./ -n ApolloLakeFsp.fd -python $WORKSPACE/Core/IntelFsp2Pkg/Tools/SplitFspBin.py split -f ApolloLakeFsp.fd -o ./ -n FSP.Fv +pushd $SILICON_PATH/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin +python $CORE_PATH/IntelFsp2Pkg/Tools/SplitFspBin.py rebase -f Fsp.fd -c m -b 0xFEF7A000 -o ./ -n ApolloLakeFsp.fd +python $CORE_PATH/IntelFsp2Pkg/Tools/SplitFspBin.py split -f ApolloLakeFsp.fd -o ./ -n FSP.Fv popd -cp -f $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_T.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_M.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_S.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $SILICON_PATH/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_T.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch +cp -f $SILICON_PATH/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_M.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch +cp -f $SILICON_PATH/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_S.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch echo "Running fce..." cat $BUILD_PATH/FV/FVIBBM.Fv $BUILD_PATH/FV/SOC.fd > $BUILD_PATH/FV/Temp.fd @@ -323,7 +330,7 @@ Split -f $BUILD_PATH/FV/Bxt"$Arch".fd -s 0x35000 -o $BUILD_PATH/FV/FVIBBM.Fv VERSION_MAJOR=$(grep '^VERSION_MAJOR' Conf/BiosId.env | cut -d ' ' -f 3 | cut -c 1-4) VERSION_MINOR=$(grep '^VERSION_MINOR' Conf/BiosId.env | cut -d ' ' -f 3 | cut -c 1-2) BIOS_Name="$BOARD_ID""$BOARD_REV""$SV_String""$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR" -cp $BUILD_PATH/FV/SOC.fd $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/$BIOS_Name.ROM +cp $BUILD_PATH/FV/SOC.fd $PLATFORM_PACKAGE/Common/Tools/Stitch/$BIOS_Name.ROM echo Get NvStorage Base and Size... if [ -e $(pwd)/FlashMap.h ]; then @@ -342,7 +349,7 @@ if [ -e $(pwd)/FlashMap.h ]; then #Create NvStorage.fv echo Create NvStorage.fv... - pushd $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + pushd $PLATFORM_PACKAGE/Common/Tools/Stitch Split -f $BIOS_Name.ROM -s $VpdOffset -o temp1.bin -t temp2.bin Split -f temp2.bin -s $VpdSize -o NvStorage.Fv -t temp3.bin rm temp1.bin temp2.bin temp3.bin @@ -353,60 +360,59 @@ else fi -cp -f $BUILD_PATH/FV/FVOBB.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $BUILD_PATH/FV/FVOBBX.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $BUILD_PATH/FV/FVIBBR.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $BUILD_PATH/FV/FVIBBM.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $BUILD_PATH/FV/FVIBBL.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - +cp -f $BUILD_PATH/FV/FVOBB.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch +cp -f $BUILD_PATH/FV/FVOBBX.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch +cp -f $BUILD_PATH/FV/FVIBBR.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch +cp -f $BUILD_PATH/FV/FVIBBM.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch +cp -f $BUILD_PATH/FV/FVIBBL.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch if [ $BoardId == "BG" ]; then if [ $FabId == "B" ]; then - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk1.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk2.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk3.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch else - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk1.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk2.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk3.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch fi fi if [ $BoardId == "MN" ]; then if [ $FabId == "B" ]; then - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk1.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk2.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk3.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch else - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk1.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk2.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk3.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch fi fi if [ $BoardId == "MX" ]; then if [ $FabId == "B" ]; then - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk1.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk2.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk3.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch else - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk1.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk2.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk3.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch fi fi if [ $BoardId == "LH" ]; then if [ $FabId == "D" ]; then - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch - cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk1.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk2.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch + cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk3.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch fi fi # # Assmeble components # -pushd $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +pushd $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch cat FVIBBL.Fv > IBBL.Fv @@ -420,6 +426,6 @@ popd echo echo Check if SPI IFWI image is generated at below location: -echo $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/$BIOS_Name"_GCC".bin +echo $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/$BIOS_Name"_GCC".bin echo echo diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.sh b/Platform/BroxtonPlatformPkg/BuildIFWI.sh index 6138fb4810..cca9c34eda 100755 --- a/Platform/BroxtonPlatformPkg/BuildIFWI.sh +++ b/Platform/BroxtonPlatformPkg/BuildIFWI.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -115,7 +115,7 @@ fi ## Build BIOS echo "======================================================================" echo "Build_IFWI: Calling BIOS build Script..." -bash Platform/BroxtonPlatformPkg/BuildBxtBios.sh $Build_Flags $Platform_Type $Build_Target +bash edk2-platforms/Platform/BroxtonPlatformPkg/BuildBxtBios.sh $Build_Flags $Platform_Type $Build_Target echo echo Finished Building Process. diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c index b260c3518e..e7714d189a 100644 --- a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c +++ b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c @@ -1,7 +1,7 @@ /** @file This file is SampleCode of the library for Intel PCH PEI Policy initialization. - Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -78,7 +78,7 @@ InternalAddVerbTable ( **/ BOOLEAN -IseMMCBoot ( +PlatformIseMMCBoot ( VOID ) { @@ -102,36 +102,6 @@ IseMMCBoot ( } -/** - Check it's SPI boot path or not. - - @retval TRUE SPI Boot path - @retval FALSE Not SPI boot path - -**/ -BOOLEAN -IsSpiBoot ( - VOID - ) -{ - VOID *HobList; - MBP_CURRENT_BOOT_MEDIA *BootMediaData; - - DEBUG ((EFI_D_INFO, "IsSpiBoot Start!\n")); - HobList = GetFirstGuidHob (&gEfiBootMediaHobGuid); - if (HobList != NULL) { - DEBUG ((EFI_D_INFO, "IsSpiBoot HobList != NULL\n")); - BootMediaData = GET_GUID_HOB_DATA (HobList); - if (BootMediaData->PhysicalData == BOOT_FROM_SPI) { - DEBUG ((EFI_D_INFO, "BootMediaData->PhysicalData == IsSpiBoot\n")); - return TRUE; - } else { - DEBUG ((EFI_D_INFO, "Not boot from SPI\n")); - return FALSE; - } - } - return FALSE; -} /** Calculate the Address of Boot Partition 1. @@ -662,7 +632,7 @@ UpdatePeiScPolicy ( ScsConfig->SccEmmcTraceLength = SCC_EMMC_LONG_TRACE_LEN; if (SystemConfiguration.ScceMMCEnabled == DEVICE_AUTO) { - if (IseMMCBoot ()) { + if (PlatformIseMMCBoot ()) { ScsConfig->EmmcEnable = DEVICE_ENABLE; } else { ScsConfig->EmmcEnable = DEVICE_DISABLE; diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.c b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.c index 05816c5a65..06fab9e3a8 100644 --- a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.c +++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.c @@ -1,7 +1,7 @@ /** @file C functions in SEC. - Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -30,7 +30,7 @@ EFI_PEI_PPI_DESCRIPTOR mPeiSecMainPpi[] = { }; FSP_SILICON_INIT_DONE_PPI gFspSiliconInitDonePpi = { - FspSiliconInitDoneGetFspHobList + SecMainFspSiliconInitDoneGetFspHobList }; // @@ -285,7 +285,7 @@ SecStartupPhase2( **/ EFI_STATUS EFIAPI -FspSiliconInitDoneGetFspHobList ( +SecMainFspSiliconInitDoneGetFspHobList ( IN CONST EFI_PEI_SERVICES **PeiServices, IN FSP_SILICON_INIT_DONE_PPI *This, OUT VOID **FspHobList diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.h b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.h index 68688c5cbd..b6e59e260e 100644 --- a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.h +++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.h @@ -1,7 +1,7 @@ /** @file Master header file for SecCore. - Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -106,7 +106,7 @@ ProcessLibraryConstructorList ( **/ EFI_STATUS EFIAPI -FspSiliconInitDoneGetFspHobList ( +SecMainFspSiliconInitDoneGetFspHobList ( IN CONST EFI_PEI_SERVICES **PeiServices, IN FSP_SILICON_INIT_DONE_PPI *This, OUT VOID **FspHobList diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.S b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.S index c7870fe42e..03d0126e60 100644 --- a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.S +++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.S @@ -2,7 +2,7 @@ # This is the code that goes from real-mode to protected mode. # It consumes the reset vector, calls TempRamInit API from FSP binary. # -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -23,7 +23,7 @@ ASM_GLOBAL ASM_PFX(_TEXT_REALMODE) ASM_PFX(_TEXT_REALMODE): #---------------------------------------------------------------------------- # -# Procedure: _ModuleEntryPoint +# Procedure: _SecEntryModuleEntryPoint # # Input: None # @@ -51,8 +51,8 @@ ASM_PFX(_TEXT_REALMODE): #---------------------------------------------------------------------------- .align 4 -ASM_GLOBAL ASM_PFX(_ModuleEntryPoint) -ASM_PFX(_ModuleEntryPoint): +ASM_GLOBAL ASM_PFX(_SecEntryModuleEntryPoint) +ASM_PFX(_SecEntryModuleEntryPoint): fninit # clear any pending Floating point exceptions # # Store the BIST value in mm0 diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.asm b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.asm index b7958ddf66..40b42f47d9 100644 --- a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.asm +++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.asm @@ -2,7 +2,7 @@ ; This is the code that goes from real-mode to protected mode. ; It consumes the reset vector, calls TempRamInit API from FSP binary. ; -; Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
+; Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.
; ; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BSD License @@ -32,7 +32,7 @@ _TEXT_REALMODE SEGMENT PARA PUBLIC USE16 'CODE' ;---------------------------------------------------------------------------- ; -; Procedure: _ModuleEntryPoint +; Procedure: _SecEntryModuleEntryPoint ; ; Input: None ; @@ -60,7 +60,7 @@ _TEXT_REALMODE SEGMENT PARA PUBLIC USE16 'CODE' ;---------------------------------------------------------------------------- align 4 -_ModuleEntryPoint PROC NEAR C PUBLIC +_SecEntryModuleEntryPoint PROC NEAR C PUBLIC fninit ; clear any pending Floating point exceptions ; ; Store the BIST value in mm0 @@ -111,7 +111,7 @@ _ModuleEntryPoint PROC NEAR C PUBLIC mov esi, offset ProtectedModeEntryLinearAddress jmp fword ptr cs:[si] -_ModuleEntryPoint ENDP +_SecEntryModuleEntryPoint ENDP _TEXT_REALMODE ENDS _TEXT_PROTECTED_MODE SEGMENT PARA PUBLIC USE32 'CODE' diff --git a/Platform/BroxtonPlatformPkg/Common/SeCPolicyInitDxe/SeCPolicyInitDxe.c b/Platform/BroxtonPlatformPkg/Common/SeCPolicyInitDxe/SeCPolicyInitDxe.c index fa04d544f6..874ce7299d 100644 --- a/Platform/BroxtonPlatformPkg/Common/SeCPolicyInitDxe/SeCPolicyInitDxe.c +++ b/Platform/BroxtonPlatformPkg/Common/SeCPolicyInitDxe/SeCPolicyInitDxe.c @@ -1,7 +1,7 @@ /** @file SEC policy initialization. - Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -24,7 +24,7 @@ // UINT8 mTsDimmSmbusAddress[] = {0x30, 0x34}; -DXE_SEC_POLICY_PROTOCOL mDxePlatformSeCPolicy = { 0 }; +DXE_SEC_POLICY_PROTOCOL mDxePlatformSeCPolicyProtocol = { 0 }; SEC_OPERATION_PROTOCOL mSeCOperationProtocol = { GetPlatformSeCInfo, @@ -72,8 +72,8 @@ SeCPlatformPolicyEntryPoint ( DEBUG ((EFI_D_INFO, "SeCPlatformPolicyEntryPoint ++ \n")); - mDxePlatformSeCPolicy.SeCConfig.TrConfig = AllocateZeroPool (sizeof (TR_CONFIG)); - if (mDxePlatformSeCPolicy.SeCConfig.TrConfig == NULL) { + mDxePlatformSeCPolicyProtocol.SeCConfig.TrConfig = AllocateZeroPool (sizeof (TR_CONFIG)); + if (mDxePlatformSeCPolicyProtocol.SeCConfig.TrConfig == NULL) { return EFI_OUT_OF_RESOURCES; } @@ -88,21 +88,21 @@ SeCPlatformPolicyEntryPoint ( // // ME DXE Policy Init // - mDxePlatformSeCPolicy.Revision = DXE_PLATFORM_SEC_POLICY_PROTOCOL_REVISION_7; + mDxePlatformSeCPolicyProtocol.Revision = DXE_PLATFORM_SEC_POLICY_PROTOCOL_REVISION_7; // // Initialzie the Me Configuration // - mDxePlatformSeCPolicy.SeCConfig.EndOfPostEnabled = 1; - mDxePlatformSeCPolicy.SeCConfig.HeciCommunication = 1; - mDxePlatformSeCPolicy.SeCConfig.SeCFwDownGrade = 0; - mDxePlatformSeCPolicy.SeCConfig.SeCLocalFwUpdEnabled = 0; - mDxePlatformSeCPolicy.SeCConfig.TrConfig->DimmNumber = 2; - mDxePlatformSeCPolicy.SeCConfig.TrConfig->TrEnabled = 0; - mDxePlatformSeCPolicy.SeCConfig.SeCFwImageType = INTEL_SEC_1_5MB_FW; - mDxePlatformSeCPolicy.SeCConfig.PlatformBrand = INTEL_STAND_MANAGEABILITY_BRAND; - mDxePlatformSeCPolicy.SeCReportError = ShowSeCReportError; - mDxePlatformSeCPolicy.SeCConfig.ITouchEnabled = FALSE; + mDxePlatformSeCPolicyProtocol.SeCConfig.EndOfPostEnabled = 1; + mDxePlatformSeCPolicyProtocol.SeCConfig.HeciCommunication = 1; + mDxePlatformSeCPolicyProtocol.SeCConfig.SeCFwDownGrade = 0; + mDxePlatformSeCPolicyProtocol.SeCConfig.SeCLocalFwUpdEnabled = 0; + mDxePlatformSeCPolicyProtocol.SeCConfig.TrConfig->DimmNumber = 2; + mDxePlatformSeCPolicyProtocol.SeCConfig.TrConfig->TrEnabled = 0; + mDxePlatformSeCPolicyProtocol.SeCConfig.SeCFwImageType = INTEL_SEC_1_5MB_FW; + mDxePlatformSeCPolicyProtocol.SeCConfig.PlatformBrand = INTEL_STAND_MANAGEABILITY_BRAND; + mDxePlatformSeCPolicyProtocol.SeCReportError = ShowSeCReportError; + mDxePlatformSeCPolicyProtocol.SeCConfig.ITouchEnabled = FALSE; VarSize = sizeof (SYSTEM_CONFIGURATION); Status = gRT->GetVariable ( @@ -114,9 +114,9 @@ SeCPlatformPolicyEntryPoint ( ); if (!EFI_ERROR (Status)) { - mDxePlatformSeCPolicy.SeCConfig.EndOfPostEnabled = SystemConfiguration.SeCEOPEnable; + mDxePlatformSeCPolicyProtocol.SeCConfig.EndOfPostEnabled = SystemConfiguration.SeCEOPEnable; if (SystemConfiguration.VirtualKbEnable == TOUCH_INTEGRATED) { - mDxePlatformSeCPolicy.SeCConfig.ITouchEnabled=TRUE; + mDxePlatformSeCPolicyProtocol.SeCConfig.ITouchEnabled=TRUE; } } @@ -126,7 +126,7 @@ SeCPlatformPolicyEntryPoint ( Status = gBS->InstallMultipleProtocolInterfaces ( &ImageHandle, &gDxePlatformSeCPolicyGuid, - &mDxePlatformSeCPolicy, + &mDxePlatformSeCPolicyProtocol, &gEfiSeCOperationProtocolGuid, &mSeCOperationProtocol, NULL @@ -748,7 +748,7 @@ SeCPolicyReadyToBootEvent ( } if ((SeCMode == SEC_MODE_NORMAL) && (SEC_STATUS_SEC_STATE_ONLY (SeCStatus) == SEC_READY)) { - if (mDxePlatformSeCPolicy.SeCConfig.EndOfPostEnabled == 1) { + if (mDxePlatformSeCPolicyProtocol.SeCConfig.EndOfPostEnabled == 1) { mSeCInfo.SeCEOPDone = 1; } } diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc index c6313cdd5d..f1bb26b9d9 100644 --- a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc +++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc @@ -47,6 +47,7 @@ CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf } UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf @@ -76,11 +77,15 @@ !if $(SMM_VARIABLE_ENABLE) $(PLATFORM_SI_PACKAGE)/VariableStorage/Dxe/CseVariableStorageSmmRuntimeDxe/CseVariableStorageSmmRuntimeDxe.inf { + + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000103 } !else $(PLATFORM_SI_PACKAGE)/VariableStorage/Dxe/CseVariableStorageSmmRuntimeDxe/CseVariableStorageRuntimeDxe.inf { + + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000103 } @@ -116,12 +121,16 @@ NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf NULL|$(PLATFORM_PACKAGE_COMMON)/Library/Tpm2DeviceLibPtp/Tpm2InstanceLibPtt.inf } - MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf + MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf { + + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + } MdeModulePkg/Application/UiApp/UiApp.inf { NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf } $(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspNotifyDxe/FspNotifyDxe.inf @@ -274,6 +283,7 @@ SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf { PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf } !endif @@ -383,7 +393,10 @@ NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf !endif !if $(NETWORK_IP6_ENABLE) == TRUE - $(PLATFORM_PACKAGE_COMMON)/SampleCode/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf + $(PLATFORM_PACKAGE_COMMON)/SampleCode/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf { + + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + } !else MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf { @@ -417,10 +430,12 @@ MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf { TimerLib|$(PLATFORM_PACKAGE_COMMON)/Library/PlatformTscTimerLib/DxeTscTimerLib.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf } MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf { TimerLib|$(PLATFORM_PACKAGE_COMMON)/Library/PlatformTscTimerLib/DxeTscTimerLib.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf } !endif @@ -444,6 +459,8 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27 } MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf { + + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 #0x80000007 @@ -460,7 +477,10 @@ MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf $(PLATFORM_PACKAGE_COMMON)/SampleCode/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf - MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf + MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf { + + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + } MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf { diff --git a/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc b/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc index c24abf47d0..ab15dcc33d 100644 --- a/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc +++ b/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc @@ -1,7 +1,7 @@ ## @file # Platform description. # -# Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -58,7 +58,7 @@ # # RC Package # - !include $(WORKSPACE)/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgCommonLib.dsc + !include $(WORKSPACE)/edk2-platforms/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgCommonLib.dsc # # Platform # @@ -80,7 +80,7 @@ # # RC Package # - !include $(WORKSPACE)/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgPeiLib.dsc + !include $(WORKSPACE)/edk2-platforms/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgPeiLib.dsc !include PlatformDsc/LibraryClasses.IA32.PEI.dsc @@ -104,7 +104,7 @@ # # RC Package # - !include $(WORKSPACE)/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgDxeLib.dsc + !include $(WORKSPACE)/edk2-platforms/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgDxeLib.dsc [LibraryClasses.Common.DXE_DRIVER] !include PlatformDsc/LibraryClasses.DxeDriver.dsc @@ -150,11 +150,11 @@ !include PlatformDsc/PcdsDynamicDefault.Default.dsc [Components.IA32] - !include $(WORKSPACE)/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgPei.dsc + !include $(WORKSPACE)/edk2-platforms/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgPei.dsc !include PlatformDsc/Components.IA32.dsc [Components.X64] - !include $(WORKSPACE)/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc + !include $(WORKSPACE)/edk2-platforms/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc !include PlatformDsc/Components.dsc $(PLATFORM_SI_PACKAGE)/SouthCluster/ScInit/Dxe/ScInitDxe.inf -- cgit v1.2.3