diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-03 16:03:44 -0700 |
|---|---|---|
| committer | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-09 10:57:59 -0700 |
| commit | e3ba31da1cd1c4ab924f7f9787247cb6679bcffe (patch) | |
| tree | fb8a75ea81e0ed29f539715fcee1cb6e1dc5bcae /EmulatorPkg/Sec/Ia32 | |
| parent | 878b807a435eefbb1d76f9bdec30cb3526521a5e (diff) | |
| download | edk2-e3ba31da1cd1c4ab924f7f9787247cb6679bcffe.tar.gz | |
EmulatorPkg: 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: Ray Ni <ray.ni@intel.com>
Diffstat (limited to 'EmulatorPkg/Sec/Ia32')
| -rw-r--r-- | EmulatorPkg/Sec/Ia32/SwitchRam.S | 8 | ||||
| -rw-r--r-- | EmulatorPkg/Sec/Ia32/SwitchRam.asm | 8 | ||||
| -rw-r--r-- | EmulatorPkg/Sec/Ia32/TempRam.c | 8 |
3 files changed, 3 insertions, 21 deletions
diff --git a/EmulatorPkg/Sec/Ia32/SwitchRam.S b/EmulatorPkg/Sec/Ia32/SwitchRam.S index 39304daef1..f24529cc8e 100644 --- a/EmulatorPkg/Sec/Ia32/SwitchRam.S +++ b/EmulatorPkg/Sec/Ia32/SwitchRam.S @@ -1,13 +1,7 @@ #------------------------------------------------------------------------------
#
# Copyright (c) 2007, 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
#
# Module Name:
#
diff --git a/EmulatorPkg/Sec/Ia32/SwitchRam.asm b/EmulatorPkg/Sec/Ia32/SwitchRam.asm index 731ee0ffdb..9c7908f7a0 100644 --- a/EmulatorPkg/Sec/Ia32/SwitchRam.asm +++ b/EmulatorPkg/Sec/Ia32/SwitchRam.asm @@ -1,13 +1,7 @@ ;------------------------------------------------------------------------------
;
; Copyright (c) 2007 - 2012, 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
;
; Module Name:
;
diff --git a/EmulatorPkg/Sec/Ia32/TempRam.c b/EmulatorPkg/Sec/Ia32/TempRam.c index 591354970b..e8b0d53bb1 100644 --- a/EmulatorPkg/Sec/Ia32/TempRam.c +++ b/EmulatorPkg/Sec/Ia32/TempRam.c @@ -2,13 +2,7 @@ Temp RAM PPI
Copyright (c) 2011, Apple Inc. 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
**/
|