public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Nate DeSimone" <nathaniel.l.desimone@intel.com>
To: "Kubacki, Michael A" <michael.a.kubacki@intel.com>,
	"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Chiu, Chasel" <chasel.chiu@intel.com>
Subject: Re: [edk2-platforms][PATCH V1 46/49] WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: Enable advanced features
Date: Sat, 16 Nov 2019 00:35:32 +0000	[thread overview]
Message-ID: <02A34F284D1DA44BB705E61F7180EF0AB5BDB6F0@ORSMSX114.amr.corp.intel.com> (raw)
In-Reply-To: <20191113040657.38540-7-michael.a.kubacki@intel.com>

Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

-----Original Message-----
From: Kubacki, Michael A <michael.a.kubacki@intel.com> 
Sent: Tuesday, November 12, 2019 8:07 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Subject: [edk2-platforms][PATCH V1 46/49] WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: Enable advanced features

This change enables advanced features to be used by the WhiskeylakeURvp board in WhiskeylakeOpenBoardPkg.

Some platform macros in OpenBoardPkg.dsc are consolidated so all values are set at the top of the file before including advanced feature code.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Michael Kubacki <michael.a.kubacki@intel.com>
---
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc    | 44 +++++++++-----------
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc |  1 +
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.fdf    |  4 ++
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc
index 44623eb427..46686d6689 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk
+++ g.dsc
@@ -17,36 +17,32 @@
   DEFINE      PROJECT                   = $(PLATFORM_BOARD_PACKAGE)/$(BOARD)
   DEFINE      PEI_ARCH                  = IA32
   DEFINE      DXE_ARCH                  = X64
-
-  #
-  # Include PCD configuration for this board.
-  #
-  !include OpenBoardPkgPcd.dsc
-
-################################################################################
-#
-# Defines Section - statements that will be processed to create a Makefile.
-#
-################################################################################
-[Defines]
-  PLATFORM_NAME                       = $(PLATFORM_PACKAGE)
-  PLATFORM_GUID                       = 84D0F5BD-0EF3-4CC0-9B09-F2D0F2AA5C5E
-  PLATFORM_VERSION                    = 0.1
-  DSC_SPECIFICATION                   = 0x00010005
-  OUTPUT_DIRECTORY                    = Build/$(PROJECT)
-  SUPPORTED_ARCHITECTURES             = IA32|X64
-  BUILD_TARGETS                       = DEBUG|RELEASE
-  SKUID_IDENTIFIER                    = ALL
-  FLASH_DEFINITION                    = $(PROJECT)/OpenBoardPkg.fdf
-
-  FIX_LOAD_TOP_MEMORY_ADDRESS         = 0x0
-  DEFINE   TOP_MEMORY_ADDRESS         = 0x0
+  DEFINE      TOP_MEMORY_ADDRESS        = 0x0
 
   #
   # Default value for OpenBoardPkg.fdf use
   #
   DEFINE BIOS_SIZE_OPTION = SIZE_70
 
+  PLATFORM_NAME                         = $(PLATFORM_PACKAGE)
+  PLATFORM_GUID                         = 84D0F5BD-0EF3-4CC0-9B09-F2D0F2AA5C5E
+  PLATFORM_VERSION                      = 0.1
+  DSC_SPECIFICATION                     = 0x00010005
+  OUTPUT_DIRECTORY                      = Build/$(PROJECT)
+  SUPPORTED_ARCHITECTURES               = IA32|X64
+  BUILD_TARGETS                         = DEBUG|RELEASE
+  SKUID_IDENTIFIER                      = ALL
+
+  FLASH_DEFINITION                      = $(PROJECT)/OpenBoardPkg.fdf
+  FIX_LOAD_TOP_MEMORY_ADDRESS           = 0x0
+
+  #
+  # Include PCD configuration for this board.
+  #
+  !include 
+ AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.d
+ sc
+  !include OpenBoardPkgPcd.dsc
+  !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc
+
 ################################################################################
 #
 # SKU Identification section - list of all SKU IDs supported by this board.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc
index 52471cb25b..906f7b7ade 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk
+++ gPcd.dsc
@@ -24,6 +24,7 @@
   # Stage 3 - boot to shell only
   # Stage 4 - boot to OS
   # Stage 5 - boot to OS with security boot enabled
+  # Stage 6 - boot with advanced features enabled
   #
   gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4
 
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.fdf b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.fdf
index 130930ad40..f39b41b186 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.fdf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk
+++ g.fdf
@@ -623,6 +623,8 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 FvNameGuid         = 6053D78A-457E-4490-A237-31D0FBE2F305
 
+!include AdvancedFeaturePkg/Include/PreMemory.fdf
+
 !if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable == TRUE  INF $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
 !endif
@@ -649,6 +651,8 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 FvNameGuid         = BE3DF86F-E464-44A3-83F7-0D27E6B88C27
 
+!include AdvancedFeaturePkg/Include/PostMemory.fdf
+
 !if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable == TRUE  INF  $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
 INF  $(PLATFORM_BOARD_PACKAGE)/Features/PciHotPlug/PciHotPlug.inf
--
2.16.2.windows.1


  parent reply	other threads:[~2019-11-16  0:35 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20191113040657.38540-1-michael.a.kubacki@intel.com>
     [not found] ` <20191113040657.38540-2-michael.a.kubacki@intel.com>
2019-11-16  0:35   ` [edk2-platforms][PATCH V1 41/49] WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: Add FvAdvancedPreMemory Nate DeSimone
     [not found] ` <20191113040657.38540-3-michael.a.kubacki@intel.com>
2019-11-16  0:35   ` [edk2-platforms][PATCH V1 42/49] Platform/Intel: Add advanced feature build support Nate DeSimone
     [not found] ` <20191113040657.38540-4-michael.a.kubacki@intel.com>
2019-11-16  0:35   ` [edk2-platforms][PATCH V1 43/49] Platform/Intel/Readme.md Content update Nate DeSimone
     [not found] ` <20191113040657.38540-5-michael.a.kubacki@intel.com>
2019-11-16  0:35   ` [edk2-platforms][PATCH V1 44/49] KabylakeOpenBoardPkg/GalagoPro3: Enable advanced features Nate DeSimone
     [not found] ` <20191113040657.38540-6-michael.a.kubacki@intel.com>
2019-11-16  0:35   ` [edk2-platforms][PATCH V1 45/49] KabylakeOpenBoardPkg/KabylakeRvp3: " Nate DeSimone
     [not found] ` <20191113040657.38540-7-michael.a.kubacki@intel.com>
2019-11-16  0:35   ` Nate DeSimone [this message]
     [not found] ` <20191113040657.38540-9-michael.a.kubacki@intel.com>
2019-11-16  0:35   ` [edk2-platforms][PATCH V1 48/49] MinPlatformPkg: Install advanced feature FVs by stage enabled Nate DeSimone
2019-11-13  4:37 [edk2-platforms][PATCH V1 24/49] DebugFeaturePkg: Remove the USB3 Debug feature Kubacki, Michael A
2019-11-13  4:37 ` [edk2-platforms][PATCH V1 46/49] WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: Enable advanced features Kubacki, Michael A
2019-11-16  0:37   ` Nate DeSimone
  -- strict thread matches above, loose matches on Subject: below --
2019-11-13  3:27 [edk2-platforms][PATCH V1 00/49] Intel Advanced Feature Refactor Kubacki, Michael A
     [not found] ` <20191113032816.4056-47-michael.a.kubacki@intel.com>
2019-11-16  0:34   ` [edk2-platforms][PATCH V1 46/49] WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: Enable advanced features Nate DeSimone

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=02A34F284D1DA44BB705E61F7180EF0AB5BDB6F0@ORSMSX114.amr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox