[edk2-devel] [edk2-platforms] [PATCH] SimicsOpenBoardPkg: Change Build Output Directory

Agyeman, Prince posted 1 patch 2 weeks ago
Failed in applying to current master (apply log)
.../BoardX58Ich10/OpenBoardPkg.dsc                  | 13 +++++++------
.../BoardX58Ich10/OpenBoardPkg.fdf                  |  2 +-
2 files changed, 8 insertions(+), 7 deletions(-)

[edk2-devel] [edk2-platforms] [PATCH] SimicsOpenBoardPkg: Change Build Output Directory

Posted by Agyeman, Prince 2 weeks ago
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2250

Changed BoardX558ich10's build directory to
Build/SimicsOpenBoardPkg/BoardX58Ich10 to align it with
align with the other Intel board packages

Cc: Ankit Sinha <ankit.sinha@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Kubacki Michael A <michael.a.kubacki@intel.com>

Signed-off-by: Prince Agyeman <prince.agyeman@intel.com>
---
 .../BoardX58Ich10/OpenBoardPkg.dsc                  | 13 +++++++------
 .../BoardX58Ich10/OpenBoardPkg.fdf                  |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
index 4f8ab4170d..78f1e80990 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
@@ -20,16 +20,17 @@
   DEFINE PCH_PKG               = SimicsIch10Pkg
   DEFINE DXE_ARCH              = X64
   DEFINE PEI_ARCH              = IA32
+  DEFINE PROJECT               = $(BOARD_PKG)/$(BOARD_NAME)
 
   PLATFORM_NAME                  = SimicsX58
   PLATFORM_GUID                  = EE8EBB5A-CC95-412f-9987-2AF70F88B69A
   PLATFORM_VERSION               = 0.1
   DSC_SPECIFICATION              = 0x00010005
-  OUTPUT_DIRECTORY               = Build/SimicsX58Ia32X64
+  OUTPUT_DIRECTORY               = Build/$(PROJECT)
   SUPPORTED_ARCHITECTURES        = IA32|X64
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkg.fdf
+  FLASH_DEFINITION               = $(PROJECT)/OpenBoardPkg.fdf
 
   DEFINE SMM_REQUIRE             = TRUE
 
@@ -41,7 +42,7 @@
   DEFINE NETWORK_ISCSI_ENABLE           = FALSE
   DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
 
-  !include $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkgPcd.dsc
+  !include $(PROJECT)/OpenBoardPkgPcd.dsc
   !include NetworkPkg/NetworkDefines.dsc.inc
 
 ################################################################################
@@ -80,7 +81,7 @@
 #######################################
 # Build Option Includes
 #######################################
-!include $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkgBuildOption.dsc
+!include $(PROJECT)/OpenBoardPkgBuildOption.dsc
 
 ################################################################################
 #
@@ -175,11 +176,11 @@
   #####################################
   $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf {
     <LibraryClasses>
-      BoardInitLib|$(BOARD_PKG)/$(BOARD_NAME)/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
+      BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
   }
   $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf {
     <LibraryClasses>
-      BoardInitLib|$(BOARD_PKG)/$(BOARD_NAME)/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
+      BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
   }
   $(PLATFORM_PACKAGE)/PlatformInit/ReportFv/ReportFvPei.inf
   $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMem.inf
diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
index 0c27cb0ef2..39226251a7 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
@@ -13,7 +13,7 @@
 # Build the variable store and the firmware code as one unified flash device
 # image.
 #
-[FD.SIMICSX58IA32X64]
+[FD.BOARDX58ICH10]
 BaseAddress   = $(FW_BASE_ADDRESS)
 Size          = $(FW_SIZE)
 ErasePolarity = 1
-- 
2.19.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#49607): https://edk2.groups.io/g/devel/message/49607
Mute This Topic: https://groups.io/mt/39638257/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms] [PATCH] SimicsOpenBoardPkg: Change Build Output Directory

Posted by Kubacki, Michael A 2 weeks ago
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>

> -----Original Message-----
> From: Agyeman, Prince <prince.agyeman@intel.com>
> Sent: Tuesday, October 29, 2019 1:36 PM
> To: devel@edk2.groups.io
> Cc: Sinha, Ankit <ankit.sinha@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>
> Subject: [edk2-platforms] [PATCH] SimicsOpenBoardPkg: Change Build
> Output Directory
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2250
> 
> Changed BoardX558ich10's build directory to
> Build/SimicsOpenBoardPkg/BoardX58Ich10 to align it with align with the
> other Intel board packages
> 
> Cc: Ankit Sinha <ankit.sinha@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Kubacki Michael A <michael.a.kubacki@intel.com>
> 
> Signed-off-by: Prince Agyeman <prince.agyeman@intel.com>
> ---
>  .../BoardX58Ich10/OpenBoardPkg.dsc                  | 13 +++++++------
>  .../BoardX58Ich10/OpenBoardPkg.fdf                  |  2 +-
>  2 files changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git
> a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
> b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
> index 4f8ab4170d..78f1e80990 100644
> ---
> a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
> +++
> b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
> @@ -20,16 +20,17 @@
>    DEFINE PCH_PKG               = SimicsIch10Pkg
>    DEFINE DXE_ARCH              = X64
>    DEFINE PEI_ARCH              = IA32
> +  DEFINE PROJECT               = $(BOARD_PKG)/$(BOARD_NAME)
> 
>    PLATFORM_NAME                  = SimicsX58
>    PLATFORM_GUID                  = EE8EBB5A-CC95-412f-9987-2AF70F88B69A
>    PLATFORM_VERSION               = 0.1
>    DSC_SPECIFICATION              = 0x00010005
> -  OUTPUT_DIRECTORY               = Build/SimicsX58Ia32X64
> +  OUTPUT_DIRECTORY               = Build/$(PROJECT)
>    SUPPORTED_ARCHITECTURES        = IA32|X64
>    BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
>    SKUID_IDENTIFIER               = DEFAULT
> -  FLASH_DEFINITION               =
> $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkg.fdf
> +  FLASH_DEFINITION               = $(PROJECT)/OpenBoardPkg.fdf
> 
>    DEFINE SMM_REQUIRE             = TRUE
> 
> @@ -41,7 +42,7 @@
>    DEFINE NETWORK_ISCSI_ENABLE           = FALSE
>    DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
> 
> -  !include $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkgPcd.dsc
> +  !include $(PROJECT)/OpenBoardPkgPcd.dsc
>    !include NetworkPkg/NetworkDefines.dsc.inc
> 
> 
> ##########################################################
> ######################
> @@ -80,7 +81,7 @@
>  #######################################
>  # Build Option Includes
>  #######################################
> -!include $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkgBuildOption.dsc
> +!include $(PROJECT)/OpenBoardPkgBuildOption.dsc
> 
> 
> ##########################################################
> ######################
>  #
> @@ -175,11 +176,11 @@
>    #####################################
> 
> $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPreMem.i
> nf {
>      <LibraryClasses>
> -
> BoardInitLib|$(BOARD_PKG)/$(BOARD_NAME)/Library/BoardInitLib/PeiBoar
> dInitPreMemLib.inf
> +
> + BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
>    }
> 
> $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPostMem
> .inf {
>      <LibraryClasses>
> -
> BoardInitLib|$(BOARD_PKG)/$(BOARD_NAME)/Library/BoardInitLib/PeiBoar
> dInitPostMemLib.inf
> +
> + BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPostMemLib.in
> + f
>    }
>    $(PLATFORM_PACKAGE)/PlatformInit/ReportFv/ReportFvPei.inf
> 
> $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMe
> m.inf
> diff --git
> a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
> b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
> index 0c27cb0ef2..39226251a7 100644
> --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
> +++
> b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
> @@ -13,7 +13,7 @@
>  # Build the variable store and the firmware code as one unified flash device
> # image.
>  #
> -[FD.SIMICSX58IA32X64]
> +[FD.BOARDX58ICH10]
>  BaseAddress   = $(FW_BASE_ADDRESS)
>  Size          = $(FW_SIZE)
>  ErasePolarity = 1
> --
> 2.19.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#49732): https://edk2.groups.io/g/devel/message/49732
Mute This Topic: https://groups.io/mt/39638257/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms] [PATCH] SimicsOpenBoardPkg: Change Build Output Directory

Posted by Nate DeSimone 2 weeks ago
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

-----Original Message-----
From: Agyeman, Prince <prince.agyeman@intel.com> 
Sent: Tuesday, October 29, 2019 1:36 PM
To: devel@edk2.groups.io
Cc: Sinha, Ankit <ankit.sinha@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Kubacki, Michael A <michael.a.kubacki@intel.com>
Subject: [edk2-platforms] [PATCH] SimicsOpenBoardPkg: Change Build Output Directory

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2250

Changed BoardX558ich10's build directory to
Build/SimicsOpenBoardPkg/BoardX58Ich10 to align it with align with the other Intel board packages

Cc: Ankit Sinha <ankit.sinha@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Kubacki Michael A <michael.a.kubacki@intel.com>

Signed-off-by: Prince Agyeman <prince.agyeman@intel.com>
---
 .../BoardX58Ich10/OpenBoardPkg.dsc                  | 13 +++++++------
 .../BoardX58Ich10/OpenBoardPkg.fdf                  |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
index 4f8ab4170d..78f1e80990 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
@@ -20,16 +20,17 @@
   DEFINE PCH_PKG               = SimicsIch10Pkg
   DEFINE DXE_ARCH              = X64
   DEFINE PEI_ARCH              = IA32
+  DEFINE PROJECT               = $(BOARD_PKG)/$(BOARD_NAME)
 
   PLATFORM_NAME                  = SimicsX58
   PLATFORM_GUID                  = EE8EBB5A-CC95-412f-9987-2AF70F88B69A
   PLATFORM_VERSION               = 0.1
   DSC_SPECIFICATION              = 0x00010005
-  OUTPUT_DIRECTORY               = Build/SimicsX58Ia32X64
+  OUTPUT_DIRECTORY               = Build/$(PROJECT)
   SUPPORTED_ARCHITECTURES        = IA32|X64
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkg.fdf
+  FLASH_DEFINITION               = $(PROJECT)/OpenBoardPkg.fdf
 
   DEFINE SMM_REQUIRE             = TRUE
 
@@ -41,7 +42,7 @@
   DEFINE NETWORK_ISCSI_ENABLE           = FALSE
   DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
 
-  !include $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkgPcd.dsc
+  !include $(PROJECT)/OpenBoardPkgPcd.dsc
   !include NetworkPkg/NetworkDefines.dsc.inc
 
 ################################################################################
@@ -80,7 +81,7 @@
 #######################################
 # Build Option Includes
 #######################################
-!include $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkgBuildOption.dsc
+!include $(PROJECT)/OpenBoardPkgBuildOption.dsc
 
 ################################################################################
 #
@@ -175,11 +176,11 @@
   #####################################
   $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf {
     <LibraryClasses>
-      BoardInitLib|$(BOARD_PKG)/$(BOARD_NAME)/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
+      
+ BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
   }
   $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf {
     <LibraryClasses>
-      BoardInitLib|$(BOARD_PKG)/$(BOARD_NAME)/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
+      
+ BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPostMemLib.in
+ f
   }
   $(PLATFORM_PACKAGE)/PlatformInit/ReportFv/ReportFvPei.inf
   $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMem.inf
diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
index 0c27cb0ef2..39226251a7 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
@@ -13,7 +13,7 @@
 # Build the variable store and the firmware code as one unified flash device  # image.
 #
-[FD.SIMICSX58IA32X64]
+[FD.BOARDX58ICH10]
 BaseAddress   = $(FW_BASE_ADDRESS)
 Size          = $(FW_SIZE)
 ErasePolarity = 1
--
2.19.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#49692): https://edk2.groups.io/g/devel/message/49692
Mute This Topic: https://groups.io/mt/39638257/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-