Skip to content

Commit 18a4805

Browse files
committed
BeagleBoardPkg: 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: Leif Lindholm <[email protected]> Cc: Ard Biesheuvel <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney <[email protected]>
1 parent 908d82c commit 18a4805

39 files changed

+39
-270
lines changed

BeagleBoardPkg/BeagleBoardPkg.dec

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
#
44
# Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
55
#
6-
# This program and the accompanying materials are licensed and made available under
7-
# the terms and conditions of the BSD License which accompanies this distribution.
8-
# 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

BeagleBoardPkg/BeagleBoardPkg.dsc

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@
55
# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>
66
# Copyright (c) 2016, Linaro Ltd. 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-
#
13-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
14-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
8+
# SPDX-License-Identifier: BSD-2-Clause-Patent
159
#
1610
#**/
1711

BeagleBoardPkg/BeagleBoardPkg.fdf

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>
55
# Copyright (c) 2016, Linaro, Ltd. All rights reserved.<BR>
66
#
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
################################################################################

BeagleBoardPkg/Debugger_scripts/rvi_boot_from_ram.inc

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
//
22
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
33
//
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
error = continue
137
unload

BeagleBoardPkg/Debugger_scripts/rvi_convert_symbols.sh

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
#
33
# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
44
#
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

BeagleBoardPkg/Debugger_scripts/rvi_hw_setup.inc

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
//
22
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
33
//
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
error = continue

BeagleBoardPkg/Debugger_scripts/rvi_load_symbols.inc

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
//
22
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
33
//
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
include 'ZZZZZZ/rvi_symbols_macros.inc'

BeagleBoardPkg/Debugger_scripts/rvi_symbols_macros.inc

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
//
22
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
33
//
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
define /R int compare_guid(guid1, guid2)

BeagleBoardPkg/Debugger_scripts/rvi_unload_symbols.inc

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
//
22
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
33
//
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
error = continue

BeagleBoardPkg/Debugger_scripts/trace32_load_symbols.cmm

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
//
22
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
33
//
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
ENTRY &ram_start &ram_size

BeagleBoardPkg/Debugger_scripts/trace32_load_symbols_cygwin.cmm

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
//
22
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
33
//
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
ENTRY &ram_start &ram_size

BeagleBoardPkg/Include/BeagleBoard.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
*
44
* Copyright (c) 2011, ARM Limited. All rights reserved.
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

BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
*
33
* Copyright (c) 2011-2012, ARM Limited. All rights reserved.
44
*
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

BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
#
22
# Copyright (c) 2012-2013, ARM Limited. All rights reserved.
33
#
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

BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
//
22
// Copyright (c) 2012-2013, ARM Limited. All rights reserved.
33
//
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

BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
# Copyright (c) 2011-2013, ARM Limited. All rights reserved.
33
# Copyright (c) 2016, Linaro Ltd. All rights reserved.
44
#
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

BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardMem.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
*
33
* Copyright (c) 2011, ARM Limited. All rights reserved.
44
*
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

BeagleBoardPkg/Library/BeagleBoardLib/Clock.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
33
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
44
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

BeagleBoardPkg/Library/BeagleBoardLib/PadConfiguration.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
33
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
44
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

BeagleBoardPkg/Library/DxeHobPeCoffLib/DxeHobPeCoff.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
55
Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
66
Portions copyright (c) 2008 - 2010, Apple Inc. 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

BeagleBoardPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf

+1-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@
44
#
55
# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
66
# Portions copyright (c) 2008 - 2010, Apple Inc. 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-
# 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.
7+
# SPDX-License-Identifier: BSD-2-Clause-Patent
138
#
149
#
1510
#**/

BeagleBoardPkg/Library/LzmaHobCustomDecompressLib/LzmaHobCustomDecompressLib.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
and registers them into GUIDed handler table.
55
66
Copyright (c) 2009, 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

BeagleBoardPkg/Library/LzmaHobCustomDecompressLib/LzmaHobCustomDecompressLib.inf

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

BeagleBoardPkg/Library/MemoryInitPeiLib/MemoryInitPeiLib.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
*
33
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
44
*
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

BeagleBoardPkg/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf

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

BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
55
Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
66
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

0 commit comments

Comments
 (0)