Browse Source

OptionRomPkg: 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>
Michael D Kinney 5 years ago
parent
commit
96ae5934cf
48 changed files with 53 additions and 337 deletions
  1. 1 7
      OptionRomPkg/Application/BltLibSample/BltLibSample.c
  2. 1 6
      OptionRomPkg/Application/BltLibSample/BltLibSample.inf
  3. 1 7
      OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c
  4. 1 7
      OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.h
  5. 1 6
      OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf
  6. 1 7
      OptionRomPkg/AtapiPassThruDxe/ComponentName.c
  7. 1 7
      OptionRomPkg/AtapiPassThruDxe/DriverSupportedEfiVersion.c
  8. 1 7
      OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/ComponentName.c
  9. 1 7
      OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDriver.c
  10. 1 7
      OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDriver.h
  11. 1 7
      OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDxe.inf
  12. 1 7
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.c
  13. 1 7
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.h
  14. 1 7
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf
  15. 1 7
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/ComponentName.c
  16. 1 7
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/DriverBinding.c
  17. 1 7
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/SimpleNetwork.c
  18. 2 8
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c
  19. 2 8
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h
  20. 1 7
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
  21. 2 8
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/ComponentName.c
  22. 2 8
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/DriverBinding.c
  23. 2 8
      OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c
  24. 1 7
      OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c
  25. 1 7
      OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h
  26. 1 6
      OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
  27. 1 7
      OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430GraphicsOutput.c
  28. 1 7
      OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430I2c.c
  29. 1 7
      OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430I2c.h
  30. 1 7
      OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430UgaDraw.c
  31. 1 7
      OptionRomPkg/CirrusLogic5430Dxe/ComponentName.c
  32. 1 7
      OptionRomPkg/CirrusLogic5430Dxe/DriverSupportedEfiVersion.c
  33. 1 7
      OptionRomPkg/CirrusLogic5430Dxe/Edid.c
  34. 1 7
      OptionRomPkg/Include/Library/BltLib.h
  35. 1 7
      OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
  36. 1 7
      OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
  37. 1 7
      OptionRomPkg/Library/GopBltLib/GopBltLib.c
  38. 1 7
      OptionRomPkg/Library/GopBltLib/GopBltLib.inf
  39. 1 7
      OptionRomPkg/OptionRomPkg.dec
  40. 1 7
      OptionRomPkg/OptionRomPkg.dsc
  41. 1 7
      OptionRomPkg/UndiRuntimeDxe/ComponentName.c
  42. 1 7
      OptionRomPkg/UndiRuntimeDxe/Decode.c
  43. 1 7
      OptionRomPkg/UndiRuntimeDxe/E100b.c
  44. 1 7
      OptionRomPkg/UndiRuntimeDxe/E100b.h
  45. 1 7
      OptionRomPkg/UndiRuntimeDxe/Init.c
  46. 1 7
      OptionRomPkg/UndiRuntimeDxe/Undi32.h
  47. 1 7
      OptionRomPkg/UndiRuntimeDxe/UndiAipImpl.c
  48. 1 6
      OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf

+ 1 - 7
OptionRomPkg/Application/BltLibSample/BltLibSample.c

@@ -2,13 +2,7 @@
   Example program using BltLib
   Example program using BltLib
 
 
   Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2006 - 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
 
 
 **/
 **/
 
 

+ 1 - 6
OptionRomPkg/Application/BltLibSample/BltLibSample.inf

@@ -3,12 +3,7 @@
 #
 #
 #  Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>
 #  Copyright (c) 2008 - 2011, 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
 #
 #
 #
 #
 ##
 ##

+ 1 - 7
OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c

@@ -1,12 +1,6 @@
 /** @file
 /** @file
   Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2006, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.h

@@ -1,12 +1,6 @@
 /** @file
 /** @file
   Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2006 - 2011, 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:  AtapiPassThru.h
   Module Name:  AtapiPassThru.h
 
 

+ 1 - 6
OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf

@@ -5,12 +5,7 @@
 #  protocol.
 #  protocol.
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2007 - 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
 #
 #
 #
 #
 ##
 ##

+ 1 - 7
OptionRomPkg/AtapiPassThruDxe/ComponentName.c

@@ -1,12 +1,6 @@
 /** @file
 /** @file
   Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2006 - 2011, 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:  ComponentName.c
   Module Name:  ComponentName.c
 
 

+ 1 - 7
OptionRomPkg/AtapiPassThruDxe/DriverSupportedEfiVersion.c

@@ -1,12 +1,6 @@
 /** @file
 /** @file
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
   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:  DriverSupportEfiVersion.c
   Module Name:  DriverSupportEfiVersion.c
 
 

+ 1 - 7
OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/ComponentName.c

@@ -2,13 +2,7 @@
   UEFI Component Name(2) protocol implementation for USB Serial driver.
   UEFI Component Name(2) protocol implementation for USB Serial driver.
 
 
 Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
 Copyright (c) 2004 - 2013, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDriver.c

@@ -3,13 +3,7 @@
 
 
 Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
 Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
 Portions Copyright 2012 Ashley DeSimone
 Portions Copyright 2012 Ashley DeSimone
-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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDriver.h

@@ -3,13 +3,7 @@
 
 
 Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
 Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
 Portions Copyright 2012 Ashley DeSimone
 Portions Copyright 2012 Ashley DeSimone
-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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDxe.inf

@@ -10,13 +10,7 @@
 #
 #
 # Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2006 - 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
 #
 #
 ##
 ##
 
 

+ 1 - 7
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.c

@@ -6,13 +6,7 @@
   only supports the integrated PHY since no other test cases were available.
   only supports the integrated PHY since no other test cases were available.
 
 
   Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2011, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.h

@@ -2,13 +2,7 @@
   Definitions for ASIX AX88772 Ethernet adapter.
   Definitions for ASIX AX88772 Ethernet adapter.
 
 
   Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2011 - 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf

@@ -4,13 +4,7 @@
 # This module provides support for the ASIX AX88772 USB/Ethernet adapter.
 # This module provides support for the ASIX AX88772 USB/Ethernet adapter.
 # Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2011 - 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
 #
 #
 ##
 ##
 
 

+ 1 - 7
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/ComponentName.c

@@ -2,13 +2,7 @@
   UEFI Component Name(2) protocol implementation.
   UEFI Component Name(2) protocol implementation.
 
 
   Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2011, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/DriverBinding.c

@@ -2,13 +2,7 @@
   Implement the driver binding protocol for Asix AX88772 Ethernet driver.
   Implement the driver binding protocol for Asix AX88772 Ethernet driver.
 
 
   Copyright (c) 2011-2013, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2011-2013, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/SimpleNetwork.c

@@ -2,13 +2,7 @@
   Provides the Simple Network functions.
   Provides the Simple Network functions.
 
 
   Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2011 - 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
 
 
 **/
 **/
 
 

+ 2 - 8
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c

@@ -5,14 +5,8 @@
   USB to Ethernet MAC with integrated 10/100 PHY.  Note that this implementation
   USB to Ethernet MAC with integrated 10/100 PHY.  Note that this implementation
   only supports the integrated PHY since no other test cases were available.
   only supports the integrated PHY since no other test cases were available.
 
 
-  Copyright (c) 2011, Intel Corporation
-  All rights reserved. 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.
+  Copyright (c) 2011, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
 
 

+ 2 - 8
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h

@@ -1,14 +1,8 @@
 /** @file
 /** @file
   Definitions for ASIX AX88772 Ethernet adapter.
   Definitions for ASIX AX88772 Ethernet adapter.
 
 
-  Copyright (c) 2011 - 2015, Intel Corporation
-  All rights reserved. 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.
+  Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf

@@ -4,13 +4,7 @@
 # This module provides support for the ASIX AX88772 USB/Ethernet adapter.
 # This module provides support for the ASIX AX88772 USB/Ethernet adapter.
 # Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2011 - 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
 #
 #
 ##
 ##
 
 

+ 2 - 8
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/ComponentName.c

@@ -1,14 +1,8 @@
 /** @file
 /** @file
   UEFI Component Name(2) protocol implementation.
   UEFI Component Name(2) protocol implementation.
 
 
-  Copyright (c) 2011, Intel Corporation
-  All rights reserved. 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.
+  Copyright (c) 2011, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
 
 

+ 2 - 8
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/DriverBinding.c

@@ -1,14 +1,8 @@
 /** @file
 /** @file
   Implement the driver binding protocol for Asix AX88772 Ethernet driver.
   Implement the driver binding protocol for Asix AX88772 Ethernet driver.
                      
                      
-  Copyright (c) 2011-2013, Intel Corporation
-  All rights reserved. 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.
+  Copyright (c) 2011-2013, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
 
 

+ 2 - 8
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c

@@ -1,14 +1,8 @@
 /** @file
 /** @file
   Provides the Simple Network functions.
   Provides the Simple Network functions.
 
 
-  Copyright (c) 2011 - 2016, Intel Corporation
-  All rights reserved. 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.
+  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c

@@ -12,13 +12,7 @@
   to function both in the EFI pre-boot environment and from the OS runtime.
   to function both in the EFI pre-boot environment and from the OS runtime.
 
 
   Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2006 - 2010, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h

@@ -2,13 +2,7 @@
   Cirrus Logic 5430 Controller Driver
   Cirrus Logic 5430 Controller Driver
 
 
   Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2006 - 2011, 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
 
 
 **/
 **/
 
 

+ 1 - 6
OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf

@@ -11,12 +11,7 @@
 #  to function both in the EFI pre-boot environment and from the OS runtime.
 #  to function both in the EFI pre-boot environment and from the OS runtime.
 # Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2006 - 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
 #
 #
 #
 #
 ##
 ##

+ 1 - 7
OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430GraphicsOutput.c

@@ -1,12 +1,6 @@
 /** @file
 /** @file
 Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
 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:
 Module Name:
 
 

+ 1 - 7
OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430I2c.c

@@ -2,13 +2,7 @@
   I2C Bus implementation upon CirrusLogic.
   I2C Bus implementation upon CirrusLogic.
 
 
   Copyright (c) 2008 - 2009, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2008 - 2009, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430I2c.h

@@ -2,13 +2,7 @@
   I2c Bus byte read/write functions.
   I2c Bus byte read/write functions.
 
 
   Copyright (c) 2008 - 2009, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2008 - 2009, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430UgaDraw.c

@@ -4,13 +4,7 @@
   This file just does graphics.
   This file just does graphics.
 
 
   Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2006 - 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/CirrusLogic5430Dxe/ComponentName.c

@@ -1,12 +1,6 @@
 /** @file
 /** @file
   Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2006 - 2011, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/CirrusLogic5430Dxe/DriverSupportedEfiVersion.c

@@ -1,12 +1,6 @@
 /** @file
 /** @file
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
   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:  DriverSupportEfiVersion.c
   Module Name:  DriverSupportEfiVersion.c
 
 

+ 1 - 7
OptionRomPkg/CirrusLogic5430Dxe/Edid.c

@@ -2,13 +2,7 @@
   Read EDID information and parse EDID information.
   Read EDID information and parse EDID information.
 
 
   Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2008 - 2014, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Include/Library/BltLib.h

@@ -2,13 +2,7 @@
   Library for performing video blt operations
   Library for performing video blt operations
 
 
   Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2009 - 2011, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c

@@ -2,13 +2,7 @@
   FrameBufferBltLib - Library to perform blt operations on a frame buffer.
   FrameBufferBltLib - Library to perform blt operations on a frame buffer.
 
 
   Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2007 - 2011, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf

@@ -3,13 +3,7 @@
 #
 #
 #  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 #  Copyright (c) 2006 - 2011, 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
 #
 #
 ##
 ##
 
 

+ 1 - 7
OptionRomPkg/Library/GopBltLib/GopBltLib.c

@@ -2,13 +2,7 @@
   GopBltLib - Library to perform blt using the UEFI Graphics Output Protocol.
   GopBltLib - Library to perform blt using the UEFI Graphics Output Protocol.
 
 
   Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2007 - 2011, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/Library/GopBltLib/GopBltLib.inf

@@ -3,13 +3,7 @@
 #
 #
 #  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 #  Copyright (c) 2006 - 2011, 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
 #
 #
 ##
 ##
 
 

+ 1 - 7
OptionRomPkg/OptionRomPkg.dec

@@ -8,13 +8,7 @@
 #
 #
 # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2007 - 2010, 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
 #
 #
 ##
 ##
 
 

+ 1 - 7
OptionRomPkg/OptionRomPkg.dsc

@@ -9,13 +9,7 @@
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
 # Copyright (c) 2016, Linaro Ltd. 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
 #
 #
 ##
 ##
 
 

+ 1 - 7
OptionRomPkg/UndiRuntimeDxe/ComponentName.c

@@ -2,13 +2,7 @@
     UEFI Component Name(2) protocol implementation for EFI UNDI32 driver.
     UEFI Component Name(2) protocol implementation for EFI UNDI32 driver.
 
 
 Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
 Copyright (c) 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/UndiRuntimeDxe/Decode.c

@@ -2,13 +2,7 @@
   Provides the basic UNID functions.
   Provides the basic UNID functions.
 
 
 Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 Copyright (c) 2006 - 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/UndiRuntimeDxe/E100b.c

@@ -2,13 +2,7 @@
   Provides basic function upon network adapter card.
   Provides basic function upon network adapter card.
 
 
 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 Copyright (c) 2006 - 2014, 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/UndiRuntimeDxe/E100b.h

@@ -2,13 +2,7 @@
   Definitions for network adapter card.
   Definitions for network adapter card.
 
 
 Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
 Copyright (c) 2006 - 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/UndiRuntimeDxe/Init.c

@@ -2,13 +2,7 @@
   Initialization functions for EFI UNDI32 driver.
   Initialization functions for EFI UNDI32 driver.
 
 
 Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
 Copyright (c) 2006 - 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/UndiRuntimeDxe/Undi32.h

@@ -2,13 +2,7 @@
   EFI internal structures for the EFI UNDI driver.
   EFI internal structures for the EFI UNDI driver.
 
 
 Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 Copyright (c) 2006 - 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
 
 
 **/
 **/
 
 

+ 1 - 7
OptionRomPkg/UndiRuntimeDxe/UndiAipImpl.c

@@ -1,13 +1,7 @@
 /** @file
 /** @file
 
 
 Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
 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
 **/
 **/
 
 
 
 

+ 1 - 6
OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf

@@ -6,12 +6,7 @@
 #
 #
 # Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2006 - 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
 #
 #
 #
 #
 ##
 ##