From: "Marcin Wojtas" <mw@semihalf.com>
To: devel@edk2.groups.io
Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org,
mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com,
kostap@marvell.com, Patryk Duda <pdk@semihalf.com>
Subject: [edk2-platforms: PATCH v5 8/9] Marvell/Drivers: SmbiosPlatformDxe: Load SMBIOS strings from PCD
Date: Mon, 14 Oct 2019 15:25:04 +0200 [thread overview]
Message-ID: <1571059504-26793-1-git-send-email-mw@semihalf.com> (raw)
From: Patryk Duda <pdk@semihalf.com>
This patch implements convenient way of changing strings included
in SMBIOS Table1, Table2, Table3.
Strings can be altered by defining following PCDs:
gMarvellTokenSpaceGuid.PcdProductManufacturer
gMarvellTokenSpaceGuid.PcdProductPlatformName
gMarvellTokenSpaceGuid.PcdProductSerial
gMarvellTokenSpaceGuid.PcdProductVersion
Signed-off-by: Patryk Duda <pdk@semihalf.com>
---
Changelog:
v4->v5
* Cast PCD strings as 'CONST CHAR *'
The updated branch with entire patchset was pushed to the github:
https://github.com/MarvellEmbeddedProcessors/edk2-open-platform/commits/cn913x-upstream-r20191014
Silicon/Marvell/Marvell.dec | 6 ++++++
Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 4 ++++
Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c | 22 ++++++++++----------
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/Silicon/Marvell/Marvell.dec b/Silicon/Marvell/Marvell.dec
index d337d3e..cdf8154 100644
--- a/Silicon/Marvell/Marvell.dec
+++ b/Silicon/Marvell/Marvell.dec
@@ -169,6 +169,12 @@
gMarvellTokenSpaceGuid.PcdPciEAhci|{ 0x0 }|VOID*|0x3000034
gMarvellTokenSpaceGuid.PcdPciESdhci|{ 0x0 }|VOID*|0x3000035
+#Platform description
+ gMarvellTokenSpaceGuid.PcdProductManufacturer|"Marvell"|VOID*|0x50000100
+ gMarvellTokenSpaceGuid.PcdProductPlatformName|"Marvell Development Board"|VOID*|0x50000101
+ gMarvellTokenSpaceGuid.PcdProductSerial|"Serial Not Set"|VOID*|0x50000103
+ gMarvellTokenSpaceGuid.PcdProductVersion|"Revision unknown"|VOID*|0x50000102
+
#RTC
gMarvellTokenSpaceGuid.PcdRtcBaseAddress|0x0|UINT64|0x40000052
diff --git a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 8b4586c..7722146 100644
--- a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -36,6 +36,10 @@
[FixedPcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision
+ gMarvellTokenSpaceGuid.PcdProductManufacturer
+ gMarvellTokenSpaceGuid.PcdProductPlatformName
+ gMarvellTokenSpaceGuid.PcdProductSerial
+ gMarvellTokenSpaceGuid.PcdProductVersion
[Protocols]
gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED
diff --git a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index 08f4fa7..3b909f3 100644
--- a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -101,10 +101,10 @@ STATIC SMBIOS_TABLE_TYPE1 mArmadaDefaultType1 = {
};
STATIC CHAR8 CONST *mArmadaDefaultType1Strings[] = {
- "Marvell \0",/* Manufacturer */
- "Armada 7k/8k Family Board \0",/* Product Name placeholder*/
- "Revision unknown \0",/* Version placeholder */
- " \0",/* 32 character buffer */
+ (CHAR8 CONST *)PcdGetPtr (PcdProductManufacturer),
+ (CHAR8 CONST *)PcdGetPtr (PcdProductPlatformName),
+ (CHAR8 CONST *)PcdGetPtr (PcdProductVersion),
+ (CHAR8 CONST *)PcdGetPtr (PcdProductSerial),
NULL
};
@@ -129,10 +129,10 @@ STATIC SMBIOS_TABLE_TYPE2 mArmadaDefaultType2 = {
};
STATIC CHAR8 CONST *mArmadaDefaultType2Strings[] = {
- "Marvell \0",/* Manufacturer */
- "Armada 7k/8k Family Board \0",/* Product Name placeholder*/
- "Revision unknown \0",/* Version placeholder */
- "Serial Not Set \0",/* Serial */
+ (CHAR8 CONST *)PcdGetPtr (PcdProductManufacturer),
+ (CHAR8 CONST *)PcdGetPtr (PcdProductPlatformName),
+ (CHAR8 CONST *)PcdGetPtr (PcdProductVersion),
+ (CHAR8 CONST *)PcdGetPtr (PcdProductSerial),
"Base of Chassis \0",/* Board location */
NULL
};
@@ -160,9 +160,9 @@ STATIC SMBIOS_TABLE_TYPE3 mArmadaDefaultType3 = {
};
STATIC CHAR8 CONST *mArmadaDefaultType3Strings[] = {
- "Marvell \0",/* Manufacturer placeholder */
- "Revision unknown \0",/* Version placeholder */
- "Serial Not Set \0",/* Serial placeholder */
+ (CHAR8 CONST *)PcdGetPtr (PcdProductManufacturer),
+ (CHAR8 CONST *)PcdGetPtr (PcdProductVersion),
+ (CHAR8 CONST *)PcdGetPtr (PcdProductSerial),
NULL
};
--
2.7.4
next reply other threads:[~2019-10-14 13:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-14 13:25 Marcin Wojtas [this message]
2019-10-15 18:07 ` [edk2-platforms: PATCH v5 8/9] Marvell/Drivers: SmbiosPlatformDxe: Load SMBIOS strings from PCD Leif Lindholm
2019-10-16 6:01 ` Marcin Wojtas
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=1571059504-26793-1-git-send-email-mw@semihalf.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