Skip to content

Commit 6c2833f

Browse files
mdkinneymdkinney
committed
IntelFspWrapperPkg: Replace BSD License with BSD+Patent License
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: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html Branch for review: https://github.com/mdkinney/edk2/tree/Bug_1373_BsdPatentLicense Cc: Chasel Chiu <[email protected]> Cc: Nate DeSimone <[email protected]> Cc: Star Zeng <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney <[email protected]>
1 parent c679ff1 commit 6c2833f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+57
-393
lines changed

‎IntelFspWrapperPkg/FspInitPei/FindPeiCore.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Locate the entry point for the PEI Core
33
44
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/FspInitPei/FspInitPei.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
This PEIM initialize FSP.
33
44
Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/FspInitPei/FspInitPei.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
This is PEIM header file.
33
44
Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/FspInitPei/FspInitPei.inf

+1-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@
1111
#
1212
# Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
1313
#
14-
# This program and the accompanying materials
15-
# are licensed and made available under the terms and conditions of the BSD License
16-
# which accompanies this distribution. The full text of the license may be found at
17-
# http://opensource.org/licenses/bsd-license.php.
18-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
19-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
14+
# SPDX-License-Identifier: BSD-2-Clause-Patent
2015
#
2116
##
2217

‎IntelFspWrapperPkg/FspInitPei/FspInitPeiV1.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
them into pei core.
55
66
Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
7-
This program and the accompanying materials
8-
are licensed and made available under the terms and conditions of the BSD License
9-
which accompanies this distribution. The full text of the license may be found at
10-
http://opensource.org/licenses/bsd-license.php.
11-
12-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
7+
SPDX-License-Identifier: BSD-2-Clause-Patent
148
159
**/
1610

‎IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
notify to call FspSiliconInit API.
55
66
Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
7-
This program and the accompanying materials
8-
are licensed and made available under the terms and conditions of the BSD License
9-
which accompanies this distribution. The full text of the license may be found at
10-
http://opensource.org/licenses/bsd-license.php.
11-
12-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
7+
SPDX-License-Identifier: BSD-2-Clause-Patent
148
159
**/
1610

‎IntelFspWrapperPkg/FspInitPei/FspNotifyS3.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
In EndOfPei notify, it will call FspNotifyPhase API.
33
44
Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/FspInitPei/SecMain.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
C functions in SEC
33
44
Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/FspInitPei/SecMain.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Master header file for SecCore.
33
44
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
This driver will register two callbacks to call fsp's notifies.
33
44
Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf

+1-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@
55
#
66
# Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
77
#
8-
# This program and the accompanying materials
9-
# are licensed and made available under the terms and conditions of the BSD License
10-
# which accompanies this distribution. The full text of the license may be found at
11-
# http://opensource.org/licenses/bsd-license.php.
12-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
13-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
8+
# SPDX-License-Identifier: BSD-2-Clause-Patent
149
#
1510
##
1611

‎IntelFspWrapperPkg/FspNotifyDxe/LoadBelow4G.c

+1-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@
22
33
Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
44
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions
7-
of the BSD License which accompanies this distribution. The
8-
full text of the license may be found at
9-
http://opensource.org/licenses/bsd-license.php
10-
11-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
136
147
**/
158

‎IntelFspWrapperPkg/FspWrapperSecCore/FindPeiCore.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Locate the entry point for the PEI Core
33
44
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf

+1-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
#
44
# Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
55
#
6-
# This program and the accompanying materials
7-
# are licensed and made available under the terms and conditions of the BSD License
8-
# which accompanies this distribution. The full text of the license may be found at
9-
# http://opensource.org/licenses/bsd-license.php.
10-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
6+
# SPDX-License-Identifier: BSD-2-Clause-Patent
127
#
138
##
149

‎IntelFspWrapperPkg/FspWrapperSecCore/Ia32/Dummy.asm

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
;------------------------------------------------------------------------------
22
;
33
; Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
4-
; This program and the accompanying materials
5-
; are licensed and made available under the terms and conditions of the BSD License
6-
; which accompanies this distribution. The full text of the license may be found at
7-
; http://opensource.org/licenses/bsd-license.php.
8-
;
9-
; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
10-
; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
; SPDX-License-Identifier: BSD-2-Clause-Patent
115
;
126
; Module Name:
137
;

‎IntelFspWrapperPkg/FspWrapperSecCore/Ia32/ResetVec.asm16

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
;------------------------------------------------------------------------------
22
;
33
; Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
4-
; This program and the accompanying materials
5-
; are licensed and made available under the terms and conditions of the BSD License
6-
; which accompanies this distribution. The full text of the license may be found at
7-
; http://opensource.org/licenses/bsd-license.php.
8-
;
9-
; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
10-
; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
; SPDX-License-Identifier: BSD-2-Clause-Patent
115
;
126
; Module Name:
137
;

‎IntelFspWrapperPkg/FspWrapperSecCore/SecMain.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
C functions in SEC
33
44
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/FspWrapperSecCore/SecMain.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Master header file for SecCore.
33
44
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/FspWrapperSecCore/Vtf0/Build.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
#
44
# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
55
#
6-
# This program and the accompanying materials
7-
# are licensed and made available under the terms and conditions of the BSD License
8-
# which accompanies this distribution. The full text of the license may be found at
9-
# http://opensource.org/licenses/bsd-license.php
10-
#
11-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
6+
# SPDX-License-Identifier: BSD-2-Clause-Patent
137
#
148

159
import glob

‎IntelFspWrapperPkg/FspWrapperSecCore/Vtf0/Ia16/ResetVec.asm16

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
; This structure is located at 0xFFFFFFC0
44
;
55
; Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
6-
; This program and the accompanying materials
7-
; are licensed and made available under the terms and conditions of the BSD License
8-
; which accompanies this distribution. The full text of the license may be found at
9-
; http://opensource.org/licenses/bsd-license.php.
10-
;
11-
; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
12-
; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
6+
; SPDX-License-Identifier: BSD-2-Clause-Patent
137
;
148
;;
159

‎IntelFspWrapperPkg/FspWrapperSecCore/Vtf0/ResetVectorCode.asm

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
; This file includes all other code files to assemble the reset vector code
44
;
55
; Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
6-
; This program and the accompanying materials
7-
; are licensed and made available under the terms and conditions of the BSD License
8-
; which accompanies this distribution. The full text of the license may be found at
9-
; http://opensource.org/licenses/bsd-license.php
10-
;
11-
; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
12-
; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
6+
; SPDX-License-Identifier: BSD-2-Clause-Patent
137
;
148
;------------------------------------------------------------------------------
159

‎IntelFspWrapperPkg/FspWrapperSecCore/Vtf0/Tools/FixupForRawSection.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
#
44
# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
55
#
6-
# This program and the accompanying materials
7-
# are licensed and made available under the terms and conditions of the BSD License
8-
# which accompanies this distribution. The full text of the license may be found at
9-
# http://opensource.org/licenses/bsd-license.php
10-
#
11-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
6+
# SPDX-License-Identifier: BSD-2-Clause-Patent
137
#
148

159
import sys

‎IntelFspWrapperPkg/Include/Library/FspApiLib.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Provide FSP API related function.
33
44
Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/Include/Library/FspHobProcessLib.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Provide FSP hob process related function.
33
44
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/Include/Library/FspPlatformInfoLib.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Provide FSP platform information related function.
33
44
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎IntelFspWrapperPkg/Include/Library/FspPlatformSecLib.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Provide FSP wrapper platform sec related function.
33
44
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

0 commit comments

Comments
 (0)