1. Patchew
  2. EDK2
  3. [edk2-devel] [PATCH edk2-platforms 0/3] Rectify licensing on various files
  4. View patch

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

Leif Lindholm posted 3 patches 6 years, 7 months ago
[edk2-devel] [PATCH edk2-platforms 3/3] Silicon/Hisilicon: add SPDX license tags to IORT .asl files
Posted by Leif Lindholm 6 years, 7 months ago 
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


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

View/Reply Online (#43446): https://edk2.groups.io/g/devel/message/43446
Mute This Topic: https://groups.io/mt/32406750/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH edk2-platforms 3/3] Silicon/Hisilicon: add SPDX license tags to IORT .asl files
Posted by Michael D Kinney 6 years, 6 months ago 
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


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

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

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.