[edk2-devel] [[edk2-platforms][PATCH V2] 20/30] Silicon/Atmel: Replace BSD License with BSD+Patent License

Michael D Kinney posted 1 patch 9 weeks ago
Failed in applying to current master (apply log)
Silicon/Atmel/AtSha204a/AtSha204a.dec     | 8 +-------
Silicon/Atmel/AtSha204a/AtSha204aDriver.c | 8 +-------
Silicon/Atmel/AtSha204a/AtSha204aDriver.h | 8 +-------
Silicon/Atmel/AtSha204a/AtSha204aDxe.inf  | 8 +-------
Silicon/Atmel/AtSha204a/ComponentName.c   | 8 +-------
Silicon/Atmel/AtSha204a/DriverBinding.c   | 8 +-------
6 files changed, 6 insertions(+), 42 deletions(-)

[edk2-devel] [[edk2-platforms][PATCH V2] 20/30] Silicon/Atmel: Replace BSD License with BSD+Patent License

Posted by Michael D Kinney 9 weeks ago
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

Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 Silicon/Atmel/AtSha204a/AtSha204a.dec     | 8 +-------
 Silicon/Atmel/AtSha204a/AtSha204aDriver.c | 8 +-------
 Silicon/Atmel/AtSha204a/AtSha204aDriver.h | 8 +-------
 Silicon/Atmel/AtSha204a/AtSha204aDxe.inf  | 8 +-------
 Silicon/Atmel/AtSha204a/ComponentName.c   | 8 +-------
 Silicon/Atmel/AtSha204a/DriverBinding.c   | 8 +-------
 6 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/Silicon/Atmel/AtSha204a/AtSha204a.dec b/Silicon/Atmel/AtSha204a/AtSha204a.dec
index f1fdea5984..d731d08d1a 100644
--- a/Silicon/Atmel/AtSha204a/AtSha204a.dec
+++ b/Silicon/Atmel/AtSha204a/AtSha204a.dec
@@ -2,13 +2,7 @@
 #
 #  Copyright (c) 2018, Linaro 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/Atmel/AtSha204a/AtSha204aDriver.c b/Silicon/Atmel/AtSha204a/AtSha204aDriver.c
index 5db2de21a7..4a9a2aa3b3 100644
--- a/Silicon/Atmel/AtSha204a/AtSha204aDriver.c
+++ b/Silicon/Atmel/AtSha204a/AtSha204aDriver.c
@@ -3,13 +3,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/Atmel/AtSha204a/AtSha204aDriver.h b/Silicon/Atmel/AtSha204a/AtSha204aDriver.h
index 315a450d34..615959baf4 100644
--- a/Silicon/Atmel/AtSha204a/AtSha204aDriver.h
+++ b/Silicon/Atmel/AtSha204a/AtSha204aDriver.h
@@ -3,13 +3,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/Atmel/AtSha204a/AtSha204aDxe.inf b/Silicon/Atmel/AtSha204a/AtSha204aDxe.inf
index fe90cc5381..03ae76e176 100644
--- a/Silicon/Atmel/AtSha204a/AtSha204aDxe.inf
+++ b/Silicon/Atmel/AtSha204a/AtSha204aDxe.inf
@@ -3,13 +3,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/Atmel/AtSha204a/ComponentName.c b/Silicon/Atmel/AtSha204a/ComponentName.c
index 9893e7c4c2..eec7b9120b 100644
--- a/Silicon/Atmel/AtSha204a/ComponentName.c
+++ b/Silicon/Atmel/AtSha204a/ComponentName.c
@@ -3,13 +3,7 @@
 
   Copyright (c) 2018, Linaro 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/Atmel/AtSha204a/DriverBinding.c b/Silicon/Atmel/AtSha204a/DriverBinding.c
index 17e61f96e8..38ffd80df9 100644
--- a/Silicon/Atmel/AtSha204a/DriverBinding.c
+++ b/Silicon/Atmel/AtSha204a/DriverBinding.c
@@ -3,13 +3,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
 
 **/
 
-- 
2.21.0.windows.1


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

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