On Mon, Oct 14, 2019 at 03:25:04PM +0200, Marcin Wojtas wrote:
> From: Patryk Duda <p...@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 <p...@semihalf.com>
Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org>
Series pushed as cd022cf92de8..48a95de81ede.
Thanks!
/
Leif
> ---
> 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
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#49027): https://edk2.groups.io/g/devel/message/49027
Mute This Topic: https://groups.io/mt/34533163/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
