[PATCH edk2-platforms 0/3] Rectify licensing on various files

[PATCH edk2-platforms 0/3] Rectify licensing on various files

[Leif Lindholm]

When the change from 2-Clause BSD + CLA to only BSD+Patent happened,
a small number of files in the tree were left untouched because the
licensing situation was unclear; two files had accidental 3-Clause BSD
licenses so could not simply be changed, and some others accidentally
lacked explicit license statements.

This small series rectifies the situation for these files.

This does *not* touch the Marvell Armada/Macchiato source files which
were *intentionally* 3-clause BSD and Marvell have since  agreed to
relicense.

Leif Lindholm (3):
  Platform,Silicon RPi3: update license headers to BSD+Patent
  Platform/RaspberryPi: add license header to PlatformUiAppLib.inf
  Silicon/Hisilicon: add SPDX license tags to IORT .asl files

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>

 Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h            | 26 +-------------------------
 Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.inf |  8 ++++++++
 Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h             | 26 +-------------------------
 Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl                   |  4 +++-
 Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl                      |  4 +++-
 Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl                |  4 +++-
 Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl          |  4 +++-
 7 files changed, 22 insertions(+), 54 deletions(-)

-- 
2.20.1

[PATCH edk2-platforms 1/3] Platform,Silicon RPi3: update license headers to BSD+Patent

[Leif Lindholm]

RpiMbox.h and Bcm2836.h originate from Ard's original efforts, and were
always intended to be 2-clause BSD licensed, but due to a copy/paste
error, they ended up with a 3-clause BSD license instead - which meant
they were left out in Mike's major relicensing set.

(This is explained/confirmed in
https://edk2.groups.io/g/devel/message/40909
and
https://edk2.groups.io/g/devel/message/40911.)

This patch replaces the license headers in both with the SPDX statement
bringing it inline with the majority of the rest of the codebase.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
---
 Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h | 26 +-------------------------
 Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h  | 26 +-------------------------
 2 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h b/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h
index 8547ad05ba61..d3b6f117cfdf 100644
--- a/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h
+++ b/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h
@@ -3,31 +3,7 @@
  * Copyright (c) 2019, Pete Batard <pete@akeo.ie>
  * Copyright (c) 2016, Linaro Limited. All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of ARM nor the names of its contributors may be used
- * to endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
  *
  **/
 
diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h
index f06eb2312c61..4007301228be 100644
--- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h
+++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h
@@ -3,31 +3,7 @@
  *  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) 2016, Linaro Limited. All rights reserved.
  *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *
- *  Neither the name of ARM nor the names of its contributors may be used
- *  to endorse or promote products derived from this software without specific
- *  prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
+ *  SPDX-License-Identifier: BSD-2-Clause-Patent
  *
  **/
 
-- 
2.20.1

Re: [edk2-devel] [PATCH edk2-platforms 1/3] Platform,Silicon RPi3: update license headers to BSD+Patent

[Michael D Kinney]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io]
> On Behalf Of Leif Lindholm
> Sent: Tuesday, July 9, 2019 9:08 AM
> To: devel@edk2.groups.io
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>; Kinney,
> Michael D <michael.d.kinney@intel.com>
> Subject: [edk2-devel] [PATCH edk2-platforms 1/3]
> Platform,Silicon RPi3: update license headers to
> BSD+Patent
> 
> RpiMbox.h and Bcm2836.h originate from Ard's original
> efforts, and were always intended to be 2-clause BSD
> licensed, but due to a copy/paste error, they ended up
> with a 3-clause BSD license instead - which meant they
> were left out in Mike's major relicensing set.
> 
> (This is explained/confirmed in
> https://edk2.groups.io/g/devel/message/40909
> and
> https://edk2.groups.io/g/devel/message/40911.)
> 
> This patch replaces the license headers in both with the
> SPDX statement bringing it inline with the majority of
> the rest of the codebase.
> 
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> 
> Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbo
> x.h | 26 +-------------------------
> Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836
> .h  | 26 +-------------------------
>  2 files changed, 2 insertions(+), 50 deletions(-)
> 
> diff --git
> a/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiM
> box.h
> b/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiM
> box.h
> index 8547ad05ba61..d3b6f117cfdf 100644
> ---
> a/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiM
> box.h
> +++
> b/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiM
> box.h
> @@ -3,31 +3,7 @@
>   * Copyright (c) 2019, Pete Batard <pete@akeo.ie>
>   * Copyright (c) 2016, Linaro Limited. All rights
> reserved.
>   *
> - * Redistribution and use in source and binary forms,
> with or without
> - * modification, are permitted provided that the
> following conditions are met:
> - *
> - * Redistributions of source code must retain the above
> copyright notice, this
> - * list of conditions and the following disclaimer.
> - *
> - * Redistributions in binary form must reproduce the
> above copyright notice,
> - * this list of conditions and the following disclaimer
> in the documentation
> - * and/or other materials provided with the
> distribution.
> - *
> - * Neither the name of ARM nor the names of its
> contributors may be used
> - * to endorse or promote products derived from this
> software without specific
> - * prior written permission.
> - *
> - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
> AND CONTRIBUTORS "AS IS"
> - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
> NOT LIMITED TO, THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> A PARTICULAR PURPOSE
> - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> HOLDER OR CONTRIBUTORS BE
> - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
> EXEMPLARY, OR
> - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
> PROCUREMENT OF
> - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS
> - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
> LIABILITY, WHETHER IN
> - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> NEGLIGENCE OR OTHERWISE)
> - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
> EVEN IF ADVISED OF THE
> - * POSSIBILITY OF SUCH DAMAGE.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
>   *
>   **/
> 
> diff --git
> a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm28
> 36.h
> b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm28
> 36.h
> index f06eb2312c61..4007301228be 100644
> ---
> a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm28
> 36.h
> +++
> b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm28
> 36.h
> @@ -3,31 +3,7 @@
>   *  Copyright (c) 2017, Andrei Warkentin
> <andrey.warkentin@gmail.com>
>   *  Copyright (c) 2016, Linaro Limited. All rights
> reserved.
>   *
> - *  Redistribution and use in source and binary forms,
> with or without
> - *  modification, are permitted provided that the
> following conditions are met:
> - *
> - *  Redistributions of source code must retain the above
> copyright notice, this
> - *  list of conditions and the following disclaimer.
> - *
> - *  Redistributions in binary form must reproduce the
> above copyright notice,
> - *  this list of conditions and the following disclaimer
> in the documentation
> - *  and/or other materials provided with the
> distribution.
> - *
> - *  Neither the name of ARM nor the names of its
> contributors may be used
> - *  to endorse or promote products derived from this
> software without specific
> - *  prior written permission.
> - *
> - *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
> AND CONTRIBUTORS "AS IS"
> - *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
> BUT NOT LIMITED TO, THE
> - *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
> FOR A PARTICULAR PURPOSE
> - *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> HOLDER OR CONTRIBUTORS BE
> - *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> SPECIAL, EXEMPLARY, OR
> - *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
> TO, PROCUREMENT OF
> - *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS
> - *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
> LIABILITY, WHETHER IN
> - *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> NEGLIGENCE OR OTHERWISE)
> - *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
> EVEN IF ADVISED OF THE
> - *  POSSIBILITY OF SUCH DAMAGE.
> + *  SPDX-License-Identifier: BSD-2-Clause-Patent
>   *
>   **/
> 
> --
> 2.20.1
> 
> 
> 

[PATCH edk2-platforms 2/3] Platform/RaspberryPi: add license header to PlatformUiAppLib.inf

[Leif Lindholm]

PlatformUiAppLib.inf was accidentally merged without an explicit license
header. Add one that matches the actuakl source code (BSD+Patent, after
the general relicensing earlier this year.
(This has been OK:d with Andrei off-list.)

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
---
 Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.inf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.inf b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.inf
index cacf55f02a14..27b0c30c3917 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.inf
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.inf
@@ -1,3 +1,11 @@
+#/** @file
+#
+#  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
+#
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+#**/
+
 [Defines]
   INF_VERSION                    = 0x0001001A
   BASE_NAME                      = PlatformUiAppLib
-- 
2.20.1

Re: [PATCH edk2-platforms 2/3] Platform/RaspberryPi: add license header to PlatformUiAppLib.inf

[Michael D Kinney]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

> -----Original Message-----
> From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> Sent: Tuesday, July 9, 2019 9:08 AM
> To: devel@edk2.groups.io
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: [PATCH edk2-platforms 2/3] Platform/RaspberryPi:
> add license header to PlatformUiAppLib.inf
> 
> PlatformUiAppLib.inf was accidentally merged without an
> explicit license header. Add one that matches the actuakl
> source code (BSD+Patent, after the general relicensing
> earlier this year.
> (This has been OK:d with Andrei off-list.)
> 
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> 
> Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/Platfo
> rmUiAppLib.inf | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git
> a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/Plat
> formUiAppLib.inf
> b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/Plat
> formUiAppLib.inf
> index cacf55f02a14..27b0c30c3917 100644
> ---
> a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/Plat
> formUiAppLib.inf
> +++
> b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/Plat
> formUiAppLi
> +++ b.inf
> @@ -1,3 +1,11 @@
> +#/** @file
> +#
> +#  Copyright (c) 2017-2018, Andrei Warkentin
> +<andrey.warkentin@gmail.com> # #  SPDX-License-
> Identifier:
> +BSD-2-Clause-Patent # #**/
> +
>  [Defines]
>    INF_VERSION                    = 0x0001001A
>    BASE_NAME                      = PlatformUiAppLib
> --
> 2.20.1

Re: [PATCH edk2-platforms 2/3] Platform/RaspberryPi: add license header to PlatformUiAppLib.inf

[Leif Lindholm]

On Tue, Jul 23, 2019 at 07:12:33AM +0000, Kinney, Michael D wrote:
> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

Thanks!

> > -----Original Message-----
> > From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> > Sent: Tuesday, July 9, 2019 9:08 AM
> > To: devel@edk2.groups.io
> > Cc: Kinney, Michael D <michael.d.kinney@intel.com>
> > Subject: [PATCH edk2-platforms 2/3] Platform/RaspberryPi:
> > add license header to PlatformUiAppLib.inf
> > 
> > PlatformUiAppLib.inf was accidentally merged without an
> > explicit license header. Add one that matches the actuakl

I took the liberty of correcting "actuakl" -> "actual" (spotted when
adding the R-b) before pushing.
Series pushed as 688ba473560b..b22cc238aae0.

/
    Leif

[PATCH edk2-platforms 3/3] Silicon/Hisilicon: add SPDX license tags to IORT .asl files

[Leif Lindholm]

These files were generated using iasl as a disassembler, which adds a
(questionable) copyright Intel statement (which I don't actually care
about), but leaves out any sort of license message.

As per https://edk2.groups.io/g/devel/message/41048, these were
always intended to be contributed as 2-clause BSD + CLA, and would
have been converted to BSD+Patent at the big switchover had that been
the case.

Add SPDX header for BSD+Patent, and adjust the questionable copyright
year to when the files were actually created/modified.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
---
 Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl          | 4 +++-
 Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl             | 4 +++-
 Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl       | 4 +++-
 Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
index bb70dcd0c443..4101d86672cd 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
@@ -1,7 +1,9 @@
 /*
  * Intel ACPI Component Architecture
  * iASL Compiler/Disassembler version 20151124-64
- * Copyright (c) 2000 - 2015 Intel Corporation
+ * Copyright (c) 2015 Intel Corporation
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
  *
  * Template for [IORT] ACPI Table (static data table)
  * Format: [ByteLength]  FieldName : HexFieldValue
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
index b64fcb4c7891..472e461f9f07 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
@@ -1,7 +1,9 @@
 /*
  * Intel ACPI Component Architecture
  * iASL Compiler/Disassembler version 20151124-64
- * Copyright (c) 2000 - 2015 Intel Corporation
+ * Copyright (c) 2015 - 2016 Intel Corporation
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
  *
  * Template for [IORT] ACPI Table (static data table)
  * Format: [ByteLength]  FieldName : HexFieldValue
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl
index 994018db96b5..910e406841c1 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl
@@ -1,7 +1,9 @@
 /*
  * Intel ACPI Component Architecture
  * iASL Compiler/Disassembler version 20151124-64
- * Copyright (c) 2000 - 2015 Intel Corporation
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
  *
  * Template for [IORT] ACPI Table (static data table)
  * Format: [ByteLength]  FieldName : HexFieldValue
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl
index c9e1cbd6830d..ce56157b3a92 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl
@@ -1,7 +1,9 @@
 /*
  * Intel ACPI Component Architecture
  * iASL Compiler/Disassembler version 20151124-64
- * Copyright (c) 2000 - 2015 Intel Corporation
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
  *
  * Template for [IORT] ACPI Table (static data table)
  * Format: [ByteLength]  FieldName : HexFieldValue
-- 
2.20.1

Re: [PATCH edk2-platforms 3/3] Silicon/Hisilicon: add SPDX license tags to IORT .asl files

[Michael D Kinney]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

> -----Original Message-----
> From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> Sent: Tuesday, July 9, 2019 9:08 AM
> To: devel@edk2.groups.io
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: [PATCH edk2-platforms 3/3] Silicon/Hisilicon:
> add SPDX license tags to IORT .asl files
> 
> These files were generated using iasl as a disassembler,
> which adds a
> (questionable) copyright Intel statement (which I don't
> actually care about), but leaves out any sort of license
> message.
> 
> As per https://edk2.groups.io/g/devel/message/41048,
> these were always intended to be contributed as 2-clause
> BSD + CLA, and would have been converted to BSD+Patent at
> the big switchover had that been the case.
> 
> Add SPDX header for BSD+Patent, and adjust the
> questionable copyright year to when the files were
> actually created/modified.
> 
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
> | 4 +++-
>  Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
> | 4 +++-
>  Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl
> | 4 +++-
> 
> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmm
> u.asl | 4 +++-
>  4 files changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git
> a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
> b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
> index bb70dcd0c443..4101d86672cd 100644
> ---
> a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
> +++
> b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
> @@ -1,7 +1,9 @@
>  /*
>   * Intel ACPI Component Architecture
>   * iASL Compiler/Disassembler version 20151124-64
> - * Copyright (c) 2000 - 2015 Intel Corporation
> + * Copyright (c) 2015 Intel Corporation
> + *
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
>   *
>   * Template for [IORT] ACPI Table (static data table)
>   * Format: [ByteLength]  FieldName : HexFieldValue diff
> --git
> a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
> b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
> index b64fcb4c7891..472e461f9f07 100644
> --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
> +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
> @@ -1,7 +1,9 @@
>  /*
>   * Intel ACPI Component Architecture
>   * iASL Compiler/Disassembler version 20151124-64
> - * Copyright (c) 2000 - 2015 Intel Corporation
> + * Copyright (c) 2015 - 2016 Intel Corporation
> + *
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
>   *
>   * Template for [IORT] ACPI Table (static data table)
>   * Format: [ByteLength]  FieldName : HexFieldValue diff
> --git
> a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.as
> l
> b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.as
> l
> index 994018db96b5..910e406841c1 100644
> ---
> a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.as
> l
> +++
> b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.as
> l
> @@ -1,7 +1,9 @@
>  /*
>   * Intel ACPI Component Architecture
>   * iASL Compiler/Disassembler version 20151124-64
> - * Copyright (c) 2000 - 2015 Intel Corporation
> + * Copyright (c) 2018 Intel Corporation
> + *
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
>   *
>   * Template for [IORT] ACPI Table (static data table)
>   * Format: [ByteLength]  FieldName : HexFieldValue diff
> --git
> a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoS
> mmu.asl
> b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoS
> mmu.asl
> index c9e1cbd6830d..ce56157b3a92 100644
> ---
> a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoS
> mmu.asl
> +++
> b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoS
> mmu.asl
> @@ -1,7 +1,9 @@
>  /*
>   * Intel ACPI Component Architecture
>   * iASL Compiler/Disassembler version 20151124-64
> - * Copyright (c) 2000 - 2015 Intel Corporation
> + * Copyright (c) 2018 Intel Corporation
> + *
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
>   *
>   * Template for [IORT] ACPI Table (static data table)
>   * Format: [ByteLength]  FieldName : HexFieldValue
> --
> 2.20.1