Skip to content

Commit 0e8d264

Browse files
mdkinneymdkinney
committed
IntelFsp2Pkg: 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: 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 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney <[email protected]>
1 parent f4835e9 commit 0e8d264

Some content is hidden

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

67 files changed

+67
-458
lines changed

‎IntelFsp2Pkg/FspNotifyPhase/FspNotifyPhasePeim.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Source file for FSP notify phase PEI module
33
44
Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
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
#include "FspNotifyPhasePeim.h"

‎IntelFsp2Pkg/FspNotifyPhase/FspNotifyPhasePeim.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Header file for FSP notify phase PEI module
33
44
Copyright (c) 2016 Intel Corporation. All rights reserved.
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
#ifndef _FSP_NOTIFY_PHASE_PEIM_H_

‎IntelFsp2Pkg/FspNotifyPhase/FspNotifyPhasePeim.inf

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
# Component information file for the FSP notify phase PEI module.
33
#
44
# Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
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
[Defines]

‎IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf

+1-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
#
44
# Copyright (c) 2016 - 2019, 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

‎IntelFsp2Pkg/FspSecCore/FspSecCoreS.inf

+1-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
#
44
# Copyright (c) 2016 - 2018, 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

‎IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf

+1-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
#
44
# Copyright (c) 2016, 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

‎IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryCommon.nasm

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
; Provide FSP API entry points.
33
;
44
; Copyright (c) 2016, 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
SECTION .text

‎IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
; Provide FSP API entry points.
33
;
44
; Copyright (c) 2016 - 2019, 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
SECTION .text

‎IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
; Provide FSP API entry points.
33
;
44
; Copyright (c) 2016, 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
SECTION .text

‎IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
; Provide FSP API entry points.
33
;
44
; Copyright (c) 2016, 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
SECTION .text

‎IntelFsp2Pkg/FspSecCore/Ia32/FspHelper.nasm

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
; Provide FSP helper function.
33
;
44
; Copyright (c) 2015 - 2016, 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
SECTION .text

‎IntelFsp2Pkg/FspSecCore/Ia32/InitializeFpu.nasm

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
;------------------------------------------------------------------------------
22
;
33
; Copyright (c) 2015, 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
; Abstract:
137
;

‎IntelFsp2Pkg/FspSecCore/Ia32/MicrocodeLoadNasm.inc

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
;
33
;@copyright
44
; Copyright (c) 2015 - 2016, 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
MSR_IA32_PLATFORM_ID equ 000000017h

‎IntelFsp2Pkg/FspSecCore/Ia32/ReadEsp.nasm

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
; Provide read ESP function
33
;
44
; Copyright (c) 2019, 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

‎IntelFsp2Pkg/FspSecCore/Ia32/SaveRestoreSseNasm.inc

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
;------------------------------------------------------------------------------
22
;
33
; Copyright (c) 2015, 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
; Abstract:
137
;

‎IntelFsp2Pkg/FspSecCore/Ia32/Stack.nasm

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
;------------------------------------------------------------------------------
22
;
33
; Copyright (c) 2015, 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
; Abstract:
137
;

‎IntelFsp2Pkg/FspSecCore/SecFsp.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
/** @file
22
33
Copyright (c) 2014 - 2018, 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
**/
137

‎IntelFsp2Pkg/FspSecCore/SecFsp.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
/** @file
22
33
Copyright (c) 2014 - 2016, 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
**/
137

‎IntelFsp2Pkg/FspSecCore/SecFspApiChk.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
/** @file
22
33
Copyright (c) 2016 - 2018, 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
**/
137

‎IntelFsp2Pkg/FspSecCore/SecMain.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
/** @file
22
33
Copyright (c) 2014 - 2019, 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
**/
137

‎IntelFsp2Pkg/FspSecCore/SecMain.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
/** @file
22
33
Copyright (c) 2014 - 2018, 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
**/
137

‎IntelFsp2Pkg/FspSecCore/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

‎IntelFsp2Pkg/FspSecCore/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

‎IntelFsp2Pkg/FspSecCore/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

‎IntelFsp2Pkg/FspSecCore/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

‎IntelFsp2Pkg/Include/FspEas.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
Architecture Specification v2.0.
44
55
Copyright (c) 2014 - 2016, 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

0 commit comments

Comments
 (0)