1. Patchew
  2. EDK2
  3. [edk2-devel] [edk2-platforms: PATCH v3 0/9] Marvell Octeon CN913X SoC family support
  4. View patch

[edk2-devel] [edk2-platforms: PATCH v3 9/9] Marvell: Customize per-board SBMIOS strings

Marcin Wojtas posted 9 patches 6 years, 4 months ago
There is a newer version of this series
[edk2-devel] [edk2-platforms: PATCH v3 9/9] Marvell: Customize per-board SBMIOS strings
Posted by Marcin Wojtas 6 years, 4 months ago 
Now that the customization of Type1/2/3 SBMIOS
tables strings is possible, adjust them for all
supported boards.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc        |  4 ++++
 Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc        |  4 ++++
 Platform/Marvell/Cn913xDb/Cn913xDbA.dsc               | 11 +++++++++++
 Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc |  5 +++++
 4 files changed, 24 insertions(+)

diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
index 523e60e..3626967 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
@@ -45,6 +45,10 @@
 #
 ################################################################################
 [PcdsFixedAtBuild.common]
+  #Platform description
+  gMarvellTokenSpaceGuid.PcdProductPlatformName|"Armada 7040 DB\0"
+  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.5\0"
+
   #CP110 count
   gMarvellTokenSpaceGuid.PcdMaxCpCount|1
 
diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
index 4e6e62b..ce0c541 100644
--- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
+++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
@@ -45,6 +45,10 @@
 #
 ################################################################################
 [PcdsFixedAtBuild.common]
+  #Platform description
+  gMarvellTokenSpaceGuid.PcdProductPlatformName|"Armada 8040 DB\0"
+  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.4\0"
+
   #MPP
   gMarvellTokenSpaceGuid.PcdMppChipCount|3
 
diff --git a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
index 268c39c..bcc5158 100644
--- a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
+++ b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
@@ -62,3 +62,14 @@
   ArmadaBoardDescLib|Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.inf
 !endif
   NonDiscoverableInitLib|Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
+
+[PcdsFixedAtBuild.common]
+  #Platform description
+  !if $(CN9130)
+  gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9130 DB-A\0"
+  !elseif $(CN9131)
+  gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9131 DB-A\0"
+  !elseif $(CN9132)
+  gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9132 DB-A\0"
+  !endif
+  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.1\0"
diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
index 2b42d75..f7d5a57 100644
--- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
+++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
@@ -46,6 +46,11 @@
 #
 ################################################################################
 [PcdsFixedAtBuild.common]
+  #Platform description
+  gMarvellTokenSpaceGuid.PcdProductManufacturer|"SolidRun\0"
+  gMarvellTokenSpaceGuid.PcdProductPlatformName|"Armada 8040 MacchiatoBin\0"
+  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.3\0"
+
   #MPP
   gMarvellTokenSpaceGuid.PcdMppChipCount|3
 
-- 
2.7.4


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

View/Reply Online (#48703): https://edk2.groups.io/g/devel/message/48703
Mute This Topic: https://groups.io/mt/34471906/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 v3 9/9] Marvell: Customize per-board SBMIOS strings
Posted by Leif Lindholm 6 years, 4 months ago 
On Thu, Oct 10, 2019 at 07:42:19AM +0200, Marcin Wojtas wrote:
> Now that the customization of Type1/2/3 SBMIOS
> tables strings is possible, adjust them for all
> supported boards.
> 
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
>  Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc        |  4 ++++
>  Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc        |  4 ++++
>  Platform/Marvell/Cn913xDb/Cn913xDbA.dsc               | 11 +++++++++++
>  Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc |  5 +++++
>  4 files changed, 24 insertions(+)
> 
> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> index 523e60e..3626967 100644
> --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> @@ -45,6 +45,10 @@
>  #
>  ################################################################################
>  [PcdsFixedAtBuild.common]
> +  #Platform description
> +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"Armada 7040 DB\0"
> +  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.5\0"

Why have we ended up requiring explicit \0 in literal strings?
This does not seem to be needed for (for example)
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor
so why is it needed here?

/
    Leif

> +
>    #CP110 count
>    gMarvellTokenSpaceGuid.PcdMaxCpCount|1
>  
> diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> index 4e6e62b..ce0c541 100644
> --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> @@ -45,6 +45,10 @@
>  #
>  ################################################################################
>  [PcdsFixedAtBuild.common]
> +  #Platform description
> +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"Armada 8040 DB\0"
> +  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.4\0"
> +
>    #MPP
>    gMarvellTokenSpaceGuid.PcdMppChipCount|3
>  
> diff --git a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
> index 268c39c..bcc5158 100644
> --- a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
> +++ b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
> @@ -62,3 +62,14 @@
>    ArmadaBoardDescLib|Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.inf
>  !endif
>    NonDiscoverableInitLib|Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> +
> +[PcdsFixedAtBuild.common]
> +  #Platform description
> +  !if $(CN9130)
> +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9130 DB-A\0"
> +  !elseif $(CN9131)
> +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9131 DB-A\0"
> +  !elseif $(CN9132)
> +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9132 DB-A\0"
> +  !endif
> +  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.1\0"
> diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> index 2b42d75..f7d5a57 100644
> --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> @@ -46,6 +46,11 @@
>  #
>  ################################################################################
>  [PcdsFixedAtBuild.common]
> +  #Platform description
> +  gMarvellTokenSpaceGuid.PcdProductManufacturer|"SolidRun\0"
> +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"Armada 8040 MacchiatoBin\0"
> +  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.3\0"
> +
>    #MPP
>    gMarvellTokenSpaceGuid.PcdMppChipCount|3
>  
> -- 
> 2.7.4
> 

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

View/Reply Online (#48760): https://edk2.groups.io/g/devel/message/48760
Mute This Topic: https://groups.io/mt/34471906/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 v3 9/9] Marvell: Customize per-board SBMIOS strings
Posted by Marcin Wojtas 6 years, 4 months ago 
Hi Leif,

pt., 11 paź 2019 o 01:07 Leif Lindholm <leif.lindholm@linaro.org> napisał(a):
>
> On Thu, Oct 10, 2019 at 07:42:19AM +0200, Marcin Wojtas wrote:
> > Now that the customization of Type1/2/3 SBMIOS
> > tables strings is possible, adjust them for all
> > supported boards.
> >
> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> > ---
> >  Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc        |  4 ++++
> >  Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc        |  4 ++++
> >  Platform/Marvell/Cn913xDb/Cn913xDbA.dsc               | 11 +++++++++++
> >  Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc |  5 +++++
> >  4 files changed, 24 insertions(+)
> >
> > diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> > index 523e60e..3626967 100644
> > --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> > +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> > @@ -45,6 +45,10 @@
> >  #
> >  ################################################################################
> >  [PcdsFixedAtBuild.common]
> > +  #Platform description
> > +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"Armada 7040 DB\0"
> > +  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.5\0"
>
> Why have we ended up requiring explicit \0 in literal strings?
> This does not seem to be needed for (for example)
> gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor
> so why is it needed here?
>

Indeed, works fine without it - will be removed in v4.

Thanks,
Marcin


> > +
> >    #CP110 count
> >    gMarvellTokenSpaceGuid.PcdMaxCpCount|1
> >
> > diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > index 4e6e62b..ce0c541 100644
> > --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > @@ -45,6 +45,10 @@
> >  #
> >  ################################################################################
> >  [PcdsFixedAtBuild.common]
> > +  #Platform description
> > +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"Armada 8040 DB\0"
> > +  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.4\0"
> > +
> >    #MPP
> >    gMarvellTokenSpaceGuid.PcdMppChipCount|3
> >
> > diff --git a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
> > index 268c39c..bcc5158 100644
> > --- a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
> > +++ b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
> > @@ -62,3 +62,14 @@
> >    ArmadaBoardDescLib|Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.inf
> >  !endif
> >    NonDiscoverableInitLib|Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> > +
> > +[PcdsFixedAtBuild.common]
> > +  #Platform description
> > +  !if $(CN9130)
> > +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9130 DB-A\0"
> > +  !elseif $(CN9131)
> > +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9131 DB-A\0"
> > +  !elseif $(CN9132)
> > +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9132 DB-A\0"
> > +  !endif
> > +  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.1\0"
> > diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> > index 2b42d75..f7d5a57 100644
> > --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> > +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> > @@ -46,6 +46,11 @@
> >  #
> >  ################################################################################
> >  [PcdsFixedAtBuild.common]
> > +  #Platform description
> > +  gMarvellTokenSpaceGuid.PcdProductManufacturer|"SolidRun\0"
> > +  gMarvellTokenSpaceGuid.PcdProductPlatformName|"Armada 8040 MacchiatoBin\0"
> > +  gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.3\0"
> > +
> >    #MPP
> >    gMarvellTokenSpaceGuid.PcdMppChipCount|3
> >
> > --
> > 2.7.4
> >

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

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

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.