AppPkg: 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: Jaben Carsey <jaben.carsey@intel.com>
author: Michael D Kinney <michael.d.kinney@intel.com> 2019-04-03 16:07:42 -0700
committer: Michael D Kinney <michael.d.kinney@intel.com> 2019-04-09 10:58:32 -0700
commit: bcb966958adc277a9f755ee61d9a61a23fb94740 (patch)
tree: 640b24132e345c33c46531248b09210ec760697a /AppPkg
parent: 9dc8036ddf6f8e9af166595d5eb5f5ea9b6d9dcc (diff)
download: edk2-bcb966958adc277a9f755ee61d9a61a23fb94740.tar.gz
edk2-bcb966958adc277a9f755ee61d9a61a23fb94740.tar.bz2
edk2-bcb966958adc277a9f755ee61d9a61a23fb94740.zip
88 files changed, 132 insertions, 662 deletions
diff --git a/AppPkg/AppPkg.dec b/AppPkg/AppPkg.dec
index 8aff19fc6b..69a07c4f97 100644
--- a/AppPkg/AppPkg.dec
+++ b/AppPkg/AppPkg.dec
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2010 - 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.
-#
-# 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/AppPkg/AppPkg.dsc b/AppPkg/AppPkg.dsc
index a4ea6630df..42af080a6a 100644
--- a/AppPkg/AppPkg.dsc
+++ b/AppPkg/AppPkg.dsc
@@ -8,13 +8,7 @@
 #   environment.
 #
 #   Copyright (c) 2010 - 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.
-#
-#   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
 ##
 
 [Defines]
diff --git a/AppPkg/Applications/ArithChk/ArithChk.inf b/AppPkg/Applications/ArithChk/ArithChk.inf
index 66183219a5..c357b1d152 100644
--- a/AppPkg/Applications/ArithChk/ArithChk.inf
+++ b/AppPkg/Applications/ArithChk/ArithChk.inf
@@ -3,13 +3,7 @@
 #   conversion library.
 #
 #  Copyright (c) 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.
-#
-#  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
 ##
 
 [Defines]
diff --git a/AppPkg/Applications/Hello/Hello.c b/AppPkg/Applications/Hello/Hello.c
index a16b27633d..2a67e3415a 100644
--- a/AppPkg/Applications/Hello/Hello.c
+++ b/AppPkg/Applications/Hello/Hello.c
@@ -3,13 +3,7 @@
     we can build applications without LibC.
 
     Copyright (c) 2010 - 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.
-
-    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
 **/
 #include  <Uefi.h>
 #include  <Library/UefiLib.h>
diff --git a/AppPkg/Applications/Hello/Hello.inf b/AppPkg/Applications/Hello/Hello.inf
index 20782f7b1a..eed6456f7c 100644
--- a/AppPkg/Applications/Hello/Hello.inf
+++ b/AppPkg/Applications/Hello/Hello.inf
@@ -2,13 +2,7 @@
 #  A simple, basic, EDK II native, "hello" application.
 #
 #   Copyright (c) 2010 - 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.
-#
-#   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/AppPkg/Applications/Main/Main.c b/AppPkg/Applications/Main/Main.c
index f588a30fbd..2347954297 100644
--- a/AppPkg/Applications/Main/Main.c
+++ b/AppPkg/Applications/Main/Main.c
@@ -3,13 +3,7 @@
     built using the "Standard C Libraries" from StdLib.
 
     Copyright (c) 2010 - 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.
-
-    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
 **/
 //#include  <Uefi.h>
 //#include  <Library/UefiLib.h>
diff --git a/AppPkg/Applications/Main/Main.inf b/AppPkg/Applications/Main/Main.inf
index b0952870dc..ee796ebf02 100644
--- a/AppPkg/Applications/Main/Main.inf
+++ b/AppPkg/Applications/Main/Main.inf
@@ -3,13 +3,7 @@
 #   built using the "Standard C Libraries" from StdLib.
 #
 #  Copyright (c) 2010 - 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.
-#
-#  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
 ##
 
 [Defines]
diff --git a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.c b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.c
index 6d371f90cb..712ee8f886 100644
--- a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.c
+++ b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.c
@@ -9,13 +9,7 @@
   Copyright (C) 2014, Red Hat, Inc.
   Copyright (c) 2010 - 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.
-
-  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
 **/
 
 #include <assert.h> // assert()
diff --git a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf
index 9f87f2f361..4b1ba5c669 100644
--- a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf
+++ b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf
@@ -5,14 +5,7 @@
 #  Copyright (C) 2014, Red Hat, Inc.
 #  Copyright (c) 2010 - 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.
-#
-#  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
 ##
 
 [Defines]
diff --git a/AppPkg/Applications/OrderedCollectionTest/gentest.sh b/AppPkg/Applications/OrderedCollectionTest/gentest.sh
index 535faa60b6..2c2558941d 100644
--- a/AppPkg/Applications/OrderedCollectionTest/gentest.sh
+++ b/AppPkg/Applications/OrderedCollectionTest/gentest.sh
@@ -7,14 +7,7 @@
 #
 #  Copyright (C) 2014, Red Hat, Inc.
 #
-#  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.
-#
-#  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
 ##
 
 set -e -u -C
diff --git a/AppPkg/Applications/Python/Efi/config.c b/AppPkg/Applications/Python/Efi/config.c
index 7cc021c964..5ca95e8877 100644
--- a/AppPkg/Applications/Python/Efi/config.c
+++ b/AppPkg/Applications/Python/Efi/config.c
@@ -2,13 +2,7 @@
     Python Module configuration.
 
     Copyright (c) 2011-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 that accompanies this distribution.
-    The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.
-
-    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
 **/
 
 /* This file contains the table of built-in modules.
diff --git a/AppPkg/Applications/Python/Efi/edk2module.c b/AppPkg/Applications/Python/Efi/edk2module.c
index 037849504f..0f1c7fe3d1 100644
--- a/AppPkg/Applications/Python/Efi/edk2module.c
+++ b/AppPkg/Applications/Python/Efi/edk2module.c
@@ -3,13 +3,7 @@
     Derived from posixmodule.c in Python 2.7.2.
 
     Copyright (c) 2011 - 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 that accompanies this distribution.
-    The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.
-
-    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
 **/
 #define PY_SSIZE_T_CLEAN
 
diff --git a/AppPkg/Applications/Python/Efi/getpath.c b/AppPkg/Applications/Python/Efi/getpath.c
index 9492864379..208bb7ec0a 100644
--- a/AppPkg/Applications/Python/Efi/getpath.c
+++ b/AppPkg/Applications/Python/Efi/getpath.c
@@ -22,13 +22,7 @@
       /Efi/StdLib/lib/python.VERSION/dynalib    Dynamically loadable Python extension modules.
 
     Copyright (c) 2011 - 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 that accompanies this distribution.
-    The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.
-
-    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
 **/
 #include <Python.h>
 #include <osdefs.h>
diff --git a/AppPkg/Applications/Python/Ia32/pyconfig.h b/AppPkg/Applications/Python/Ia32/pyconfig.h
index 46e29e2543..ef241a99f7 100644
--- a/AppPkg/Applications/Python/Ia32/pyconfig.h
+++ b/AppPkg/Applications/Python/Ia32/pyconfig.h
@@ -2,13 +2,7 @@
     Manually generated Python Configuration file for EDK II.
 
     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 that accompanies this distribution.
-    The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.
-
-    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
 **/
 #ifndef Py_PYCONFIG_H
 #define Py_PYCONFIG_H
diff --git a/AppPkg/Applications/Python/PythonCore.inf b/AppPkg/Applications/Python/PythonCore.inf
index 170549e2e8..273f5779b5 100644
--- a/AppPkg/Applications/Python/PythonCore.inf
+++ b/AppPkg/Applications/Python/PythonCore.inf
@@ -3,13 +3,7 @@
 #
 #  Copyright (c) 2015, Daryl McDaniel. 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.
-#
-#  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/AppPkg/Applications/Python/X64/pyconfig.h b/AppPkg/Applications/Python/X64/pyconfig.h
index c4a58496e2..81dbadadb5 100644
--- a/AppPkg/Applications/Python/X64/pyconfig.h
+++ b/AppPkg/Applications/Python/X64/pyconfig.h
@@ -3,13 +3,7 @@
 
     Copyright (c) 2015, Daryl McDaniel. 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 that accompanies this distribution.
-    The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.
-
-    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
 **/
 #ifndef Py_PYCONFIG_H
 #define Py_PYCONFIG_H
diff --git a/AppPkg/Applications/Sockets/DataSink/DataSink.c b/AppPkg/Applications/Sockets/DataSink/DataSink.c
index 14b2fd1ae2..af4bcba06d 100644
--- a/AppPkg/Applications/Sockets/DataSink/DataSink.c
+++ b/AppPkg/Applications/Sockets/DataSink/DataSink.c
@@ -1,14 +1,8 @@
 /** @file
   Data source for network testing.
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/DataSink/DataSink.inf b/AppPkg/Applications/Sockets/DataSink/DataSink.inf
index 6caa06eacb..23ae813b79 100644
--- a/AppPkg/Applications/Sockets/DataSink/DataSink.inf
+++ b/AppPkg/Applications/Sockets/DataSink/DataSink.inf
@@ -2,13 +2,7 @@
 #  DataSink Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/DataSource/DataSource.c b/AppPkg/Applications/Sockets/DataSource/DataSource.c
index 0dcd882edf..360689e156 100644
--- a/AppPkg/Applications/Sockets/DataSource/DataSource.c
+++ b/AppPkg/Applications/Sockets/DataSource/DataSource.c
@@ -1,14 +1,8 @@
 /** @file
   Data source for network testing.
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/DataSource/DataSource.inf b/AppPkg/Applications/Sockets/DataSource/DataSource.inf
index 3595fc6bf9..9feecd7a68 100644
--- a/AppPkg/Applications/Sockets/DataSource/DataSource.inf
+++ b/AppPkg/Applications/Sockets/DataSource/DataSource.inf
@@ -2,13 +2,7 @@
 #  DataSource Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.c b/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.c
index 27da918415..4a25f6be6d 100644
--- a/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.c
+++ b/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.c
@@ -1,14 +1,8 @@
 /** @file
   Test the getaddrinfo API
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf b/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf
index edec1b29a5..0352bbf95c 100644
--- a/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf
+++ b/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf
@@ -2,13 +2,7 @@
 #  GetAddrInfo Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.c b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.c
index c096f43ba1..888b31d833 100644
--- a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.c
+++ b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.c
@@ -2,13 +2,7 @@
   Translate the port number into a service name
 
   Copyright (c) 2011 - 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
 **/
 #include <errno.h>
 #include <netdb.h>
diff --git a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf
index 100ce07a16..810ddbf2b4 100644
--- a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf
+++ b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf
@@ -2,13 +2,7 @@
 #  GetHostByAddr Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.c b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.c
index e87b04f6d1..dbd7cbbbd2 100644
--- a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.c
+++ b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.c
@@ -2,13 +2,7 @@
   Translate the host name into an IP address
 
   Copyright (c) 2011 - 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 that 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
 **/
 #include <errno.h>
 #include <netdb.h>
diff --git a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf
index 8fd3135dae..3b4b819e8a 100644
--- a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf
+++ b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf
@@ -2,13 +2,7 @@
 #  GetHostByDns Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.c b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.c
index 4d4fe5460e..bdcd6f0096 100644
--- a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.c
+++ b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.c
@@ -2,13 +2,7 @@
   Translate the host name into an IP address
 
   Copyright (c) 2011 - 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 that 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
 **/
 #include <errno.h>
 #include <netdb.h>
diff --git a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf
index dda50991fb..37f209eaa2 100644
--- a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf
+++ b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf
@@ -2,13 +2,7 @@
 #  GetHostByName Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.c b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.c
index d6fafde2a4..4c32b56daf 100644
--- a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.c
+++ b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.c
@@ -1,14 +1,8 @@
 /** @file
   Test the getnameinfo API
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf
index a79d02ea24..712d3fface 100644
--- a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf
+++ b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf
@@ -2,13 +2,7 @@
 #  GetNameInfo Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.c b/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.c
index 156aa2b2c5..0d89a9afc4 100644
--- a/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.c
+++ b/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.c
@@ -1,14 +1,8 @@
 /** @file
   Translate the IPv4 address into a network name
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf b/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf
index 78f9591cae..2f2a24d3f0 100644
--- a/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf
+++ b/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf
@@ -2,13 +2,7 @@
 #  GetNetByAddr Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.c b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.c
index 7ce741c08c..6ecd117992 100644
--- a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.c
+++ b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.c
@@ -2,13 +2,7 @@
   Translate the network name into an IP address
 
   Copyright (c) 2011 - 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 that 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
 **/
 #include <errno.h>
 #include <netdb.h>
diff --git a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf
index 939ef7c840..b7a5eb6866 100644
--- a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf
+++ b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf
@@ -2,13 +2,7 @@
 #  GetNetByName Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/GetServByName/GetServByName.c b/AppPkg/Applications/Sockets/GetServByName/GetServByName.c
index dede76baf2..41deb194b1 100644
--- a/AppPkg/Applications/Sockets/GetServByName/GetServByName.c
+++ b/AppPkg/Applications/Sockets/GetServByName/GetServByName.c
@@ -2,13 +2,7 @@
   Translate the service name into a port number
 
   Copyright (c) 2011 - 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 that 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
 **/
 #include <errno.h>
 #include <netdb.h>
diff --git a/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf b/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf
index 680af0f29e..efc8c2ac0c 100644
--- a/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf
+++ b/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf
@@ -2,13 +2,7 @@
 #  GetServByName Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.c b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.c
index 69441e1bc0..0923ac00c2 100644
--- a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.c
+++ b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.c
@@ -2,13 +2,7 @@
   Translate the port number into a service name
 
   Copyright (c) 2011 - 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 that 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
 **/
 #include <errno.h>
 #include <netdb.h>
diff --git a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf
index 2adeb40c69..2bf92dc32d 100644
--- a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf
+++ b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf
@@ -2,13 +2,7 @@
 #  GetServByPort Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/OobRx/Main.c b/AppPkg/Applications/Sockets/OobRx/Main.c
index b4a37e0814..abbe03a893 100644
--- a/AppPkg/Applications/Sockets/OobRx/Main.c
+++ b/AppPkg/Applications/Sockets/OobRx/Main.c
@@ -1,14 +1,8 @@
 /** @file
   Out-of-band receive test application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/OobRx/OobRx.c b/AppPkg/Applications/Sockets/OobRx/OobRx.c
index 40d056d1fa..28e10d8fc6 100644
--- a/AppPkg/Applications/Sockets/OobRx/OobRx.c
+++ b/AppPkg/Applications/Sockets/OobRx/OobRx.c
@@ -1,14 +1,8 @@
 /** @file
   Windows version of the OOB Receive application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/OobRx/OobRx.h b/AppPkg/Applications/Sockets/OobRx/OobRx.h
index 0920029fd7..13b6539fac 100644
--- a/AppPkg/Applications/Sockets/OobRx/OobRx.h
+++ b/AppPkg/Applications/Sockets/OobRx/OobRx.h
@@ -1,14 +1,8 @@
 /** @file
   Definitions for the OOB Receive application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/OobRx/OobRx.inf b/AppPkg/Applications/Sockets/OobRx/OobRx.inf
index 044e823e38..ce1d91808f 100644
--- a/AppPkg/Applications/Sockets/OobRx/OobRx.inf
+++ b/AppPkg/Applications/Sockets/OobRx/OobRx.inf
@@ -2,13 +2,7 @@
 #  OobRx Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/OobRx/Windows/main.c b/AppPkg/Applications/Sockets/OobRx/Windows/main.c
index afae5dab51..9aa89b5f04 100644
--- a/AppPkg/Applications/Sockets/OobRx/Windows/main.c
+++ b/AppPkg/Applications/Sockets/OobRx/Windows/main.c
@@ -1,14 +1,8 @@
 /** @file
   Windows version of the OOB Receive application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/OobTx/Main.c b/AppPkg/Applications/Sockets/OobTx/Main.c
index 5b6ab02b97..0e3784edae 100644
--- a/AppPkg/Applications/Sockets/OobTx/Main.c
+++ b/AppPkg/Applications/Sockets/OobTx/Main.c
@@ -1,14 +1,8 @@
 /** @file
   Out-of-band transmit test application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/OobTx/OobTx.c b/AppPkg/Applications/Sockets/OobTx/OobTx.c
index 545e5f46a0..189aa5f073 100644
--- a/AppPkg/Applications/Sockets/OobTx/OobTx.c
+++ b/AppPkg/Applications/Sockets/OobTx/OobTx.c
@@ -1,14 +1,8 @@
 /** @file
   Windows version of the OOB Transmit application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/OobTx/OobTx.h b/AppPkg/Applications/Sockets/OobTx/OobTx.h
index e042a133fe..e5396684f7 100644
--- a/AppPkg/Applications/Sockets/OobTx/OobTx.h
+++ b/AppPkg/Applications/Sockets/OobTx/OobTx.h
@@ -1,14 +1,8 @@
 /** @file
   Definitions for the OOB Transmit application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/OobTx/OobTx.inf b/AppPkg/Applications/Sockets/OobTx/OobTx.inf
index d160dce756..0164d9a377 100644
--- a/AppPkg/Applications/Sockets/OobTx/OobTx.inf
+++ b/AppPkg/Applications/Sockets/OobTx/OobTx.inf
@@ -2,13 +2,7 @@
 #  OobTx Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/OobTx/Windows/main.c b/AppPkg/Applications/Sockets/OobTx/Windows/main.c
index dd0f3a21d7..9dcbb7004a 100644
--- a/AppPkg/Applications/Sockets/OobTx/Windows/main.c
+++ b/AppPkg/Applications/Sockets/OobTx/Windows/main.c
@@ -1,14 +1,8 @@
 /** @file
   Windows version of the OOB Transmit application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/RawIp4Rx/Main.c b/AppPkg/Applications/Sockets/RawIp4Rx/Main.c
index 0857b23698..e26422723e 100644
--- a/AppPkg/Applications/Sockets/RawIp4Rx/Main.c
+++ b/AppPkg/Applications/Sockets/RawIp4Rx/Main.c
@@ -1,14 +1,8 @@
 /** @file
   Raw IP4 receive test application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.c b/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.c
index bce4578f25..b52cd386d3 100644
--- a/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.c
+++ b/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.c
@@ -1,14 +1,8 @@
 /** @file
   Raw IP4 receive application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.h b/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.h
index ae8daac320..b773fd9014 100644
--- a/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.h
+++ b/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.h
@@ -1,14 +1,8 @@
 /** @file
   Definitions for the raw IP4 receive application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.inf b/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.inf
index 6bfd5f8132..17b20bd140 100644
--- a/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.inf
+++ b/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.inf
@@ -2,13 +2,7 @@
 #  RawIp4 Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/RawIp4Rx/Windows/main.c b/AppPkg/Applications/Sockets/RawIp4Rx/Windows/main.c
index 530c2d6e55..0e89f6f1ac 100644
--- a/AppPkg/Applications/Sockets/RawIp4Rx/Windows/main.c
+++ b/AppPkg/Applications/Sockets/RawIp4Rx/Windows/main.c
@@ -1,14 +1,8 @@
 /** @file
   Windows version of the raw IP4 receive application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/RawIp4Tx/Main.c b/AppPkg/Applications/Sockets/RawIp4Tx/Main.c
index 451193a05e..b4f519e2ab 100644
--- a/AppPkg/Applications/Sockets/RawIp4Tx/Main.c
+++ b/AppPkg/Applications/Sockets/RawIp4Tx/Main.c
@@ -1,14 +1,8 @@
 /** @file
   Raw IP4 transmit test application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.c b/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.c
index f6efbe136d..e84fd0064e 100644
--- a/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.c
+++ b/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.c
@@ -1,14 +1,8 @@
 /** @file
   Raw IP4 transmit application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.h b/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.h
index 2fe2839ca6..2d38b70b17 100644
--- a/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.h
+++ b/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.h
@@ -1,14 +1,8 @@
 /** @file
   Definitions for the raw IP4 transmit application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.inf b/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.inf
index a1bd9e5d71..ead140a4cf 100644
--- a/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.inf
+++ b/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.inf
@@ -2,13 +2,7 @@
 #  RawIp4Tx Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/RawIp4Tx/Windows/main.c b/AppPkg/Applications/Sockets/RawIp4Tx/Windows/main.c
index 441a951f6f..15da663030 100644
--- a/AppPkg/Applications/Sockets/RawIp4Tx/Windows/main.c
+++ b/AppPkg/Applications/Sockets/RawIp4Tx/Windows/main.c
@@ -1,14 +1,8 @@
 /** @file
   Windows version of the raw IP4 transmit application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.c b/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.c
index 84670050d2..f4f2e408b1 100644
--- a/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.c
+++ b/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.c
@@ -1,14 +1,8 @@
 /** @file
   Receive a datagram
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf b/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf
index 225f5096e5..d9dbb342d5 100644
--- a/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf
+++ b/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf
@@ -2,13 +2,7 @@
 #  Receive Datagram Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/SetHostName/SetHostName.c b/AppPkg/Applications/Sockets/SetHostName/SetHostName.c
index 2c8001e205..10db5b6c08 100644
--- a/AppPkg/Applications/Sockets/SetHostName/SetHostName.c
+++ b/AppPkg/Applications/Sockets/SetHostName/SetHostName.c
@@ -1,14 +1,8 @@
 /** @file
   Set the host name
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf b/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf
index f20eb46adb..ff21dd405c 100644
--- a/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf
+++ b/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf
@@ -2,13 +2,7 @@
 #  SetHostName Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.c b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.c
index bba8f4b855..aeeafb5af1 100644
--- a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.c
+++ b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.c
@@ -1,14 +1,8 @@
 /** @file
   Set the socket options
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf
index dd9fa31aaf..4f5a6eea1f 100644
--- a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf
+++ b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf
@@ -2,13 +2,7 @@
 #  SetHostName Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/TftpServer/TftpServer.c b/AppPkg/Applications/Sockets/TftpServer/TftpServer.c
index 30d9dae41d..c62c1d17b1 100644
--- a/AppPkg/Applications/Sockets/TftpServer/TftpServer.c
+++ b/AppPkg/Applications/Sockets/TftpServer/TftpServer.c
@@ -1,14 +1,8 @@
 /** @file
   This is a simple TFTP server application
 
-  Copyright (c) 2011, 2012, 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, 2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/TftpServer/TftpServer.h b/AppPkg/Applications/Sockets/TftpServer/TftpServer.h
index 2166893570..a34b8260c4 100644
--- a/AppPkg/Applications/Sockets/TftpServer/TftpServer.h
+++ b/AppPkg/Applications/Sockets/TftpServer/TftpServer.h
@@ -1,14 +1,8 @@
 /** @file
   Definitions for the TFTP server.
 
-  Copyright (c) 2011, 2012, 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, 2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf b/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf
index 839360f3ad..79d3236614 100644
--- a/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf
+++ b/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf
@@ -2,13 +2,7 @@
 #  TFTP Server Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/AppPkg/Applications/Sockets/WebServer/ACPI.c b/AppPkg/Applications/Sockets/WebServer/ACPI.c
index e086a2d585..b0721bbf3b 100644
--- a/AppPkg/Applications/Sockets/WebServer/ACPI.c
+++ b/AppPkg/Applications/Sockets/WebServer/ACPI.c
@@ -2,14 +2,8 @@
   @file
   Display the ACPI tables
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/BootServicesTable.c b/AppPkg/Applications/Sockets/WebServer/BootServicesTable.c
index 4fc1324701..b4018d7edf 100644
--- a/AppPkg/Applications/Sockets/WebServer/BootServicesTable.c
+++ b/AppPkg/Applications/Sockets/WebServer/BootServicesTable.c
@@ -2,14 +2,8 @@
   @file
   Display the boot services table
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/ConfigurationTable.c b/AppPkg/Applications/Sockets/WebServer/ConfigurationTable.c
index f6303dfed6..0131b9f557 100644
--- a/AppPkg/Applications/Sockets/WebServer/ConfigurationTable.c
+++ b/AppPkg/Applications/Sockets/WebServer/ConfigurationTable.c
@@ -2,14 +2,8 @@
   @file
   Display the configuration table
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/DhcpOptions.c b/AppPkg/Applications/Sockets/WebServer/DhcpOptions.c
index 8eeff45faf..80936d05e7 100644
--- a/AppPkg/Applications/Sockets/WebServer/DhcpOptions.c
+++ b/AppPkg/Applications/Sockets/WebServer/DhcpOptions.c
@@ -2,13 +2,7 @@
     Display the DHCP options
 
     Copyright (c) 2011 - 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.
-
-    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
 **/
 #include <WebServer.h>
 #include <Guid/DxeServices.h>
diff --git a/AppPkg/Applications/Sockets/WebServer/DxeServicesTable.c b/AppPkg/Applications/Sockets/WebServer/DxeServicesTable.c
index fe0f597682..bc9b737e85 100644
--- a/AppPkg/Applications/Sockets/WebServer/DxeServicesTable.c
+++ b/AppPkg/Applications/Sockets/WebServer/DxeServicesTable.c
@@ -2,13 +2,7 @@
     Display the DXE services table
 
     Copyright (c)  2011 - 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.
-
-    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
 --*/
 #include <WebServer.h>
 #include <Guid/DxeServices.h>
diff --git a/AppPkg/Applications/Sockets/WebServer/Exit.c b/AppPkg/Applications/Sockets/WebServer/Exit.c
index 5ff09d3150..1b7c82de9a 100644
--- a/AppPkg/Applications/Sockets/WebServer/Exit.c
+++ b/AppPkg/Applications/Sockets/WebServer/Exit.c
@@ -2,14 +2,8 @@
   @file
   Exit response page
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/Firmware.c b/AppPkg/Applications/Sockets/WebServer/Firmware.c
index a29da5e01f..bbc4f051e2 100644
--- a/AppPkg/Applications/Sockets/WebServer/Firmware.c
+++ b/AppPkg/Applications/Sockets/WebServer/Firmware.c
@@ -2,14 +2,8 @@
   @file
   Display the firmware
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/HTTP.c b/AppPkg/Applications/Sockets/WebServer/HTTP.c
index fae1dd9269..295c6e4f6a 100644
--- a/AppPkg/Applications/Sockets/WebServer/HTTP.c
+++ b/AppPkg/Applications/Sockets/WebServer/HTTP.c
@@ -2,14 +2,8 @@
   @file
   HTTP processing for the web server.
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/Handles.c b/AppPkg/Applications/Sockets/WebServer/Handles.c
index 19a55ddbc5..0b26a86a7b 100644
--- a/AppPkg/Applications/Sockets/WebServer/Handles.c
+++ b/AppPkg/Applications/Sockets/WebServer/Handles.c
@@ -2,14 +2,8 @@
   @file
   Display the handles in the system
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/Hello.c b/AppPkg/Applications/Sockets/WebServer/Hello.c
index 3d1f979535..c4e8323818 100644
--- a/AppPkg/Applications/Sockets/WebServer/Hello.c
+++ b/AppPkg/Applications/Sockets/WebServer/Hello.c
@@ -2,14 +2,8 @@
   @file
   Hello World response page
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/Index.c b/AppPkg/Applications/Sockets/WebServer/Index.c
index 64c1ffcb5c..6f2faf7091 100644
--- a/AppPkg/Applications/Sockets/WebServer/Index.c
+++ b/AppPkg/Applications/Sockets/WebServer/Index.c
@@ -2,14 +2,8 @@
   @file
   Generate the list of known pages.
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/MemoryMap.c b/AppPkg/Applications/Sockets/WebServer/MemoryMap.c
index 71a5b1d8c6..c8de27ec76 100644
--- a/AppPkg/Applications/Sockets/WebServer/MemoryMap.c
+++ b/AppPkg/Applications/Sockets/WebServer/MemoryMap.c
@@ -2,14 +2,8 @@
   @file
   Display the memory map
 
-  Copyright (c) 2012, 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) 2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/Mtrr.c b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
index 4b8482d4e2..e9d9c9dcee 100644
--- a/AppPkg/Applications/Sockets/WebServer/Mtrr.c
+++ b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
@@ -2,14 +2,8 @@
   @file
   Display the memory type range registers
 
-  Copyright (c) 2012, 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) 2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/PageList.c b/AppPkg/Applications/Sockets/WebServer/PageList.c
index 1e271e566c..d88ab7ba45 100644
--- a/AppPkg/Applications/Sockets/WebServer/PageList.c
+++ b/AppPkg/Applications/Sockets/WebServer/PageList.c
@@ -2,14 +2,8 @@
   @file
   List of pages to display
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/Ports.c b/AppPkg/Applications/Sockets/WebServer/Ports.c
index f9b6680af0..22983347f6 100644
--- a/AppPkg/Applications/Sockets/WebServer/Ports.c
+++ b/AppPkg/Applications/Sockets/WebServer/Ports.c
@@ -2,14 +2,8 @@
   @file
   Ports response page
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/Reboot.c b/AppPkg/Applications/Sockets/WebServer/Reboot.c
index 2fc8fecf63..8657484bb6 100644
--- a/AppPkg/Applications/Sockets/WebServer/Reboot.c
+++ b/AppPkg/Applications/Sockets/WebServer/Reboot.c
@@ -2,14 +2,8 @@
   @file
   Reboot the system
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/RuntimeServicesTable.c b/AppPkg/Applications/Sockets/WebServer/RuntimeServicesTable.c
index d5fed0c7c3..a298b42865 100644
--- a/AppPkg/Applications/Sockets/WebServer/RuntimeServicesTable.c
+++ b/AppPkg/Applications/Sockets/WebServer/RuntimeServicesTable.c
@@ -2,14 +2,8 @@
   @file
   Display the runtime services table
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/SystemTable.c b/AppPkg/Applications/Sockets/WebServer/SystemTable.c
index 83f60308b2..d5ec868b97 100644
--- a/AppPkg/Applications/Sockets/WebServer/SystemTable.c
+++ b/AppPkg/Applications/Sockets/WebServer/SystemTable.c
@@ -2,14 +2,8 @@
   @file
   Display the system table
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.c b/AppPkg/Applications/Sockets/WebServer/WebServer.c
index f8a2d3ad4c..c874c06608 100644
--- a/AppPkg/Applications/Sockets/WebServer/WebServer.c
+++ b/AppPkg/Applications/Sockets/WebServer/WebServer.c
@@ -2,14 +2,8 @@
   @file
   Web server application
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.h b/AppPkg/Applications/Sockets/WebServer/WebServer.h
index 16c30c8d6d..231ba4526a 100644
--- a/AppPkg/Applications/Sockets/WebServer/WebServer.h
+++ b/AppPkg/Applications/Sockets/WebServer/WebServer.h
@@ -1,14 +1,8 @@
 /** @file
   Definitions for the web server.
 
-  Copyright (c) 2011-2012, 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-2012, Intel Corporation. All rights reserved.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.inf b/AppPkg/Applications/Sockets/WebServer/WebServer.inf
index f176910c4c..313bcda4f3 100644
--- a/AppPkg/Applications/Sockets/WebServer/WebServer.inf
+++ b/AppPkg/Applications/Sockets/WebServer/WebServer.inf
@@ -2,13 +2,7 @@
 #  Web Server Application
 #
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
-#  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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
author	Michael D Kinney <michael.d.kinney@intel.com>	2019-04-03 16:07:42 -0700
committer	Michael D Kinney <michael.d.kinney@intel.com>	2019-04-09 10:58:32 -0700
commit	bcb966958adc277a9f755ee61d9a61a23fb94740 (patch)
tree	640b24132e345c33c46531248b09210ec760697a /AppPkg
parent	9dc8036ddf6f8e9af166595d5eb5f5ea9b6d9dcc (diff)
download	edk2-bcb966958adc277a9f755ee61d9a61a23fb94740.tar.gz edk2-bcb966958adc277a9f755ee61d9a61a23fb94740.tar.bz2 edk2-bcb966958adc277a9f755ee61d9a61a23fb94740.zip