diff options
author | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-03 16:05:13 -0700 |
---|---|---|
committer | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-09 10:58:08 -0700 |
commit | 9d510e61fceee7b92955ef9a3c20343752d8ce3f (patch) | |
tree | 8ae51fce5581e741b800cf7c7d0f178511078267 /MdeModulePkg/Bus/Sd/SdDxe | |
parent | 8f7a05e1396657c8bd2948825f41d0fdf239e334 (diff) | |
download | edk2-9d510e61fceee7b92955ef9a3c20343752d8ce3f.tar.gz edk2-9d510e61fceee7b92955ef9a3c20343752d8ce3f.tar.bz2 edk2-9d510e61fceee7b92955ef9a3c20343752d8ce3f.zip |
MdeModulePkg: 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 <michael.d.kinney@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Diffstat (limited to 'MdeModulePkg/Bus/Sd/SdDxe')
-rw-r--r-- | MdeModulePkg/Bus/Sd/SdDxe/ComponentName.c | 8 | ||||
-rw-r--r-- | MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c | 8 | ||||
-rw-r--r-- | MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.h | 8 | ||||
-rw-r--r-- | MdeModulePkg/Bus/Sd/SdDxe/SdDiskInfo.c | 8 | ||||
-rw-r--r-- | MdeModulePkg/Bus/Sd/SdDxe/SdDiskInfo.h | 8 | ||||
-rw-r--r-- | MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c | 8 | ||||
-rw-r--r-- | MdeModulePkg/Bus/Sd/SdDxe/SdDxe.h | 8 | ||||
-rw-r--r-- | MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf | 7 | ||||
-rw-r--r-- | MdeModulePkg/Bus/Sd/SdDxe/SdDxe.uni | 7 | ||||
-rw-r--r-- | MdeModulePkg/Bus/Sd/SdDxe/SdDxeExtra.uni | 7 |
10 files changed, 10 insertions, 67 deletions
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/ComponentName.c b/MdeModulePkg/Bus/Sd/SdDxe/ComponentName.c index 246378381f..acd29d72cf 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/ComponentName.c +++ b/MdeModulePkg/Bus/Sd/SdDxe/ComponentName.c @@ -2,13 +2,7 @@ UEFI Component Name(2) protocol implementation for SdDxe driver.
Copyright (c) 2015, Intel Corporation. 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/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c index a4695ffe4d..876efe31e5 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c @@ -2,13 +2,7 @@ The helper functions for BlockIo and BlockIo2 protocol.
Copyright (c) 2015 - 2018, Intel Corporation. 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/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.h b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.h index 227b45bebf..769b471064 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.h +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.h @@ -5,13 +5,7 @@ internal function header files.
Copyright (c) 2015 - 2016, Intel Corporation. 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/MdeModulePkg/Bus/Sd/SdDxe/SdDiskInfo.c b/MdeModulePkg/Bus/Sd/SdDxe/SdDiskInfo.c index a98dc75d3f..6563f7232a 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/SdDiskInfo.c +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdDiskInfo.c @@ -2,13 +2,7 @@ Implement the EFI_DISK_INFO_PROTOCOL interface on SD memory card devices.
Copyright (c) 2017, Intel Corporation. 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/MdeModulePkg/Bus/Sd/SdDxe/SdDiskInfo.h b/MdeModulePkg/Bus/Sd/SdDxe/SdDiskInfo.h index cc7a359177..64e2f77c94 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/SdDiskInfo.h +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdDiskInfo.h @@ -2,13 +2,7 @@ Header file for EFI_DISK_INFO_PROTOCOL interface on SD memory card devices.
Copyright (c) 2017, Intel Corporation. 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/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c index b3b1af906c..e341b4cc1c 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c @@ -5,13 +5,7 @@ access the SD memory card device.
Copyright (c) 2015 - 2018, Intel Corporation. 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/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.h b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.h index 63df7b74e4..d23f5a07a5 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.h +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.h @@ -5,13 +5,7 @@ internal function header files.
Copyright (c) 2015 - 2017, Intel Corporation. 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/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf index c094898005..69b856b665 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf @@ -6,12 +6,7 @@ #
# Copyright (c) 2015 - 2018, Intel Corporation. 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/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.uni b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.uni index dc77ab86f0..eb8ebd5a35 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.uni +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.uni @@ -4,12 +4,7 @@ //
// Copyright (c) 2015, Intel Corporation. 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/MdeModulePkg/Bus/Sd/SdDxe/SdDxeExtra.uni b/MdeModulePkg/Bus/Sd/SdDxe/SdDxeExtra.uni index dc77ab86f0..eb8ebd5a35 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxeExtra.uni +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdDxeExtra.uni @@ -4,12 +4,7 @@ //
// Copyright (c) 2015, Intel Corporation. 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
//
// **/
|