From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web09.876.1663104723853924941 for ; Tue, 13 Sep 2022 14:32:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HgGTjTLV; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: theojehl76@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id e18so4137402wmq.3 for ; Tue, 13 Sep 2022 14:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=rkU2YPUKcA6gvSEY9EB3pdZKGUOkwzsMjSqTeRwprl0=; b=HgGTjTLVDRH0j1NMCKcRTwHKTR3JkmT0I7npBc06IjMkHsnKymeeW4bQ124/b5PClz kvbJCcijZHvV+DK9iGY+2+6XNMyIDw22oafIQMmfiV8HDCR1znf0NE5+3i9K4Co/4obS cgMCyKmWzH1ZP7WIEoqm4QAPquXe8+v1rFvJiVnGK/o0fWmeEyMD9YTphvCBjItADeSF MjLokPf/Yj8/eVGuZfGt6aEsIpuMnfb08td7waz930hn+z35FCTEPDsZ+L4RlyMxD7cR yD+RAIhhVp5ra7zsYPmZkibKViHZ9X5+kBrC5ec9owvjotp9ewEvS7X8rkUnkdnh2XtL SF2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=rkU2YPUKcA6gvSEY9EB3pdZKGUOkwzsMjSqTeRwprl0=; b=GveV8+Xp3ElxFobzissI+E8QNi7lMH2lpjlcrDYlCffEOw7QyaR1ISzdLxcKqhyOHC ZJeAJ+9+OB7G8e9Cn0mW9OYrsW9zb19e+QTJGBKQHFq6pbERcgrfLSiiJb00/Mw3CO7c kaqXrjF3JflIWLOYE38UbkUi4ppUw+8JiZJ1GTDE8e7cCgYXJ3QIaWlBJnhkLq0A38Fl ik3qaDnERLr2uNGCxN0lSq0wtHIgCyy2all5FfAt2eeNBQ8Dr2i2UZa4Qwq0zG4Rcbi4 y5Ax7r1Vuvn5ef+vxC3cI5uTmJj6IN1lRPW5S82FTaLcmOJIncUEWCZUtL1+MjquweDi WsRA== X-Gm-Message-State: ACgBeo2Uz/xWB5ikpe1OK9SGFq+ylL5iXq/43IYuuHCEoUmtvoTqb35S el1RvZVBlju9F8wlqw57o4FM6sUbtbN1vcVJ X-Google-Smtp-Source: AA6agR5MWNJ0LBwuHvZ0VhK4oRlTZBzVpJqdPdqvXxmvocqenJuIARwWFyeda1A9n0T14+/SVFP/Bg== X-Received: by 2002:a05:600c:294:b0:3b4:794d:fb6a with SMTP id 20-20020a05600c029400b003b4794dfb6amr855175wmk.128.1663104722018; Tue, 13 Sep 2022 14:32:02 -0700 (PDT) Return-Path: Received: from localhost.localdomain (eth-east-parth2-46-193-66-249.wb.wifirst.net. [46.193.66.249]) by smtp.gmail.com with ESMTPSA id x4-20020a05600c188400b003a3170a7af9sm14139734wmp.4.2022.09.13.14.32.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 14:32:01 -0700 (PDT) From: =?UTF-8?B?VGjDqW8gSmVobA==?= To: devel@edk2.groups.io Cc: Leif Lindholm , Michael D Kinney , Isaac Oram , Pedro Falcato , Gerd Hoffmann , Stefan Hajnoczi Subject: [edk2-devel][edk2-platforms][PATCH V3 2/4] QemuOpenBoardPkg: Enable stage 2 Date: Tue, 13 Sep 2022 23:31:55 +0200 Message-Id: <1a05a36321088078d38800b280e7360441ebf8c9.1663104246.git.theojehl76@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Enables MinPlatform stage 2 (memory init) functionality. Cc: Leif Lindholm Cc: Michael D Kinney Cc: Isaac Oram Cc: Pedro Falcato Cc: Gerd Hoffmann Cc: Stefan Hajnoczi Signed-off-by: Theo Jehl --- .../Include/Dsc/Stage2.dsc.inc | 31 +++++++++++++++++++ .../QemuOpenBoardPkg/QemuOpenBoardPkg.dsc | 3 +- .../QemuOpenBoardPkg/QemuOpenBoardPkg.fdf | 10 ++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 Platform/Qemu/QemuOpenBoardPkg/Include/Dsc/Stage2.dsc.i= nc diff --git a/Platform/Qemu/QemuOpenBoardPkg/Include/Dsc/Stage2.dsc.inc b/Pl= atform/Qemu/QemuOpenBoardPkg/Include/Dsc/Stage2.dsc.inc new file mode 100644 index 000000000000..d2e41ce79fda --- /dev/null +++ b/Platform/Qemu/QemuOpenBoardPkg/Include/Dsc/Stage2.dsc.inc @@ -0,0 +1,31 @@ +## @file=0D +# Common DSC content to begin Stage 2 enabling=0D +#=0D +# @copyright=0D +# Copyright (C) 2022 Theo Jehl=0D +#=0D +# SPDX-License-Identifier: BSD-2-Clause-Patent=0D +##=0D +=0D +[LibraryClasses.Common]=0D + ResetSystemLib | OvmfPkg/Library/ResetSystemLib/BaseResetSystem= Lib.inf=0D + PciHostBridgeLib | OvmfPkg/Library/PciHostBridgeLib/PciHostBridge= Lib.inf=0D + PciHostBridgeUtilityLib | OvmfPkg/Library/PciHostBridgeUtilityLib/PciHos= tBridgeUtilityLib.inf=0D + DxeHardwareInfoLib | OvmfPkg/Library/HardwareInfoLib/DxeHardwareInf= oLib.inf=0D +=0D +[LibraryClasses.Common.PEIM]=0D + MpInitLib | UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf= =0D + TimerLib | OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.= inf=0D +=0D +[LibraryClasses.Common.DXE_DRIVER, LibraryClasses.Common.DXE_RUNTIME_DRIVE= R, LibraryClasses.Common.DXE_SMM_DRIVER, LibraryClasses.Common.UEFI_DRIVER,= LibraryClasses.Common.UEFI_APPLICATION, LibraryClasses.Common.SMM_CORE]=0D + PciLib | OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI4= 40FxQ35.inf=0D +=0D +[Components.$(PEI_ARCH)]=0D + UefiCpuPkg/CpuMpPei/CpuMpPei.inf=0D + MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf= =0D + MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf=0D + MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf=0D +=0D +[Components.$(DXE_ARCH)]=0D + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf=0D + MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf=0D diff --git a/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.dsc b/Platform= /Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.dsc index fc36b9d45ab2..2a4bda306cb6 100644 --- a/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.dsc +++ b/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.dsc @@ -50,7 +50,7 @@ # Stage 5 - boot to OS with security boot enabled=0D # Stage 6 - boot with advanced features enabled=0D #=0D - gMinPlatformPkgTokenSpaceGuid.PcdBootStage | 1=0D + gMinPlatformPkgTokenSpaceGuid.PcdBootStage | 2=0D =0D #=0D # MinPlatform common include for required feature PCD=0D @@ -131,6 +131,7 @@ !include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc=0D !include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc=0D !include QemuOpenBoardPkg/Include/Dsc/Stage1.dsc.inc=0D +!include QemuOpenBoardPkg/Include/Dsc/Stage2.dsc.inc=0D =0D [LibraryClasses.Common]=0D QemuOpenFwCfgLib | QemuOpenBoardPkg/Library/QemuOpenFwCfgLib/Qemu= OpenFwCfgLib.inf=0D diff --git a/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.fdf b/Platform= /Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.fdf index 0bfad51cb32e..de275b4c8841 100644 --- a/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.fdf +++ b/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.fdf @@ -155,6 +155,16 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = =3D 0x800000 !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf=0D FvNameGuid =3D 5A1D6978-BABE-42F9-A629-F7B3B6A1E1BD=0D =0D + INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf=0D +=0D + INF MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem= .inf=0D + INF MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf= =0D +=0D + INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf=0D +=0D + INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.i= nf=0D + INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf=0D +=0D [FV.FvBsp]=0D !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf=0D FvNameGuid =3D FCA0BC4A-994D-4EF9-BD56-A8C45872C2A8=0D --=20 2.37.0 (Apple Git-136)