On Wed, May 15, 2019 at 04:10:08PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
As far as I can tell, this excludes the source files currently
licensed under 3-clause BSD (2-clause plus non-endorsement clause).
This is correct, and as discussed offline, but it would be worth
pointing it out explicitly in the commit message.
(Conversations about relicensing the 3-clause files are happening in
the background.)
Other than that, looks good to me.
/
Leif
> Cc: Leif Lindholm <leif.lindh...@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheu...@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com>
> ---
> Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf | 8 +-------
> .../Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf | 8 +-------
> .../Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf | 8 +-------
> .../Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc | 8 +-------
> Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 8 +-------
> Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf | 8 +-------
> Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf | 8 +-------
> Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf | 8 +-------
> Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf | 8 +-------
> .../Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c | 8 +-------
> .../Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf | 8 +-------
> .../Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c | 8 +-------
> .../Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf | 8 +-------
> .../PlatformFlashAccessLib/PlatformFlashAccessLib.c | 8 +-------
> .../PlatformFlashAccessLib/PlatformFlashAccessLib.inf | 8 +-------
> .../SystemFirmwareDescriptor.aslc | 8 +-------
> .../SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf | 8 +-------
> .../SystemFirmwareDescriptorPei.c | 8 +-------
> .../SystemFirmwareUpdateConfig.ini | 8 +-------
> .../Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S | 5 +----
> .../Library/Armada7k8kLib/ARM/ArmPlatformHelper.S | 5 +----
> .../Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c | 8 +-------
> .../Armada7k8kMemoryInitPeiLib.c | 8 +-------
> .../Armada7k8kMemoryInitPeiLib.inf | 8 +-------
> .../Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c | 8 +-------
> .../Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h | 8 +-------
> .../Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf | 8 +-------
> .../Library/RealTimeClockLib/RealTimeClockLib.c | 8 +-------
> .../Library/RealTimeClockLib/RealTimeClockLib.inf | 7 +------
> Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c | 8 +-------
> Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h | 8 +-------
> Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf | 8 +-------
> Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c | 8 +-------
> Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h | 8 +-------
> .../Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf | 8 +-------
> Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf | 7 +------
> Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c | 8 +-------
> Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h | 8 +-------
> Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c | 8 +-------
> Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h | 8 +-------
> Silicon/Marvell/Include/IndustryStandard/MvSmc.h | 8 +-------
> Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h | 8 +-------
> Silicon/Marvell/Include/Library/ArmadaIcuLib.h | 8 +-------
> Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h | 8 +-------
> Silicon/Marvell/Include/Library/MvGpioLib.h | 8 +-------
> Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h | 8 +-------
> Silicon/Marvell/Include/Protocol/MvI2c.h | 8 +-------
> Silicon/Marvell/Library/IcuLib/IcuLib.c | 8 +-------
> Silicon/Marvell/Library/IcuLib/IcuLib.h | 8 +-------
> Silicon/Marvell/Library/IcuLib/IcuLib.inf | 8 +-------
> Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c | 8 +-------
> Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf | 8 +-------
> 61 files changed, 61 insertions(+), 419 deletions(-)
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h
> b/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h
> index f5ebd27d02..90ab607845 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h
> @@ -5,13 +5,7 @@
> Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf
> b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf
> index 659c333381..926f3667cc 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf
> @@ -6,13 +6,7 @@
> # Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
> b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
> index 621b688818..20369c5f72 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
> b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
> index 35a679b884..8367f07d96 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
> @@ -6,13 +6,7 @@
> # Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
> b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
> index 7c659497bd..822a8e4878 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
> b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
> index 9e52281fca..e1416f07ab 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
> @@ -6,13 +6,7 @@
> # Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> index 87cb93a80e..638698ace9 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> @@ -4,13 +4,7 @@
>
> Copyright (c) 2018, Linaro Ltd. All rights reserved.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc
> b/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc
> index de88210e40..f3656dd3a5 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc
> @@ -5,13 +5,7 @@
> Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc
> b/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc
> index 16a8806f86..a08d0b9ccf 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc
> @@ -5,13 +5,7 @@
> Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h
> b/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h
> index 5746ad477b..dd33cb5e7b 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h
> @@ -2,13 +2,7 @@
>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.
>
> - This program and the accompanying materials are licensed and made available
> - under the terms and conditions of the BSD License which accompanies this
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> Glossary - abbreviations used in Marvell SampleAtReset library
> implementation:
> ICU - Interrupt Consolidation Unit
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc
> b/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc
> index 7ab927d165..5b553cd923 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc
> @@ -5,13 +5,7 @@
> Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc
> b/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc
> index 8de29bd383..e03bfcd621 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc
> @@ -3,13 +3,7 @@
> Copyright (c) 2018, Linaro Ltd. All rights reserved.<BR>
> Copyright (c) 2018, Marvell International Ltd. All rights reserved.<BR>
>
> - This program and the accompanying materials are licensed and made available
> - under the terms and conditions of the BSD License which accompanies this
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc
> b/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc
> index 1c7c8424c0..438cf7880e 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc
> @@ -4,13 +4,7 @@
> Copyright (c) 2017, Linaro Limited. All rights reserved.
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> index 8a050ef987..d2bbdedcfa 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> @@ -1,13 +1,7 @@
> #
> # Copyright (C) Marvell International Ltd. and its affiliates
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
>
> ################################################################################
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf
> b/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf
> index 1ca6cddc91..be717bc3cc 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf
> @@ -1,13 +1,7 @@
> #
> # Copyright (C) Marvell International Ltd. and its affiliates
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [FD.Armada_Capsule]
> diff --git a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf
> b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf
> index 1f2d9ea170..b533578a89 100644
> --- a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf
> +++ b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
> b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
> index e4dd41cac3..378fad240b 100644
> --- a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
> +++ b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
> b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
> index 810a52b2ab..540e1a79f3 100644
> --- a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
> +++ b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
> b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
> index 2cbc3e4bfb..6fed663b14 100644
> --- a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
> +++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
> @@ -4,13 +4,7 @@
>
> Copyright (C) 2017, Linaro Ltd. All rights reserved.<BR>
>
> - This program and the accompanying materials are licensed and made available
> - under the terms and conditions of the BSD License which accompanies this
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> WITHOUT
> - WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
> b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
> index e6561f3cb8..4c766eeff8 100644
> --- a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
> +++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (C) 2017, Linaro Ltd. All rights reserved.<BR>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> WITHOUT
> -# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
> b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
> index 2629daa35f..758412c48c 100644
> --- a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
> +++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
> @@ -2,13 +2,7 @@
> Copyright (c) 2017, Linaro Limited. All rights reserved.
> Copyright (c) 2017, Marvell International Ltd. and its affiliates
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
> b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
> index df10526fae..9f4447afc2 100644
> --- a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
> +++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
> @@ -2,13 +2,7 @@
> # Copyright (c) 2017, Linaro Limited. All rights reserved.
> # Copyright (c) 2017, Marvell International Ltd. and its affiliates
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #*/
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c
>
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c
> index faa3a13dd2..0529d7d96c 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c
> +++
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c
> @@ -3,13 +3,7 @@
>
> Copyright (c) 2018 Marvell International Ltd.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
>
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
> index fd94759900..69a7b71c51 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
> +++
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, Linaro, Ltd. All rights reserved.<BR>
> # Copyright (c) 2018, Marvell International, Ltd. All rights reserved.<BR>
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> index fbccdc2d09..1499fd6999 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> +++
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Limited. All rights reserved.
> Copyright (c) 2016, 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
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> index e6967b21f1..7bf1f2f41a 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> +++
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> @@ -5,13 +5,7 @@
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> # Copyright (c) 2016, 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
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> index c55c4d98a5..1343fb1ffa 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> +++
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Limited. All rights reserved.
> Copyright (c) 2016, 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
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> index fb0bd0bfa5..442060bfbc 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> +++
> b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2018, Marvell International Ltd.<BR>
> # Copyright (c) 2016, 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
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
>
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
> index 72f8cfce77..6ae908a7b4 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
> +++
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
> @@ -3,10 +3,7 @@
> // Copyright (c) 2012-2013, ARM Limited. All rights reserved.
> // Copyright (c) 2016, Marvell. All rights reserved.
> //
> -// This program and the accompanying materials are licensed and made
> available
> -// under the terms and conditions of the BSD License which accompanies this
> -// distribution. The full text of the license may be found at
> -// http://opensource.org/licenses/bsd-license.php
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED
> diff --git
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
> index 21459e50a7..4416163060 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
> +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
> @@ -4,10 +4,7 @@
> // Copyright (c) 2016, Marvell. All rights reserved.
> // Copyright (c) 2017, Linaro Limited. All rights reserved.
> //
> -// This program and the accompanying materials are licensed and made
> available
> -// under the terms and conditions of the BSD License which accompanies this
> -// distribution. The full text of the license may be found at
> -// http://opensource.org/licenses/bsd-license.php
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED
> diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
> index 233f7b14a4..df838ff5ef 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
> +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2011-2012, ARM Limited. All rights reserved.
> * Copyright (c) 2016, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
>
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
> index 571f77e02f..0f953d4f04 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
> +++
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> * Copyright (c) 2017, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD
> License
> -* which accompanies this distribution. The full text of the license may be
> found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
>
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
> index 360de90180..f0b469ee55 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
> +++
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>
> # Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c
>
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c
> index 355be641a9..b6379667aa 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c
> +++
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> * Glossary - abbreviations used in Marvell SampleAtReset library
> implementation:
> * AP - Application Processor hardware block (Armada 7k8k incorporates AP806)
> diff --git
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h
>
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h
> index 8bbc5b0b09..74883fd3a6 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h
> +++
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> * Glossary - abbreviations used in Marvell SampleAtReset library
> implementation:
> * AP - Application Processor hardware block (Armada 7k8k incorporates AP806)
> diff --git
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf
>
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf
> index 48a320cf9b..d5809c6789 100644
> ---
> a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf
> +++
> b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
> #
> -# This program and the accompanying materials are licensed and made
> available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
> b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
> index 7de5ed77ef..1974e0144c 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
> +++ b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
> @@ -5,13 +5,7 @@
> Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
> Copyright (c) 2017, Marvell International Ltd. All rights reserved.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> /**
> diff --git
> a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
> b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
> index 1ecd444177..733827e61a 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
> +++ b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
> @@ -4,12 +4,7 @@
> # Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
> # Copyright (c) 2017, Marvell International Ltd. All rights reserved.<BR>
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
> #/**
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c
> b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c
> index 1d37eccb48..4cf4407544 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c
> +++ b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h
> b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h
> index 6e56ec15f3..1cb006a036 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h
> +++ b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __MV_GPIO_H__
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf
> b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf
> index 5ff91302da..6f36c2db2e 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf
> +++ b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, Marvell International Ltd. All rights reserved.<BR>
> #
> -# This program and the accompanying materials are licensed and made
> available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c
> b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c
> index 8e7ea7712c..1bf3bcdc2c 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c
> +++ b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h
> b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h
> index 29eb123798..a2498128f8 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h
> +++ b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __MV_PCA953X_H__
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf
> b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf
> index 3b1ab4ee6a..c202d811f2 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf
> +++ b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, Marvell International Ltd. All rights reserved.<BR>
> #
> -# This program and the accompanying materials are licensed and made
> available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf
> b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf
> index 09c58421cd..18f1b164fd 100644
> --- a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf
> +++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf
> @@ -8,12 +8,7 @@
> # Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
> # Copyright (C) 2018, Marvell International Ltd. All rights reserved.<BR>
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD
> License
> -# which accompanies this distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c
> b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c
> index 8a22046bd6..93fcfb3e4d 100644
> --- a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c
> +++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c
> @@ -7,13 +7,7 @@
> Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> Copyright (c) 2018, Marvell International, Ltd. All rights reserved.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h
> b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h
> index 152ba967de..c0bac77b9b 100644
> --- a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h
> +++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h
> @@ -5,13 +5,7 @@
> Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
> Copyright (c) 2018, Marvell International, Ltd. All rights reserved.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> index 62f9e57b13..fba75b6c26 100644
> --- a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> +++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> @@ -3,13 +3,7 @@
> Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
> Copyright (c) 2017 Marvell International Ltd.<BR>
>
> - This program and the accompanying materials are licensed and made available
> - under the terms and conditions of the BSD License which accompanies this
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> --*/
>
> diff --git a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
> b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
> index e8df9a5ec7..be6b5cb8b0 100644
> --- a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
> +++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
> @@ -3,13 +3,7 @@
> Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
> Copyright (c) 2017 Marvell International Ltd.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD
> License
> - which accompanies this distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Include/IndustryStandard/MvSmc.h
> b/Silicon/Marvell/Include/IndustryStandard/MvSmc.h
> index e5c89d9318..976c23c772 100644
> --- a/Silicon/Marvell/Include/IndustryStandard/MvSmc.h
> +++ b/Silicon/Marvell/Include/IndustryStandard/MvSmc.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2019, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h
> b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h
> index 6ec5ace8dd..a6d39c4f21 100644
> --- a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h
> +++ b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __ARMADA_BOARD_DESC_LIB_H__
> diff --git a/Silicon/Marvell/Include/Library/ArmadaIcuLib.h
> b/Silicon/Marvell/Include/Library/ArmadaIcuLib.h
> index db66efbb73..9f3dd85a96 100644
> --- a/Silicon/Marvell/Include/Library/ArmadaIcuLib.h
> +++ b/Silicon/Marvell/Include/Library/ArmadaIcuLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __ARMADA_ICU_LIB_H__
> diff --git a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h
> b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h
> index fc17c3a8a4..cd9c9f26fe 100644
> --- a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h
> +++ b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __ARMADA_SOC_DESC_LIB_H__
> diff --git a/Silicon/Marvell/Include/Library/MvGpioLib.h
> b/Silicon/Marvell/Include/Library/MvGpioLib.h
> index a14acdff63..6ca9e79c1f 100644
> --- a/Silicon/Marvell/Include/Library/MvGpioLib.h
> +++ b/Silicon/Marvell/Include/Library/MvGpioLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __MV_GPIO_LIB_H__
> diff --git a/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h
> b/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h
> index 18de24fdb0..c353846606 100644
> --- a/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h
> +++ b/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Linaro Ltd. All rights reserved.
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Marvell/Include/Protocol/MvI2c.h
> b/Silicon/Marvell/Include/Protocol/MvI2c.h
> index d8e644eaad..1d1978e3b3 100644
> --- a/Silicon/Marvell/Include/Protocol/MvI2c.h
> +++ b/Silicon/Marvell/Include/Protocol/MvI2c.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __MV_I2C_H__
> diff --git a/Silicon/Marvell/Library/IcuLib/IcuLib.c
> b/Silicon/Marvell/Library/IcuLib/IcuLib.c
> index e88337c0d2..343c21b0be 100644
> --- a/Silicon/Marvell/Library/IcuLib/IcuLib.c
> +++ b/Silicon/Marvell/Library/IcuLib/IcuLib.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> * Glossary - abbreviations used in Marvell SampleAtReset library
> implementation:
> * ICU - Interrupt Consolidation Unit
> diff --git a/Silicon/Marvell/Library/IcuLib/IcuLib.h
> b/Silicon/Marvell/Library/IcuLib/IcuLib.h
> index 40df00c6d0..22027f6bc0 100644
> --- a/Silicon/Marvell/Library/IcuLib/IcuLib.h
> +++ b/Silicon/Marvell/Library/IcuLib/IcuLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> * Glossary - abbreviations used in Marvell SampleAtReset library
> implementation:
> * ICU - Interrupt Consolidation Unit
> diff --git a/Silicon/Marvell/Library/IcuLib/IcuLib.inf
> b/Silicon/Marvell/Library/IcuLib/IcuLib.inf
> index ea662becd7..a2adf412a7 100644
> --- a/Silicon/Marvell/Library/IcuLib/IcuLib.inf
> +++ b/Silicon/Marvell/Library/IcuLib/IcuLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
> #
> -# This program and the accompanying materials are licensed and made
> available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c
> b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c
> index a95d5ae846..95eabf8022 100644
> --- a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c
> +++ b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made
> available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #include <Uefi.h>
> diff --git a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf
> b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf
> index 3bc54ce561..24db268bc7 100644
> --- a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf
> +++ b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
> #
> -# This program and the accompanying materials are licensed and made
> available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> --
> 2.21.0.windows.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40903): https://edk2.groups.io/g/devel/message/40903
Mute This Topic: https://groups.io/mt/31635500/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
