Re: [edk2-devel] [edk2-platforms PATCH v1 1/4] Silicon/Marvell: Retructure package
Hi Leif,
Just a heads up, I have submitted a second version of this patch with suggested
changes.
Thanks,
Narinder Dhillon
> -Original Message-
> From: Leif Lindholm
> Sent: Thursday, October 26, 2023 11:47 AM
> To: devel@edk2.groups.io
> Cc: Narinder Dhillon ; m...@semihalf.com
> Subject: [EXT] Re: [edk2-devel] [edk2-platforms PATCH v1 1/4] Silicon/Marvell:
> Retructure package
>
> External Email
>
> --
> On Thu, Oct 26, 2023 at 16:35:52 +0100, Leif Lindholm wrote:
> > On Wed, Oct 11, 2023 at 10:53:20 -0700, ndhil...@marvell.com wrote:
> > > From: Narinder Dhillon
> > >
> > > Current Marvell package structure makes it difficult to add new
> > > silicon packages that reuse common elements without creating nested DEC
> files.
> > >
> > > This patch creates a new MarvellSiliconPkg folder and moves the
> > > current common elements inside it.
> > >
> > > Also gMarvellTokenSpaceGuid has been renamed to
> > > gMarvellSiliconTokenSpaceGuid to align with new package name.
> >
> > Ah, I also note this patch breaks bisect since it does not change the
> > path in the affected .inf files:
> >
> Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0D
> bBoardDescLib.inf:
> >
> Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInit
> Lib.inf:
> >
> Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0D
> bBoardDescLib.inf:
> >
> Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInit
> Lib.inf:
> >
> Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.inf
> :
> >
> Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9132DbABoardDescLib.inf
> :
> >
> Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.in
> f:
> >
> Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armad
> a80x0McBinBoardDescLib.inf:
> >
> Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverabl
> eInitLib.inf:
> >
> Platform/SolidRun/Cn913xCEx7Eval/BoardDescriptionLib/BoardDescriptionLib.i
> nf:
> >
> Platform/SolidRun/Cn913xCEx7Eval/NonDiscoverableInitLib/NonDiscoverableIn
> itLib.inf:
> >
> > That change needs to be squashed into this patch instead of introduced
> > in 3/4.
>
> Actually, belay that.
> 2, 3, 4 all need to be squashed into 1.
> One of these years I'll learn to read through an entire set before responding.
>
> /
> Leif
>
> > /
> > Leif
> >
> > > Signed-off-by: Narinder Dhillon
> > > ---
> > > Silicon/Marvell/Marvell.dec | 208 -
> > > .../Include/IndustryStandard/MvSmc.h | 0
> > > .../Include/Library/ArmadaBoardDescLib.h | 0
> > > .../Include/Library/ArmadaIcuLib.h| 0
> > > .../Include/Library/ArmadaSoCDescLib.h| 0
> > > .../Include/Library/MppLib.h | 0
> > > .../Include/Library/MvComPhyLib.h | 0
> > > .../Include/Library/MvGpioLib.h | 0
> > > .../Include/Library/NonDiscoverableInitLib.h | 0
> > > .../Include/Library/SampleAtResetLib.h| 0
> > > .../Include/Library/UtmiPhyLib.h | 0
> > > .../Include/Protocol/BoardDesc.h | 0
> > > .../Include/Protocol/Eeprom.h | 0
> > > .../Include/Protocol/Mdio.h | 0
> > > .../Include/Protocol/MvI2c.h | 0
> > > .../Include/Protocol/MvPhy.h | 0
> > > .../Include/Protocol/Spi.h| 0
> > > .../Include/Protocol/SpiFlash.h | 0
> > > .../MarvellSiliconPkg/MarvellSiliconPkg.dec | 211 ++
> > > 19 files changed, 211 insertions(+), 208 deletions(-) delete mode
> > > 100644 Silicon/Marvell/Marvell.dec rename Silicon/Marvell/{ =>
> > > MarvellSiliconPkg}/Include/IndustryStandard/MvSmc.h (100%) rename
> > > Silicon/Marvell/{ =>
> > > MarvellSiliconPkg}/Include/Library/ArmadaBoardDescLib.h (100%)
> > > rename Silicon/Marvell/{ =>
> > > MarvellSiliconPkg}/Include/Library/ArmadaIcuLib.h (100%) rename
> > > Silicon/Marvell/{ =>
> > > MarvellSiliconPkg}/Include/Library/ArmadaSoCDescLib.h (100%) rename
> > > Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MppLib.h
> > > (100%) rename Silicon/Marvell/{ =>
> > > MarvellSiliconPkg}/I
Re: [edk2-devel] [edk2-platforms PATCH v1 1/4] Silicon/Marvell: Retructure package
On Thu, Oct 26, 2023 at 16:35:52 +0100, Leif Lindholm wrote:
> On Wed, Oct 11, 2023 at 10:53:20 -0700, ndhil...@marvell.com wrote:
> > From: Narinder Dhillon
> >
> > Current Marvell package structure makes it difficult to add new silicon
> > packages that reuse common elements without creating nested DEC files.
> >
> > This patch creates a new MarvellSiliconPkg folder and moves the current
> > common elements inside it.
> >
> > Also gMarvellTokenSpaceGuid has been renamed to
> > gMarvellSiliconTokenSpaceGuid to align with new package name.
>
> Ah, I also note this patch breaks bisect since it does not change the
> path in the affected .inf files:
> Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf:
> Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf:
> Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf:
> Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf:
> Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.inf:
> Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9132DbABoardDescLib.inf:
> Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.inf:
> Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.inf:
> Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.inf:
> Platform/SolidRun/Cn913xCEx7Eval/BoardDescriptionLib/BoardDescriptionLib.inf:
> Platform/SolidRun/Cn913xCEx7Eval/NonDiscoverableInitLib/NonDiscoverableInitLib.inf:
>
> That change needs to be squashed into this patch instead of introduced
> in 3/4.
Actually, belay that.
2, 3, 4 all need to be squashed into 1.
One of these years I'll learn to read through an entire set before
responding.
/
Leif
> /
> Leif
>
> > Signed-off-by: Narinder Dhillon
> > ---
> > Silicon/Marvell/Marvell.dec | 208 -
> > .../Include/IndustryStandard/MvSmc.h | 0
> > .../Include/Library/ArmadaBoardDescLib.h | 0
> > .../Include/Library/ArmadaIcuLib.h| 0
> > .../Include/Library/ArmadaSoCDescLib.h| 0
> > .../Include/Library/MppLib.h | 0
> > .../Include/Library/MvComPhyLib.h | 0
> > .../Include/Library/MvGpioLib.h | 0
> > .../Include/Library/NonDiscoverableInitLib.h | 0
> > .../Include/Library/SampleAtResetLib.h| 0
> > .../Include/Library/UtmiPhyLib.h | 0
> > .../Include/Protocol/BoardDesc.h | 0
> > .../Include/Protocol/Eeprom.h | 0
> > .../Include/Protocol/Mdio.h | 0
> > .../Include/Protocol/MvI2c.h | 0
> > .../Include/Protocol/MvPhy.h | 0
> > .../Include/Protocol/Spi.h| 0
> > .../Include/Protocol/SpiFlash.h | 0
> > .../MarvellSiliconPkg/MarvellSiliconPkg.dec | 211 ++
> > 19 files changed, 211 insertions(+), 208 deletions(-)
> > delete mode 100644 Silicon/Marvell/Marvell.dec
> > rename Silicon/Marvell/{ =>
> > MarvellSiliconPkg}/Include/IndustryStandard/MvSmc.h (100%)
> > rename Silicon/Marvell/{ =>
> > MarvellSiliconPkg}/Include/Library/ArmadaBoardDescLib.h (100%)
> > rename Silicon/Marvell/{ =>
> > MarvellSiliconPkg}/Include/Library/ArmadaIcuLib.h (100%)
> > rename Silicon/Marvell/{ =>
> > MarvellSiliconPkg}/Include/Library/ArmadaSoCDescLib.h (100%)
> > rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MppLib.h
> > (100%)
> > rename Silicon/Marvell/{ =>
> > MarvellSiliconPkg}/Include/Library/MvComPhyLib.h (100%)
> > rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MvGpioLib.h
> > (100%)
> > rename Silicon/Marvell/{ =>
> > MarvellSiliconPkg}/Include/Library/NonDiscoverableInitLib.h (100%)
> > rename Silicon/Marvell/{ =>
> > MarvellSiliconPkg}/Include/Library/SampleAtResetLib.h (100%)
> > rename Silicon/Marvell/{ =>
> > MarvellSiliconPkg}/Include/Library/UtmiPhyLib.h (100%)
> > rename Silicon/Marvell/{ =>
> > MarvellSiliconPkg}/Include/Protocol/BoardDesc.h (100%)
> > rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Eeprom.h
> > (100%)
> > rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Mdio.h
> > (100%)
> > rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvI2c.h
> > (100%)
> > rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvPhy.h
> > (100%)
> > rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Spi.h
> > (100%)
> > rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/SpiFlash.h
> > (100%)
> > create mode 100644 Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
> >
> > diff --git a/Silicon/Marvell/Marvell.dec b/Silicon/Marvell/Marvell.dec
> > deleted file mode 100644
> > index 482a90da25..00
> > --- a/Silicon/Marvell/Marvell.dec
> > +++ /dev/null
> > @@ -1,208 +
Re: [edk2-devel] [edk2-platforms PATCH v1 1/4] Silicon/Marvell: Retructure package
On Wed, Oct 11, 2023 at 10:53:20 -0700, ndhil...@marvell.com wrote:
> From: Narinder Dhillon
>
> Current Marvell package structure makes it difficult to add new silicon
> packages that reuse common elements without creating nested DEC files.
>
> This patch creates a new MarvellSiliconPkg folder and moves the current
> common elements inside it.
>
> Also gMarvellTokenSpaceGuid has been renamed to
> gMarvellSiliconTokenSpaceGuid to align with new package name.
Ah, I also note this patch breaks bisect since it does not change the
path in the affected .inf files:
Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf:
Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf:
Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf:
Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf:
Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.inf:
Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9132DbABoardDescLib.inf:
Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.inf:
Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.inf:
Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.inf:
Platform/SolidRun/Cn913xCEx7Eval/BoardDescriptionLib/BoardDescriptionLib.inf:
Platform/SolidRun/Cn913xCEx7Eval/NonDiscoverableInitLib/NonDiscoverableInitLib.inf:
That change needs to be squashed into this patch instead of introduced
in 3/4.
/
Leif
> Signed-off-by: Narinder Dhillon
> ---
> Silicon/Marvell/Marvell.dec | 208 -
> .../Include/IndustryStandard/MvSmc.h | 0
> .../Include/Library/ArmadaBoardDescLib.h | 0
> .../Include/Library/ArmadaIcuLib.h| 0
> .../Include/Library/ArmadaSoCDescLib.h| 0
> .../Include/Library/MppLib.h | 0
> .../Include/Library/MvComPhyLib.h | 0
> .../Include/Library/MvGpioLib.h | 0
> .../Include/Library/NonDiscoverableInitLib.h | 0
> .../Include/Library/SampleAtResetLib.h| 0
> .../Include/Library/UtmiPhyLib.h | 0
> .../Include/Protocol/BoardDesc.h | 0
> .../Include/Protocol/Eeprom.h | 0
> .../Include/Protocol/Mdio.h | 0
> .../Include/Protocol/MvI2c.h | 0
> .../Include/Protocol/MvPhy.h | 0
> .../Include/Protocol/Spi.h| 0
> .../Include/Protocol/SpiFlash.h | 0
> .../MarvellSiliconPkg/MarvellSiliconPkg.dec | 211 ++
> 19 files changed, 211 insertions(+), 208 deletions(-)
> delete mode 100644 Silicon/Marvell/Marvell.dec
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/IndustryStandard/MvSmc.h (100%)
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/Library/ArmadaBoardDescLib.h (100%)
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/Library/ArmadaIcuLib.h (100%)
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/Library/ArmadaSoCDescLib.h (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MppLib.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MvComPhyLib.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MvGpioLib.h
> (100%)
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/Library/NonDiscoverableInitLib.h (100%)
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/Library/SampleAtResetLib.h (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/UtmiPhyLib.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/BoardDesc.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Eeprom.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Mdio.h (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvI2c.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvPhy.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Spi.h (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/SpiFlash.h
> (100%)
> create mode 100644 Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
>
> diff --git a/Silicon/Marvell/Marvell.dec b/Silicon/Marvell/Marvell.dec
> deleted file mode 100644
> index 482a90da25..00
> --- a/Silicon/Marvell/Marvell.dec
> +++ /dev/null
> @@ -1,208 +0,0 @@
> -# Copyright (C) 2016 Marvell International Ltd.
> -#
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -
> -[Defines]
> - DEC_SPECIFICATION = 0x00010005
> - PACKAGE_NAME = OpenPlatformMarvellPkg
> - PACKAGE_GUID = c372916e-83ad-4b2a-8410-bbc31bd9e68f
> - PACKAGE_VERSION= 0.1
> -
> -
Re: [edk2-devel] [edk2-platforms PATCH v1 1/4] Silicon/Marvell: Retructure package
Hi Nharinder,
Apologies for delay in responding - this was sent out during UEFI
plugfest, and then I brought home a cold from there.
On Wed, Oct 11, 2023 at 10:53:20 -0700, ndhil...@marvell.com wrote:
> From: Narinder Dhillon
>
> Current Marvell package structure makes it difficult to add new silicon
> packages that reuse common elements without creating nested DEC files.
>
> This patch creates a new MarvellSiliconPkg folder and moves the current
> common elements inside it.
>
> Also gMarvellTokenSpaceGuid has been renamed to
> gMarvellSiliconTokenSpaceGuid to align with new package name.
>
> Signed-off-by: Narinder Dhillon
> ---
> Silicon/Marvell/Marvell.dec | 208 -
> .../Include/IndustryStandard/MvSmc.h | 0
> .../Include/Library/ArmadaBoardDescLib.h | 0
> .../Include/Library/ArmadaIcuLib.h| 0
> .../Include/Library/ArmadaSoCDescLib.h| 0
> .../Include/Library/MppLib.h | 0
> .../Include/Library/MvComPhyLib.h | 0
> .../Include/Library/MvGpioLib.h | 0
> .../Include/Library/NonDiscoverableInitLib.h | 0
> .../Include/Library/SampleAtResetLib.h| 0
> .../Include/Library/UtmiPhyLib.h | 0
> .../Include/Protocol/BoardDesc.h | 0
> .../Include/Protocol/Eeprom.h | 0
> .../Include/Protocol/Mdio.h | 0
> .../Include/Protocol/MvI2c.h | 0
> .../Include/Protocol/MvPhy.h | 0
> .../Include/Protocol/Spi.h| 0
> .../Include/Protocol/SpiFlash.h | 0
> .../MarvellSiliconPkg/MarvellSiliconPkg.dec | 211 ++
I was curious as to what caused 208 lines to be deleted and 211 added.
A diff shows the below:
+ UtmiPhyLib|Include/Library/UtmiPhyLib.h
+ MppLib|Include/Library/MppLib.h
+ MvComPhyLib|Include/Library/MvComPhyLib.h
While it was clearly a bug that these were previously unlisted, I
think that should be changed by a separate patch, preceding this,
rather than as part of a rename operation.
There is also a trailing newline at the end of the.dec that would be
nice to get rid of. (Could be addressed in the same ".dec cleanup" patch.)
/
Leif
> 19 files changed, 211 insertions(+), 208 deletions(-)
> delete mode 100644 Silicon/Marvell/Marvell.dec
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/IndustryStandard/MvSmc.h (100%)
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/Library/ArmadaBoardDescLib.h (100%)
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/Library/ArmadaIcuLib.h (100%)
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/Library/ArmadaSoCDescLib.h (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MppLib.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MvComPhyLib.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MvGpioLib.h
> (100%)
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/Library/NonDiscoverableInitLib.h (100%)
> rename Silicon/Marvell/{ =>
> MarvellSiliconPkg}/Include/Library/SampleAtResetLib.h (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/UtmiPhyLib.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/BoardDesc.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Eeprom.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Mdio.h (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvI2c.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvPhy.h
> (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Spi.h (100%)
> rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/SpiFlash.h
> (100%)
> create mode 100644 Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
>
> diff --git a/Silicon/Marvell/Marvell.dec b/Silicon/Marvell/Marvell.dec
> deleted file mode 100644
> index 482a90da25..00
> --- a/Silicon/Marvell/Marvell.dec
> +++ /dev/null
> @@ -1,208 +0,0 @@
> -# Copyright (C) 2016 Marvell International Ltd.
> -#
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -
> -[Defines]
> - DEC_SPECIFICATION = 0x00010005
> - PACKAGE_NAME = OpenPlatformMarvellPkg
> - PACKAGE_GUID = c372916e-83ad-4b2a-8410-bbc31bd9e68f
> - PACKAGE_VERSION= 0.1
> -
> -
> -#
> -# Include Section - list of Include Paths that are provided by this package.
> -# Comments are used for Keywords and Module Types.
> -#
> -# Supported Module Types:
> -# BASE SEC PEI_CORE PEIM DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER
> DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION
> -#
> -#
[edk2-devel] [edk2-platforms PATCH v1 1/4] Silicon/Marvell: Retructure package
From: Narinder Dhillon
Current Marvell package structure makes it difficult to add new silicon
packages that reuse common elements without creating nested DEC files.
This patch creates a new MarvellSiliconPkg folder and moves the current
common elements inside it.
Also gMarvellTokenSpaceGuid has been renamed to
gMarvellSiliconTokenSpaceGuid to align with new package name.
Signed-off-by: Narinder Dhillon
---
Silicon/Marvell/Marvell.dec | 208 -
.../Include/IndustryStandard/MvSmc.h | 0
.../Include/Library/ArmadaBoardDescLib.h | 0
.../Include/Library/ArmadaIcuLib.h| 0
.../Include/Library/ArmadaSoCDescLib.h| 0
.../Include/Library/MppLib.h | 0
.../Include/Library/MvComPhyLib.h | 0
.../Include/Library/MvGpioLib.h | 0
.../Include/Library/NonDiscoverableInitLib.h | 0
.../Include/Library/SampleAtResetLib.h| 0
.../Include/Library/UtmiPhyLib.h | 0
.../Include/Protocol/BoardDesc.h | 0
.../Include/Protocol/Eeprom.h | 0
.../Include/Protocol/Mdio.h | 0
.../Include/Protocol/MvI2c.h | 0
.../Include/Protocol/MvPhy.h | 0
.../Include/Protocol/Spi.h| 0
.../Include/Protocol/SpiFlash.h | 0
.../MarvellSiliconPkg/MarvellSiliconPkg.dec | 211 ++
19 files changed, 211 insertions(+), 208 deletions(-)
delete mode 100644 Silicon/Marvell/Marvell.dec
rename Silicon/Marvell/{ =>
MarvellSiliconPkg}/Include/IndustryStandard/MvSmc.h (100%)
rename Silicon/Marvell/{ =>
MarvellSiliconPkg}/Include/Library/ArmadaBoardDescLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/ArmadaIcuLib.h
(100%)
rename Silicon/Marvell/{ =>
MarvellSiliconPkg}/Include/Library/ArmadaSoCDescLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MppLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MvComPhyLib.h
(100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MvGpioLib.h
(100%)
rename Silicon/Marvell/{ =>
MarvellSiliconPkg}/Include/Library/NonDiscoverableInitLib.h (100%)
rename Silicon/Marvell/{ =>
MarvellSiliconPkg}/Include/Library/SampleAtResetLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/UtmiPhyLib.h
(100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/BoardDesc.h
(100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Eeprom.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Mdio.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvI2c.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvPhy.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Spi.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/SpiFlash.h
(100%)
create mode 100644 Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
diff --git a/Silicon/Marvell/Marvell.dec b/Silicon/Marvell/Marvell.dec
deleted file mode 100644
index 482a90da25..00
--- a/Silicon/Marvell/Marvell.dec
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright (C) 2016 Marvell International Ltd.
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-
-[Defines]
- DEC_SPECIFICATION = 0x00010005
- PACKAGE_NAME = OpenPlatformMarvellPkg
- PACKAGE_GUID = c372916e-83ad-4b2a-8410-bbc31bd9e68f
- PACKAGE_VERSION= 0.1
-
-
-#
-# Include Section - list of Include Paths that are provided by this package.
-# Comments are used for Keywords and Module Types.
-#
-# Supported Module Types:
-# BASE SEC PEI_CORE PEIM DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER
DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION
-#
-
-
-[Includes]
- Include
-
-[Guids.common]
- gMarvellTokenSpaceGuid = { 0xf995c6c8, 0xbc9b, 0x4e93, { 0xbd, 0xcf, 0x49,
0x90, 0xc6, 0xe7, 0x8c, 0x7f } }
-
- gShellEepromHiiGuid = { 0xb2f4c714, 0x147f, 0x4ff7, { 0x82, 0x1b, 0xce,
0x7b, 0x91, 0x7f, 0x5f, 0x2f } }
- gShellFUpdateHiiGuid = { 0x9b5d2176, 0x590a, 0x49db, { 0x89, 0x5d, 0x4a,
0x70, 0xfe, 0xad, 0xbe, 0x24 } }
- gShellSfHiiGuid = { 0x03a67756, 0x8cde, 0x4638, { 0x82, 0x34, 0x4a, 0x0f,
0x6d, 0x58, 0x81, 0x39 } }
-
-[LibraryClasses]
- ArmadaBoardDescLib|Include/Library/ArmadaBoardDescLib.h
- ArmadaIcuLib|Include/Library/ArmadaIcuLib.h
- ArmadaSoCDescLib|Include/Library/ArmadaSoCDescLib.h
- MvGpioLib|Include/Library/MvGpioLib.h
- NonDiscoverableInitLib|Include/Library/NonDiscoverableInitLib.h
- SampleAtResetLib|Include/Library/SampleAtResetLib.h
-
-[Protocols]
- # installed as a protocol by PlatInitDxe to force ordering betw
