* [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Board Name.
@ 2017-09-26 5:21 lushifex
0 siblings, 0 replies; 2+ messages in thread
From: lushifex @ 2017-09-26 5:21 UTC (permalink / raw)
To: edk2-devel; +Cc: david.wei
Correct board names according to different boards.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a.lu@intel.com>
---
.../BensonGlacier/BoardInitDxe/BoardInitDxe.c | 2 +-
.../Board/LeafHill/BoardInitDxe/BoardInitDxe.c | 2 +-
.../Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c | 4 ++--
.../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 27 +++++++++++++++++++---
.../Smbios/SmBiosMiscDxe/SmBiosMiscDxe.inf | 3 ++-
5 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.c
index c5a001e..d49d259 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.c
@@ -28,7 +28,7 @@ BgGetBoardName (
DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - Benson Glacier\n"));
- UnicodeSPrint (BoardName, sizeof (BoardName), L"Benson Glacier (%02x)", BoardId);
+ UnicodeSPrint (BoardName, sizeof (BoardName), L"Benson Glacier ");
if (BoardId != (UINT8) BOARD_ID_BENSON) {
return NULL;
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.c
index 5ce6349..dd70065 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.c
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.c
@@ -27,7 +27,7 @@ LhGetBoardName (
STATIC CHAR16 BoardName[40];
DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - Leaf Hill\n"));
- UnicodeSPrint (BoardName, sizeof (BoardName), L"Leaf Hill CRB (%02x)", BoardId);
+ UnicodeSPrint (BoardName, sizeof (BoardName), L"Leaf Hill CRB ");
if (BoardId != (UINT8) BOARD_ID_LFH_CRB) {
return NULL;
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
index 2248f10..94c94a6 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
@@ -26,9 +26,9 @@ Mb3GetBoardName (
{
STATIC CHAR16 BoardName[40];
- DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - Minnow Board v3\n"));
+ DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - MinnowBoard V3\n"));
- UnicodeSPrint (BoardName, sizeof (BoardName), L"Minnow Board v3 (%02x)", BoardId);
+ UnicodeSPrint (BoardName, sizeof (BoardName), L"MinnowBoard V3 ");
if (BoardId != (UINT8) BOARD_ID_MINNOW) {
return NULL;
diff --git a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
index 225f424..bcb0c51 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
@@ -2,7 +2,7 @@
This driver parses the mMiscSubclassDataTable structure and reports
any generated data.
- Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -19,7 +19,9 @@
#include "MiscSubclassDriver.h"
#include <Protocol/DxeSmmReadyToLock.h>
#include <Library/PrintLib.h>
-
+#include <BoardFunctionsDxe.h>
+#include <Library/HobLib.h>
+#include <Guid/PlatformInfo.h>
/**
@@ -59,6 +61,17 @@ AddSmbiosManuCallback (
EFI_SMBIOS_PROTOCOL *Smbios;
CHAR16 Buffer[40];
CHAR16 PlatformNameBuffer[40];
+ EFI_PEI_HOB_POINTERS GuidHob;
+ GET_BOARD_NAME GetBoardNameFunc;
+ EFI_PLATFORM_INFO_HOB *PlatformInfo = NULL;
+
+
+ GuidHob.Raw = GetHobList ();
+ if (GuidHob.Raw != NULL) {
+ if ((GuidHob.Raw = GetNextGuidHob (&gEfiPlatformInfoGuid, GuidHob.Raw)) != NULL) {
+ PlatformInfo = GET_GUID_HOB_DATA (GuidHob.Guid);
+ }
+ }
ForType1InputData = (EFI_MISC_SYSTEM_MANUFACTURER *) Context;
@@ -72,7 +85,15 @@ AddSmbiosManuCallback (
Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
ASSERT_EFI_ERROR (Status);
- UnicodeSPrint (PlatformNameBuffer, sizeof (PlatformNameBuffer), L"%s", L"MinnowBoard V3 ");
+ UnicodeSPrint (PlatformNameBuffer, sizeof (PlatformNameBuffer), L"%s", L"Broxton ");
+
+ //
+ // Update Board Name from PCD
+ //
+ if (PlatformInfo != NULL) {
+ GetBoardNameFunc = (GET_BOARD_NAME) (UINTN) PcdGet64 (PcdGetBoardNameFunc);
+ UnicodeSPrint (PlatformNameBuffer, sizeof (PlatformNameBuffer), L"%s", GetBoardNameFunc(PlatformInfo->BoardId));
+ }
//
// Silicon Steppings
diff --git a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/SmBiosMiscDxe.inf b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/SmBiosMiscDxe.inf
index db40a0b..12ffea3 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/SmBiosMiscDxe.inf
+++ b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/SmBiosMiscDxe.inf
@@ -1,7 +1,7 @@
## @file
# Component name for module MiscSubclass.
#
-# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -136,6 +136,7 @@
gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang
gEfiBxtTokenSpaceGuid.PcdEmmcManufacturerId
gEfiBxtTokenSpaceGuid.PcdProductSerialNumber
+ gPlatformModuleTokenSpaceGuid.PcdGetBoardNameFunc
[Depex]
gEfiSmbiosProtocolGuid AND
--
2.7.0.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Board Name.
@ 2017-12-11 8:27 lushifex
0 siblings, 0 replies; 2+ messages in thread
From: lushifex @ 2017-12-11 8:27 UTC (permalink / raw)
To: edk2-devel; +Cc: david.wei
Change board name on Minnowboard 3 and Minnowboard 3 Module.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a.lu@intel.com>
---
BuildBIOS.bat | 2 +-
BuildBIOS.sh | 2 +-
.../Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c | 6 +++---
.../Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c | 4 ++--
Platform/BroxtonPlatformPkg/BuildBxtBios.bat | 2 +-
Platform/BroxtonPlatformPkg/BuildBxtBios.sh | 4 ++--
.../BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat | 2 ++
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/BuildBIOS.bat b/BuildBIOS.bat
index 2cec70f..051c0a9 100644
--- a/BuildBIOS.bat
+++ b/BuildBIOS.bat
@@ -57,7 +57,7 @@ echo /IA32 Set Arch to IA32 (default: X64)
echo /A Set FabId to A (default: FAB_B)
echo /B Set FabId to B (default: FAB_B)
echo /MN MinnowBoard 3(default: MN)
-echo /MX MinnowBoard 3 Next
+echo /MX MinnowBoard 3 Module
echo /BG Benson Glacier Board
echo PlatformName: Broxton
echo BuildTargets: Release, Debug
diff --git a/BuildBIOS.sh b/BuildBIOS.sh
index d679d2e..b8d21d7 100755
--- a/BuildBIOS.sh
+++ b/BuildBIOS.sh
@@ -20,7 +20,7 @@ function Usage () {
echo
echo " Build_Flags: /MN MinnowBoard3 (default: MN)"
echo " Build_Flags: /BG Benson Glacier Board"
- echo " Build_Flags: /MX MinnowBoard3 Next"
+ echo " Build_Flags: /MX MinnowBoard3 Module"
echo " Build_Flags: /A Set FabId to A (default: FAB_B)"
echo " Build_Flags: /B Set FabId to B (default: FAB_B)"
echo " PlatformName [optional]: Broxton "
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
index 94c94a6..66962a8 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
@@ -2,7 +2,7 @@
Board specific functions in DXE phase to be set as dynamic PCD and consumed by
commmon platform code.
- Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -26,9 +26,9 @@ Mb3GetBoardName (
{
STATIC CHAR16 BoardName[40];
- DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - MinnowBoard V3\n"));
+ DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - MinnowBoard 3\n"));
- UnicodeSPrint (BoardName, sizeof (BoardName), L"MinnowBoard V3 ");
+ UnicodeSPrint (BoardName, sizeof (BoardName), L"MinnowBoard 3 ");
if (BoardId != (UINT8) BOARD_ID_MINNOW) {
return NULL;
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c
index a1c2c39..71deb43 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c
@@ -26,9 +26,9 @@ Mb3NGetBoardName (
{
STATIC CHAR16 BoardName[40];
- DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - Minnow Board v3 Next\n"));
+ DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - MinnowBoard 3 Module\n"));
- UnicodeSPrint (BoardName, sizeof (BoardName), L"Minnow Board v3 Next (0x%02X)", BoardId);
+ UnicodeSPrint (BoardName, sizeof (BoardName), L"MinnowBoard 3 Module ");
if (BoardId != (UINT8) BOARD_ID_MINNOW_NEXT) {
return NULL;
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
index ede285e..994bb3a 100644
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
@@ -208,7 +208,7 @@ if /i "%~1" == "%Minnow_RVP%" (
) else if %BoardId%==BG (
set BOARD_ID=BENSONV
) else if %BoardId%==MX (
- set BOARD_ID=MINNEXT
+ set BOARD_ID=M3MODUL
)
set ENBDT_PF_BUILD=TRUE
set PLATFORM_NAME=BroxtonPlatformPkg
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
index cf02ceb..ef261e6 100755
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
@@ -136,8 +136,8 @@ if [ $BoardId == "MN" ]; then
BOARD_ID=MNW3
echo BOARD_ID = MINNOW3 >> $WORKSPACE/Conf/BiosId.env
elif [ $BoardId == "MX" ]; then
- BOARD_ID=MNXT
- echo BOARD_ID = MINNEXT >> $WORKSPACE/Conf/BiosId.env
+ BOARD_ID=M3MO
+ echo BOARD_ID = M3MODUL >> $WORKSPACE/Conf/BiosId.env
else
BOARD_ID=BEN1
echo BOARD_ID = BENSONV >> $WORKSPACE/Conf/BiosId.env
diff --git a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
index 134807e..01e56c5 100644
--- a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
+++ b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
@@ -110,6 +110,8 @@ if /i "!Platform_Type!"=="MINN" (
set Platform_Type=MINN
) else if /i "!Platform_Type!"=="BENS" (
set Platform_Type=BENS
+) else if /i "!Platform_Type!"=="M3MO" (
+ set Platform_Type=M3MO
) else (
echo Error - Unsupported PlatformType: !Platform_Type!
goto Usage
--
2.7.0.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-12-11 8:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-26 5:21 [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Board Name lushifex
-- strict thread matches above, loose matches on Subject: below --
2017-12-11 8:27 lushifex
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox