[edk2-devel] [[edk2-platforms][PATCH V2] 17/30] Platform/SoftIron: Replace BSD License with BSD+Patent License

Michael D Kinney posted 1 patch 1 week ago
Failed in applying to current master (apply log)
.../Overdrive1000Board/FdtBlob/styx-overdrive1000.dts    | 9 +--------
.../SoftIron/Overdrive1000Board/Overdrive1000Board.dsc   | 8 +-------
.../SoftIron/Overdrive1000Board/Overdrive1000Board.fdf   | 8 +-------
3 files changed, 3 insertions(+), 22 deletions(-)

[edk2-devel] [[edk2-platforms][PATCH V2] 17/30] Platform/SoftIron: Replace BSD License with BSD+Patent License

Posted by Michael D Kinney 1 week 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>
---
 .../Overdrive1000Board/FdtBlob/styx-overdrive1000.dts    | 9 +--------
 .../SoftIron/Overdrive1000Board/Overdrive1000Board.dsc   | 8 +-------
 .../SoftIron/Overdrive1000Board/Overdrive1000Board.fdf   | 8 +-------
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/Platform/SoftIron/Overdrive1000Board/FdtBlob/styx-overdrive1000.dts b/Platform/SoftIron/Overdrive1000Board/FdtBlob/styx-overdrive1000.dts
index d99b48d084..707025a22d 100644
--- a/Platform/SoftIron/Overdrive1000Board/FdtBlob/styx-overdrive1000.dts
+++ b/Platform/SoftIron/Overdrive1000Board/FdtBlob/styx-overdrive1000.dts
@@ -3,14 +3,7 @@
  *
  *  Copyright 2015 - 2016 ADVANCED MICRO DEVICES, INC.  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/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index cc4f2facd0..d74ad479af 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2014 - 2016, AMD Incorporated. 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/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
index fa814880e0..6581138a6c 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2014 - 2016, AMD Incorporated. 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
 #
 
 ################################################################################
-- 
2.21.0.windows.1


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

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