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

Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../SystemFirmwareUpdateConfig.ini            |   8 +-------
 Platform/Hisilicon/D03/D03.dec                |   8 +-------
 Platform/Hisilicon/D03/D03.dsc                |   8 +-------
 Platform/Hisilicon/D03/D03.fdf                |   8 +-------
 .../OemNicConfig2PHi1610/OemNicConfig.h       |   8 +-------
 .../OemNicConfig2PHi1610/OemNicConfig2P.c     |   8 +-------
 .../OemNicConfig2PHi1610/OemNicConfig2P.inf   |   8 +-------
 .../SystemFirmwareDescriptor.aslc             |   8 +-------
 .../SystemFirmwareDescriptor.inf              |   8 +-------
 .../SystemFirmwareDescriptorPei.c             |   8 +-------
 .../D03/EarlyConfigPeim/EarlyConfigPeimD03.c  |   8 +-------
 .../EarlyConfigPeim/EarlyConfigPeimD03.inf    |   8 +-------
 .../Hisilicon/D03/Include/Library/CpldD03.h   |   8 +-------
 .../DS3231RealTimeClock.h                     |   8 +-------
 .../DS3231RealTimeClockLib.c                  |   8 +-------
 .../DS3231RealTimeClockLib.inf                |   7 +------
 .../D03/Library/FdtUpdateLib/FdtUpdateLib.c   |   8 +-------
 .../D03/Library/FdtUpdateLib/FdtUpdateLib.inf |   8 +-------
 .../OemMiscLib2P/BoardFeature2PHi1610.c       |   8 +-------
 .../BoardFeature2PHi1610Strings.uni           | Bin 4292 -> 3538 bytes
 .../Library/OemMiscLib2P/OemMiscLib2PHi1610.c |   8 +-------
 .../OemMiscLib2P/OemMiscLib2PHi1610.inf       |   8 +-------
 .../Library/PlatformPciLib/PlatformPciLib.c   |   8 +-------
 .../Library/PlatformPciLib/PlatformPciLib.inf |   7 +------
 .../SystemFirmwareUpdateConfig.ini            |   8 +-------
 Platform/Hisilicon/D05/D05.dsc                |   8 +-------
 Platform/Hisilicon/D05/D05.fdf                |   8 +-------
 .../SystemFirmwareDescriptor.aslc             |   8 +-------
 .../SystemFirmwareDescriptor.inf              |   8 +-------
 .../SystemFirmwareDescriptorPei.c             |   8 +-------
 .../D05/EarlyConfigPeim/EarlyConfigPeimD05.c  |   8 +-------
 .../EarlyConfigPeim/EarlyConfigPeimD05.inf    |   8 +-------
 .../Library/OemMiscLibD05/BoardFeatureD05.c   |   8 +-------
 .../OemMiscLibD05/BoardFeatureD05Strings.uni  |   8 +-------
 .../D05/Library/OemMiscLibD05/OemMiscLibD05.c |   8 +-------
 .../Library/OemMiscLibD05/OemMiscLibD05.inf   |   8 +-------
 .../Library/PlatformPciLib/PlatformPciLib.c   |   8 +-------
 .../Library/PlatformPciLib/PlatformPciLib.inf |   7 +------
 .../SystemFirmwareUpdateConfig.ini            |   8 +-------
 Platform/Hisilicon/D06/D06.dec                |   8 +-------
 Platform/Hisilicon/D06/D06.dsc                |   8 +-------
 Platform/Hisilicon/D06/D06.fdf                |   8 +-------
 .../OemNicConfig2PHi1620/OemNicConfig.h       |   8 +-------
 .../OemNicConfig2PHi1620/OemNicConfig2P.c     |   8 +-------
 .../OemNicConfig2PHi1620/OemNicConfig2P.inf   |   8 +-------
 .../SystemFirmwareDescriptor.aslc             |   8 +-------
 .../SystemFirmwareDescriptor.inf              |   8 +-------
 .../SystemFirmwareDescriptorPei.c             |   8 +-------
 .../D06/EarlyConfigPeim/EarlyConfigPeimD06.c  |   8 +-------
 .../EarlyConfigPeim/EarlyConfigPeimD06.inf    |   8 +-------
 .../Hisilicon/D06/Include/Library/CpldD06.h   |   8 +-------
 .../Library/OemMiscLibD06/BoardFeatureD06.c   |   8 +-------
 .../OemMiscLibD06/BoardFeatureD06Strings.uni  |   8 +-------
 .../D06/Library/OemMiscLibD06/OemMiscLibD06.c |   8 +-------
 .../Library/OemMiscLibD06/OemMiscLibD06.inf   |   8 +-------
 .../D06/Library/OemNicLib/OemNicLib.c         |   8 +-------
 .../D06/Library/OemNicLib/OemNicLib.inf       |   8 +-------
 .../PciHostBridgeLib/PciHostBridgeLib.c       |   8 +-------
 .../PciHostBridgeLib/PciHostBridgeLib.inf     |   7 +------
 Platform/Hisilicon/HiKey/HiKey.dec            |   8 +-------
 Platform/Hisilicon/HiKey/HiKey.dsc            |   8 +-------
 Platform/Hisilicon/HiKey/HiKey.fdf            |   8 +-------
 Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c  |   8 +-------
 Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h  |   8 +-------
 .../Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf     |   8 +-------
 .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c         |   8 +-------
 .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf       |   8 +-------
 .../Hisilicon/HiKey/Include/ArmPlatform.h     |   8 +-------
 .../Hisilicon/HiKey/Library/HiKeyLib/HiKey.c  |   8 +-------
 .../HiKey/Library/HiKeyLib/HiKeyHelper.S      |   8 +-------
 .../HiKey/Library/HiKeyLib/HiKeyLib.inf       |   8 +-------
 .../HiKey/Library/HiKeyLib/HiKeyMem.c         |   8 +-------
 Platform/Hisilicon/HiKey960/HiKey960.dec      |   8 +-------
 Platform/Hisilicon/HiKey960/HiKey960.dsc      |   8 +-------
 Platform/Hisilicon/HiKey960/HiKey960.fdf      |   8 +-------
 .../HiKey960/HiKey960Dxe/HiKey960Dxe.c        |   8 +-------
 .../HiKey960/HiKey960Dxe/HiKey960Dxe.h        |   8 +-------
 .../HiKey960/HiKey960Dxe/HiKey960Dxe.inf      |   8 +-------
 .../HiKey960GpioDxe/HiKey960GpioDxe.c         |   8 +-------
 .../HiKey960GpioDxe/HiKey960GpioDxe.inf       |   8 +-------
 .../HiKey960/Library/HiKey960Lib/HiKey960.c   |   8 +-------
 .../Library/HiKey960Lib/HiKey960Helper.S      |   8 +-------
 .../Library/HiKey960Lib/HiKey960Lib.inf       |   8 +-------
 .../Library/HiKey960Lib/HiKey960Mem.c         |   8 +-------
 .../PciHostBridgeLib/PciHostBridgeLib.c       |   8 +-------
 .../PciHostBridgeLib/PciHostBridgeLib.inf     |   8 +-------
 86 files changed, 85 insertions(+), 591 deletions(-)

diff --git a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
index fc834d9c7c..dd575965c6 100644
--- a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
@@ -3,13 +3,7 @@
 #  Copyright (c) 2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution.  The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Platform/Hisilicon/D03/D03.dec b/Platform/Hisilicon/D03/D03.dec
index 8b08a32773..206a632d5b 100644
--- a/Platform/Hisilicon/D03/D03.dec
+++ b/Platform/Hisilicon/D03/D03.dec
@@ -3,13 +3,7 @@
 #    Copyright (c) 2015, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
index 07ff461277..60b0d6393e 100644
--- a/Platform/Hisilicon/D03/D03.dsc
+++ b/Platform/Hisilicon/D03/D03.dsc
@@ -3,13 +3,7 @@
 #  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
 #  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
index 3f07b2e577..f5d0c66f63 100644
--- a/Platform/Hisilicon/D03/D03.fdf
+++ b/Platform/Hisilicon/D03/D03.fdf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
 #  Copyright (c) 2015, Linaro Limited. 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
 #
 
 [DEFINES]
diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
index 46c77d3061..94d904c35f 100644
--- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
+++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
@@ -3,13 +3,7 @@
 *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
index dcaf3aa827..814378b39b 100644
--- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
+++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
index ee5596a4ce..1071f5d651 100644
--- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
+++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
@@ -3,13 +3,7 @@
 #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
index 2589e20a43..52149b1ed0 100644
--- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
+++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
@@ -5,13 +5,7 @@
   Copyright (c) 2018, Linaro Limited. All rights reserved.
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
index fc1832fa5f..6756814574 100644
--- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
@@ -5,13 +5,7 @@
 #  Copyright (c) 2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution.  The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
index 27c0a718f8..77f631d5d6 100644
--- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
@@ -5,13 +5,7 @@
   Copyright (c) 2018, Linaro Limited. All rights reserved.
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
index dacd9e871f..75b6dec34b 100644
--- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
+++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
index 90e40ae2b3..1f992024ac 100644
--- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
+++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
@@ -3,13 +3,7 @@
 #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Include/Library/CpldD03.h b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
index 456bf4b5c9..fce3319c44 100644
--- a/Platform/Hisilicon/D03/Include/Library/CpldD03.h
+++ b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
@@ -3,13 +3,7 @@
 *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
index d1e6c41dd7..da18d0f558 100644
--- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
+++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
@@ -4,13 +4,7 @@
 *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2015, Linaro Limited. 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
 *
 *  Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
 **/
diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
index f6dbcf6b75..898335a7b7 100644
--- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
+++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
@@ -8,13 +8,7 @@
   Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
   Copyright (c) 2015, Linaro Limited. 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
 
   Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
 
diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
index ae7116dc31..29c6ecf98b 100644
--- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
+++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
@@ -5,12 +5,7 @@
 # Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
 # Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution. The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
 #**/
diff --git a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
index d00cb9b2ab..a242e4bd9a 100755
--- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
+++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
index 2d9d53d149..e02c7b229a 100755
--- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
+++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
@@ -3,13 +3,7 @@
 #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
index 218b3540eb..1670cac1d4 100644
--- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
+++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni
index 38def406b9485966b67944d615b8908c250dc2c6..3e321f98848ef80ad178dde66ea72366306d73e4 100644
GIT binary patch
delta 99
zcmX@2cu9J~w(wwv00tL^2nJmSABIeZWQJ6RJceQ*smtKWkOJnF0L9aQIF+G@!HPkF
j!HFRls6&^*2#B2-au^aBN})Oefb0^8p3VQ6kMaNjEm9Q<

delta 859
zcmZ9KO->t85QHmRl$?Oggf%hy>~NSQqksq5MkLFzJ;WpVC$gOoR&xdJg2V~n0-Pvc
z_4qGn<oCK?S6A1o=a<8$_xF!=Ut?8TD$y@3G}lkoLR0cWGmY3+Aj-&x8iJUDbnTA5
z8Tf>g0#r$7MKpo!Kqq|WSVZrH%8+PAtqj&RdmYWA02TT}Lj^&h0jr1p4iTo_328=6
zL-a<Zg;{QekSbzdX|9{SzP5TgBR}60Q<qz<x8cN))w=(`YlRpS+Ka|5k6M!Z&I4p_
z#<oBuva6PVLuJC}&QgC_Ux}(I?pxECc?WE;CYY~1u&C8m?3j4PLwpRQ=R}RUMlZtZ
z7PnvUJSVRvEIAn<eWVXm>iyv@XvX}S*W0{dUtg6X=u%zf`oemu3-Sy*6Abm<=QLAW
zS43%;e5DS1%DLTW7<Lbk=@Ye%dUa6egbB1>kJwFY+9URM<j#(_x4))p(mVzxx(3q?
zVI9shIL(m9@GhC9`^+QzV2$z2o^r!J1NQJA?B6I^`7v?29@E?+)%PvYjy}VSOa4+G
NdZyOHyEo5o{{i*wj{pDw

diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
index c8a9da73bb..1d9c3dfd49 100644
--- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
+++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
index c0195b2fa9..ab14597d8b 100644
--- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
+++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
@@ -3,13 +3,7 @@
 #    Copyright (c) 2015, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
index 59c468ac4b..419eb878f3 100644
--- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
+++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
@@ -3,13 +3,7 @@
   Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
   Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
index 4d2dbbaf0d..63d57ec46d 100644
--- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
+++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
@@ -3,12 +3,7 @@
 #  Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
 #  Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution. The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
 ##
diff --git a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
index fc834d9c7c..dd575965c6 100644
--- a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
@@ -3,13 +3,7 @@
 #  Copyright (c) 2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution.  The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index 70b044c7e3..dc9e1407ba 100644
--- a/Platform/Hisilicon/D05/D05.dsc
+++ b/Platform/Hisilicon/D05/D05.dsc
@@ -3,13 +3,7 @@
 #  Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
 #  Copyright (c) 2015-2016, Linaro Limited. 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/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
index 9632aea4b0..812f7f2690 100644
--- a/Platform/Hisilicon/D05/D05.fdf
+++ b/Platform/Hisilicon/D05/D05.fdf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
 #  Copyright (c) 2015-2016, Linaro Limited. 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
 #
 
 [DEFINES]
diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
index 5091c7a25d..210141d019 100644
--- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
+++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
@@ -5,13 +5,7 @@
   Copyright (c) 2018, Linaro Limited. All rights reserved.
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
index fc1832fa5f..6756814574 100644
--- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
@@ -5,13 +5,7 @@
 #  Copyright (c) 2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution.  The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
index 27c0a718f8..77f631d5d6 100644
--- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
@@ -5,13 +5,7 @@
   Copyright (c) 2018, Linaro Limited. All rights reserved.
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
index b374347e5c..05aefc90f7 100644
--- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
+++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
index e82c9204d5..c42d0dd6cd 100644
--- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
+++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
@@ -3,13 +3,7 @@
 #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
index 1a9ed620c8..ac013ca308 100644
--- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
+++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
index 9f5be02d8a..8b36905f0f 100644
--- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
+++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
@@ -3,13 +3,7 @@
 // Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
 // Copyright (c) 2016, Hisilicon Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
index a1458da7f0..2ee15dbc7b 100644
--- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
+++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2016 - 2018, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2016 - 2018, Linaro Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
index 7ec5775306..d471102199 100644
--- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
+++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
@@ -3,13 +3,7 @@
 #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
index 0dc988a1d3..18d2bf2f98 100644
--- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
+++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
@@ -3,13 +3,7 @@
   Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
   Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
index 21bb33a318..e20d350cd5 100644
--- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
+++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
@@ -3,12 +3,7 @@
 #  Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
 #  Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution. The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
 ##
diff --git a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
index 80f253b235..af7d57fd6e 100644
--- a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
@@ -3,13 +3,7 @@
 #  Copyright (c) 2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution.  The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Platform/Hisilicon/D06/D06.dec b/Platform/Hisilicon/D06/D06.dec
index 710f083eee..64607fed0e 100644
--- a/Platform/Hisilicon/D06/D06.dec
+++ b/Platform/Hisilicon/D06/D06.dec
@@ -3,13 +3,7 @@
 #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
index 73bea728b0..5387daf553 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -3,13 +3,7 @@
 #  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
 #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
index e402628a1b..976b597647 100644
--- a/Platform/Hisilicon/D06/D06.fdf
+++ b/Platform/Hisilicon/D06/D06.fdf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
 #  Copyright (c) 2017 - 2018, Linaro Limited. 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
 #
 
 [DEFINES]
diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
index 35228fdf1d..40bd87e5c8 100644
--- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
+++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
@@ -3,13 +3,7 @@
 *  Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2016-2018, Linaro Limited. 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/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
index c01c49150a..c5c3290130 100644
--- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
+++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2016-2018, Linaro Limited. 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/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
index a91f2b6005..ebc7e7791e 100644
--- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
+++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
@@ -3,13 +3,7 @@
 #    Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2016-2018, Linaro Limited. 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/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
index 1287dfd834..63ce447292 100644
--- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
+++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
@@ -5,13 +5,7 @@
   Copyright (c) 2018, Linaro Limited. All rights reserved.
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
index fc1832fa5f..6756814574 100644
--- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
@@ -5,13 +5,7 @@
 #  Copyright (c) 2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution.  The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
index 27c0a718f8..77f631d5d6 100644
--- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
@@ -5,13 +5,7 @@
   Copyright (c) 2018, Linaro Limited. All rights reserved.
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
index a8261d3706..72f30ff075 100644
--- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
+++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
index 715a4efadd..8eaec842c8 100644
--- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
+++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
@@ -3,13 +3,7 @@
 #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2017, Linaro Limited. 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/Platform/Hisilicon/D06/Include/Library/CpldD06.h b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
index 8eb333de52..e5adfb316f 100644
--- a/Platform/Hisilicon/D06/Include/Library/CpldD06.h
+++ b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
@@ -3,13 +3,7 @@
   Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
   Copyright (c) 2018, Linaro Limited. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
index c28ac6266f..980eabfe33 100644
--- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
+++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
index e3fa5fa5ab..3696d1f11e 100644
--- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
+++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
@@ -4,13 +4,7 @@
 *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
index 758157525f..1b0a2180c1 100644
--- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
+++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
index 9bc6eb549c..59373a9685 100644
--- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
+++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
@@ -3,13 +3,7 @@
 #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
index 678c2107bd..42a5a08077 100644
--- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
+++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
@@ -3,13 +3,7 @@
 *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
 *  Copyright (c) 2017, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
index 3b0bd2d60c..c42f5d6e6a 100644
--- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
+++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
@@ -3,13 +3,7 @@
 #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
 #    Copyright (c) 2017, Linaro Limited. 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/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
index d13178e925..c44959b7f1 100644
--- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
+++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
@@ -3,13 +3,7 @@
   Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
   Copyright (c) 2018, Linaro Limited. 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 <PiDxe.h>
diff --git a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
index 8a998681a3..d8d2940344 100644
--- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
+++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
@@ -3,12 +3,7 @@
 #  Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
 #  Copyright (c) 2018, Linaro Limited. All rights reserved.<BR>
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution. The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
 ##
diff --git a/Platform/Hisilicon/HiKey/HiKey.dec b/Platform/Hisilicon/HiKey/HiKey.dec
index d5de1a1659..3164c4c223 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dec
+++ b/Platform/Hisilicon/HiKey/HiKey.dec
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2014-2018, Linaro Limited. 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
 #
 
 [Defines]
diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
index 7e05babb6c..44f21700dd 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dsc
+++ b/Platform/Hisilicon/HiKey/HiKey.dsc
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2014-2018, Linaro Limited. 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/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf
index 7e6c8083bb..3d85f01eca 100644
--- a/Platform/Hisilicon/HiKey/HiKey.fdf
+++ b/Platform/Hisilicon/HiKey/HiKey.fdf
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2014-2018, Linaro Limited. 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/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
index 2162b68529..47fbe02e53 100644
--- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
+++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
@@ -2,13 +2,7 @@
 *
 *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
index 0ababfa32e..954f31e461 100644
--- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
+++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
@@ -2,13 +2,7 @@
 *
 *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
index 4c4644a0fe..0181999a3b 100644
--- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
+++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
@@ -2,13 +2,7 @@
 #  Copyright (c) 2013 - 2014, ARM Ltd. All rights reserved.
 #  Copyright (c) 2018, Linaro Ltd. 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
 #
 
 [Defines]
diff --git a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
index be535f8f19..efdd76768b 100644
--- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
+++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
@@ -2,13 +2,7 @@
 *
 *  Copyright (c) 2018, Linaro. 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/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
index 2791b9f44c..3564b07633 100644
--- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
+++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2018, Linaro. 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
 #
 
 [Defines]
diff --git a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
index e60478f6b7..6962da30a3 100644
--- a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
+++ b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
@@ -2,13 +2,7 @@
 *
 *  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
index 6bf0d39bd4..801d633985 100644
--- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
+++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
@@ -2,13 +2,7 @@
 *
 *  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
index 0e8f1bbacd..253b7c6e70 100644
--- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
+++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
index 6a47a4501e..18b74bc42e 100644
--- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
+++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2014-2017, Linaro Limited. 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
 #
 
 [Defines]
diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
index 0f6ad89a02..118c66942e 100644
--- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
+++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
@@ -2,13 +2,7 @@
 *
 *  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey960/HiKey960.dec b/Platform/Hisilicon/HiKey960/HiKey960.dec
index aa5a0caf52..1273c28ed0 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.dec
+++ b/Platform/Hisilicon/HiKey960/HiKey960.dec
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2018, Linaro Limited. 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
 #
 
 [Defines]
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
index a4a1a371de..db6e5b918d 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
+++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/HiKey960.fdf b/Platform/Hisilicon/HiKey960/HiKey960.fdf
index 1b07284dc8..01ae18499f 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
+++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
index 47ec879861..8e94bec41c 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
+++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
@@ -2,13 +2,7 @@
 *
 *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
index 630aabcb23..0629fa4a81 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
+++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
@@ -2,13 +2,7 @@
 *
 *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
index 54105bdb3c..5e1c52b84b 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
+++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2018, Linaro Limited. 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
 #
 
 [Defines]
diff --git a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
index b196455072..74f10bf9e6 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
+++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
@@ -2,13 +2,7 @@
 *
 *  Copyright (c) 2018, Linaro. 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/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
index 5ea3747321..9fe2d2fe52 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
+++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2018, Linaro. 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
 #
 
 [Defines]
diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
index 9ae4610a29..89cca920ad 100644
--- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
+++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
@@ -2,13 +2,7 @@
 *
 *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
index eb85f67520..a3638cef4d 100644
--- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
+++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
index e16e5a623b..81167c76f9 100644
--- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
+++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2018, Linaro Limited. 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
 #
 
 [Defines]
diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
index 0c37c3791a..68ca76688e 100644
--- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
+++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
@@ -2,13 +2,7 @@
 *
 *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
index 6aff5cdd3d..1be7de5ccf 100644
--- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
+++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
@@ -4,13 +4,7 @@
   Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
   Copyright (c) 2017 - 2018, 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
 
 **/
 #include <PiDxe.h>
diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
index dd451cff33..6f2576c61c 100644
--- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
+++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
@@ -4,13 +4,7 @@
 #  Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
 #  Copyright (c) 2017 - 2018, 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
 #
 #
 ##
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40721): https://edk2.groups.io/g/devel/message/40721
Mute This Topic: https://groups.io/mt/31635479/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

On Wed, May 15, 2019 at 04:09:48PM -0700, Michael D Kinney wrote:
> 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

As far as I can tell, this excludes 4 (iasl generated) .asl files
currently not displaying any explicit license at all.

This is correct, and as discussed offline, but it would be worth
pointing it out explicitly in the commit message.

Ming, Heyi - can you confirm that:

Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl
Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl

were intended to be contributed with a 2-clause BSD license and under
TianoCore Contribution Agreement 1.1?

Other than that, looks good to me.

/
    Leif

> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  .../SystemFirmwareUpdateConfig.ini            |   8 +-------
>  Platform/Hisilicon/D03/D03.dec                |   8 +-------
>  Platform/Hisilicon/D03/D03.dsc                |   8 +-------
>  Platform/Hisilicon/D03/D03.fdf                |   8 +-------
>  .../OemNicConfig2PHi1610/OemNicConfig.h       |   8 +-------
>  .../OemNicConfig2PHi1610/OemNicConfig2P.c     |   8 +-------
>  .../OemNicConfig2PHi1610/OemNicConfig2P.inf   |   8 +-------
>  .../SystemFirmwareDescriptor.aslc             |   8 +-------
>  .../SystemFirmwareDescriptor.inf              |   8 +-------
>  .../SystemFirmwareDescriptorPei.c             |   8 +-------
>  .../D03/EarlyConfigPeim/EarlyConfigPeimD03.c  |   8 +-------
>  .../EarlyConfigPeim/EarlyConfigPeimD03.inf    |   8 +-------
>  .../Hisilicon/D03/Include/Library/CpldD03.h   |   8 +-------
>  .../DS3231RealTimeClock.h                     |   8 +-------
>  .../DS3231RealTimeClockLib.c                  |   8 +-------
>  .../DS3231RealTimeClockLib.inf                |   7 +------
>  .../D03/Library/FdtUpdateLib/FdtUpdateLib.c   |   8 +-------
>  .../D03/Library/FdtUpdateLib/FdtUpdateLib.inf |   8 +-------
>  .../OemMiscLib2P/BoardFeature2PHi1610.c       |   8 +-------
>  .../BoardFeature2PHi1610Strings.uni           | Bin 4292 -> 3538 bytes
>  .../Library/OemMiscLib2P/OemMiscLib2PHi1610.c |   8 +-------
>  .../OemMiscLib2P/OemMiscLib2PHi1610.inf       |   8 +-------
>  .../Library/PlatformPciLib/PlatformPciLib.c   |   8 +-------
>  .../Library/PlatformPciLib/PlatformPciLib.inf |   7 +------
>  .../SystemFirmwareUpdateConfig.ini            |   8 +-------
>  Platform/Hisilicon/D05/D05.dsc                |   8 +-------
>  Platform/Hisilicon/D05/D05.fdf                |   8 +-------
>  .../SystemFirmwareDescriptor.aslc             |   8 +-------
>  .../SystemFirmwareDescriptor.inf              |   8 +-------
>  .../SystemFirmwareDescriptorPei.c             |   8 +-------
>  .../D05/EarlyConfigPeim/EarlyConfigPeimD05.c  |   8 +-------
>  .../EarlyConfigPeim/EarlyConfigPeimD05.inf    |   8 +-------
>  .../Library/OemMiscLibD05/BoardFeatureD05.c   |   8 +-------
>  .../OemMiscLibD05/BoardFeatureD05Strings.uni  |   8 +-------
>  .../D05/Library/OemMiscLibD05/OemMiscLibD05.c |   8 +-------
>  .../Library/OemMiscLibD05/OemMiscLibD05.inf   |   8 +-------
>  .../Library/PlatformPciLib/PlatformPciLib.c   |   8 +-------
>  .../Library/PlatformPciLib/PlatformPciLib.inf |   7 +------
>  .../SystemFirmwareUpdateConfig.ini            |   8 +-------
>  Platform/Hisilicon/D06/D06.dec                |   8 +-------
>  Platform/Hisilicon/D06/D06.dsc                |   8 +-------
>  Platform/Hisilicon/D06/D06.fdf                |   8 +-------
>  .../OemNicConfig2PHi1620/OemNicConfig.h       |   8 +-------
>  .../OemNicConfig2PHi1620/OemNicConfig2P.c     |   8 +-------
>  .../OemNicConfig2PHi1620/OemNicConfig2P.inf   |   8 +-------
>  .../SystemFirmwareDescriptor.aslc             |   8 +-------
>  .../SystemFirmwareDescriptor.inf              |   8 +-------
>  .../SystemFirmwareDescriptorPei.c             |   8 +-------
>  .../D06/EarlyConfigPeim/EarlyConfigPeimD06.c  |   8 +-------
>  .../EarlyConfigPeim/EarlyConfigPeimD06.inf    |   8 +-------
>  .../Hisilicon/D06/Include/Library/CpldD06.h   |   8 +-------
>  .../Library/OemMiscLibD06/BoardFeatureD06.c   |   8 +-------
>  .../OemMiscLibD06/BoardFeatureD06Strings.uni  |   8 +-------
>  .../D06/Library/OemMiscLibD06/OemMiscLibD06.c |   8 +-------
>  .../Library/OemMiscLibD06/OemMiscLibD06.inf   |   8 +-------
>  .../D06/Library/OemNicLib/OemNicLib.c         |   8 +-------
>  .../D06/Library/OemNicLib/OemNicLib.inf       |   8 +-------
>  .../PciHostBridgeLib/PciHostBridgeLib.c       |   8 +-------
>  .../PciHostBridgeLib/PciHostBridgeLib.inf     |   7 +------
>  Platform/Hisilicon/HiKey/HiKey.dec            |   8 +-------
>  Platform/Hisilicon/HiKey/HiKey.dsc            |   8 +-------
>  Platform/Hisilicon/HiKey/HiKey.fdf            |   8 +-------
>  Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c  |   8 +-------
>  Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h  |   8 +-------
>  .../Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf     |   8 +-------
>  .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c         |   8 +-------
>  .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf       |   8 +-------
>  .../Hisilicon/HiKey/Include/ArmPlatform.h     |   8 +-------
>  .../Hisilicon/HiKey/Library/HiKeyLib/HiKey.c  |   8 +-------
>  .../HiKey/Library/HiKeyLib/HiKeyHelper.S      |   8 +-------
>  .../HiKey/Library/HiKeyLib/HiKeyLib.inf       |   8 +-------
>  .../HiKey/Library/HiKeyLib/HiKeyMem.c         |   8 +-------
>  Platform/Hisilicon/HiKey960/HiKey960.dec      |   8 +-------
>  Platform/Hisilicon/HiKey960/HiKey960.dsc      |   8 +-------
>  Platform/Hisilicon/HiKey960/HiKey960.fdf      |   8 +-------
>  .../HiKey960/HiKey960Dxe/HiKey960Dxe.c        |   8 +-------
>  .../HiKey960/HiKey960Dxe/HiKey960Dxe.h        |   8 +-------
>  .../HiKey960/HiKey960Dxe/HiKey960Dxe.inf      |   8 +-------
>  .../HiKey960GpioDxe/HiKey960GpioDxe.c         |   8 +-------
>  .../HiKey960GpioDxe/HiKey960GpioDxe.inf       |   8 +-------
>  .../HiKey960/Library/HiKey960Lib/HiKey960.c   |   8 +-------
>  .../Library/HiKey960Lib/HiKey960Helper.S      |   8 +-------
>  .../Library/HiKey960Lib/HiKey960Lib.inf       |   8 +-------
>  .../Library/HiKey960Lib/HiKey960Mem.c         |   8 +-------
>  .../PciHostBridgeLib/PciHostBridgeLib.c       |   8 +-------
>  .../PciHostBridgeLib/PciHostBridgeLib.inf     |   8 +-------
>  86 files changed, 85 insertions(+), 591 deletions(-)
> 
> diff --git a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> index fc834d9c7c..dd575965c6 100644
> --- a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> +++ b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the BSD License
> -#  which accompanies this distribution.  The full text of the license may be found at
> -#  http://opensource.org/licenses/bsd-license.php
> -#
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>  
> diff --git a/Platform/Hisilicon/D03/D03.dec b/Platform/Hisilicon/D03/D03.dec
> index 8b08a32773..206a632d5b 100644
> --- a/Platform/Hisilicon/D03/D03.dec
> +++ b/Platform/Hisilicon/D03/D03.dec
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
> index 07ff461277..60b0d6393e 100644
> --- a/Platform/Hisilicon/D03/D03.dsc
> +++ b/Platform/Hisilicon/D03/D03.dsc
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>  #  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
> index 3f07b2e577..f5d0c66f63 100644
> --- a/Platform/Hisilicon/D03/D03.fdf
> +++ b/Platform/Hisilicon/D03/D03.fdf
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>  #  Copyright (c) 2015, Linaro Limited. 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
>  #
>  
>  [DEFINES]
> diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
> index 46c77d3061..94d904c35f 100644
> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
> index dcaf3aa827..814378b39b 100644
> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
> index ee5596a4ce..1071f5d651 100644
> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> index 2589e20a43..52149b1ed0 100644
> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> @@ -5,13 +5,7 @@
>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the BSD License
> -  which accompanies this distribution.  The full text of the license may be found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>  
>  **/
>  
> diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> index fc1832fa5f..6756814574 100644
> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> @@ -5,13 +5,7 @@
>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the BSD License
> -#  which accompanies this distribution.  The full text of the license may be found at
> -#  http://opensource.org/licenses/bsd-license.php
> -#
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>  
> diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> index 27c0a718f8..77f631d5d6 100644
> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> @@ -5,13 +5,7 @@
>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the BSD License
> -  which accompanies this distribution.  The full text of the license may be found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>  
>  **/
>  
> diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
> index dacd9e871f..75b6dec34b 100644
> --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
> +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
> index 90e40ae2b3..1f992024ac 100644
> --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
> +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Include/Library/CpldD03.h b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
> index 456bf4b5c9..fce3319c44 100644
> --- a/Platform/Hisilicon/D03/Include/Library/CpldD03.h
> +++ b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
> index d1e6c41dd7..da18d0f558 100644
> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
> @@ -4,13 +4,7 @@
>  *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2015, Linaro Limited. 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
>  *
>  *  Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
>  **/
> diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
> index f6dbcf6b75..898335a7b7 100644
> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
> @@ -8,13 +8,7 @@
>    Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
>    Copyright (c) 2015, Linaro Limited. 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
>  
>    Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
>  
> diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
> index ae7116dc31..29c6ecf98b 100644
> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
> @@ -5,12 +5,7 @@
>  # Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>  # Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the BSD License
> -#  which accompanies this distribution. The full text of the license may be found at
> -#  http://opensource.org/licenses/bsd-license.php
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  #
>  #**/
> diff --git a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
> index d00cb9b2ab..a242e4bd9a 100755
> --- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
> +++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
> index 2d9d53d149..e02c7b229a 100755
> --- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
> +++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
> index 218b3540eb..1670cac1d4 100644
> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni
> index 38def406b9485966b67944d615b8908c250dc2c6..3e321f98848ef80ad178dde66ea72366306d73e4 100644
> GIT binary patch
> delta 99
> zcmX@2cu9J~w(wwv00tL^2nJmSABIeZWQJ6RJceQ*smtKWkOJnF0L9aQIF+G@!HPkF
> j!HFRls6&^*2#B2-au^aBN})Oefb0^8p3VQ6kMaNjEm9Q<
> 
> delta 859
> zcmZ9KO->t85QHmRl$?Oggf%hy>~NSQqksq5MkLFzJ;WpVC$gOoR&xdJg2V~n0-Pvc
> z_4qGn<oCK?S6A1o=a<8$_xF!=Ut?8TD$y@3G}lkoLR0cWGmY3+Aj-&x8iJUDbnTA5
> z8Tf>g0#r$7MKpo!Kqq|WSVZrH%8+PAtqj&RdmYWA02TT}Lj^&h0jr1p4iTo_328=6
> zL-a<Zg;{QekSbzdX|9{SzP5TgBR}60Q<qz<x8cN))w=(`YlRpS+Ka|5k6M!Z&I4p_
> z#<oBuva6PVLuJC}&QgC_Ux}(I?pxECc?WE;CYY~1u&C8m?3j4PLwpRQ=R}RUMlZtZ
> z7PnvUJSVRvEIAn<eWVXm>iyv@XvX}S*W0{dUtg6X=u%zf`oemu3-Sy*6Abm<=QLAW
> zS43%;e5DS1%DLTW7<Lbk=@Ye%dUa6egbB1>kJwFY+9URM<j#(_x4))p(mVzxx(3q?
> zVI9shIL(m9@GhC9`^+QzV2$z2o^r!J1NQJA?B6I^`7v?29@E?+)%PvYjy}VSOa4+G
> NdZyOHyEo5o{{i*wj{pDw
> 
> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
> index c8a9da73bb..1d9c3dfd49 100644
> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
> index c0195b2fa9..ab14597d8b 100644
> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
> index 59c468ac4b..419eb878f3 100644
> --- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
> +++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
> @@ -3,13 +3,7 @@
>    Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>    Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
>  
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the BSD License
> -  which accompanies this distribution.  The full text of the license may be found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>  
>  **/
>  
> diff --git a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
> index 4d2dbbaf0d..63d57ec46d 100644
> --- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
> +++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
> @@ -3,12 +3,7 @@
>  #  Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>  #  Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the BSD License
> -#  which accompanies this distribution. The full text of the license may be found at
> -#  http://opensource.org/licenses/bsd-license.php
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  #
>  ##
> diff --git a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> index fc834d9c7c..dd575965c6 100644
> --- a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> +++ b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the BSD License
> -#  which accompanies this distribution.  The full text of the license may be found at
> -#  http://opensource.org/licenses/bsd-license.php
> -#
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>  
> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
> index 70b044c7e3..dc9e1407ba 100644
> --- a/Platform/Hisilicon/D05/D05.dsc
> +++ b/Platform/Hisilicon/D05/D05.dsc
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
>  #  Copyright (c) 2015-2016, Linaro Limited. 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/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
> index 9632aea4b0..812f7f2690 100644
> --- a/Platform/Hisilicon/D05/D05.fdf
> +++ b/Platform/Hisilicon/D05/D05.fdf
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
>  #  Copyright (c) 2015-2016, Linaro Limited. 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
>  #
>  
>  [DEFINES]
> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> index 5091c7a25d..210141d019 100644
> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> @@ -5,13 +5,7 @@
>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the BSD License
> -  which accompanies this distribution.  The full text of the license may be found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>  
>  **/
>  
> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> index fc1832fa5f..6756814574 100644
> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> @@ -5,13 +5,7 @@
>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the BSD License
> -#  which accompanies this distribution.  The full text of the license may be found at
> -#  http://opensource.org/licenses/bsd-license.php
> -#
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>  
> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> index 27c0a718f8..77f631d5d6 100644
> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> @@ -5,13 +5,7 @@
>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the BSD License
> -  which accompanies this distribution.  The full text of the license may be found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>  
>  **/
>  
> diff --git a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
> index b374347e5c..05aefc90f7 100644
> --- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
> +++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
> index e82c9204d5..c42d0dd6cd 100644
> --- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
> +++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
> index 1a9ed620c8..ac013ca308 100644
> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
> index 9f5be02d8a..8b36905f0f 100644
> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
> @@ -3,13 +3,7 @@
>  // Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
>  // Copyright (c) 2016, Hisilicon Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
> index a1458da7f0..2ee15dbc7b 100644
> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2016 - 2018, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2016 - 2018, Linaro Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
> index 7ec5775306..d471102199 100644
> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
> index 0dc988a1d3..18d2bf2f98 100644
> --- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
> +++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
> @@ -3,13 +3,7 @@
>    Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>    Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
>  
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the BSD License
> -  which accompanies this distribution.  The full text of the license may be found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>  
>  **/
>  
> diff --git a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> index 21bb33a318..e20d350cd5 100644
> --- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> +++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> @@ -3,12 +3,7 @@
>  #  Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>  #  Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the BSD License
> -#  which accompanies this distribution. The full text of the license may be found at
> -#  http://opensource.org/licenses/bsd-license.php
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  #
>  ##
> diff --git a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> index 80f253b235..af7d57fd6e 100644
> --- a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> +++ b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the BSD License
> -#  which accompanies this distribution.  The full text of the license may be found at
> -#  http://opensource.org/licenses/bsd-license.php
> -#
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>  
> diff --git a/Platform/Hisilicon/D06/D06.dec b/Platform/Hisilicon/D06/D06.dec
> index 710f083eee..64607fed0e 100644
> --- a/Platform/Hisilicon/D06/D06.dec
> +++ b/Platform/Hisilicon/D06/D06.dec
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
> index 73bea728b0..5387daf553 100644
> --- a/Platform/Hisilicon/D06/D06.dsc
> +++ b/Platform/Hisilicon/D06/D06.dsc
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>  #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
> index e402628a1b..976b597647 100644
> --- a/Platform/Hisilicon/D06/D06.fdf
> +++ b/Platform/Hisilicon/D06/D06.fdf
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
>  #  Copyright (c) 2017 - 2018, Linaro Limited. 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
>  #
>  
>  [DEFINES]
> diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
> index 35228fdf1d..40bd87e5c8 100644
> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2016-2018, Linaro Limited. 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/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
> index c01c49150a..c5c3290130 100644
> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2016-2018, Linaro Limited. 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/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
> index a91f2b6005..ebc7e7791e 100644
> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2016-2018, Linaro Limited. 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/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> index 1287dfd834..63ce447292 100644
> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> @@ -5,13 +5,7 @@
>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the BSD License
> -  which accompanies this distribution.  The full text of the license may be found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>  
>  **/
>  
> diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> index fc1832fa5f..6756814574 100644
> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> @@ -5,13 +5,7 @@
>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the BSD License
> -#  which accompanies this distribution.  The full text of the license may be found at
> -#  http://opensource.org/licenses/bsd-license.php
> -#
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>  
> diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> index 27c0a718f8..77f631d5d6 100644
> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> @@ -5,13 +5,7 @@
>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>  
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the BSD License
> -  which accompanies this distribution.  The full text of the license may be found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>  
>  **/
>  
> diff --git a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
> index a8261d3706..72f30ff075 100644
> --- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
> +++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
> index 715a4efadd..8eaec842c8 100644
> --- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
> +++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2017, Linaro Limited. 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/Platform/Hisilicon/D06/Include/Library/CpldD06.h b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
> index 8eb333de52..e5adfb316f 100644
> --- a/Platform/Hisilicon/D06/Include/Library/CpldD06.h
> +++ b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
> @@ -3,13 +3,7 @@
>    Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>    Copyright (c) 2018, Linaro Limited. All rights reserved.<BR>
>  
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the BSD License
> -  which accompanies this distribution.  The full text of the license may be found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>  
>  **/
>  
> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
> index c28ac6266f..980eabfe33 100644
> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
> index e3fa5fa5ab..3696d1f11e 100644
> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
> @@ -4,13 +4,7 @@
>  *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
> index 758157525f..1b0a2180c1 100644
> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
> index 9bc6eb549c..59373a9685 100644
> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
> index 678c2107bd..42a5a08077 100644
> --- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
> +++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
> @@ -3,13 +3,7 @@
>  *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>  *  Copyright (c) 2017, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
> index 3b0bd2d60c..c42f5d6e6a 100644
> --- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
> +++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
> @@ -3,13 +3,7 @@
>  #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>  #    Copyright (c) 2017, Linaro Limited. 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/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
> index d13178e925..c44959b7f1 100644
> --- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
> +++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
> @@ -3,13 +3,7 @@
>    Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>    Copyright (c) 2018, Linaro Limited. 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 <PiDxe.h>
> diff --git a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> index 8a998681a3..d8d2940344 100644
> --- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> +++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> @@ -3,12 +3,7 @@
>  #  Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the BSD License
> -#  which accompanies this distribution. The full text of the license may be found at
> -#  http://opensource.org/licenses/bsd-license.php
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  #
>  ##
> diff --git a/Platform/Hisilicon/HiKey/HiKey.dec b/Platform/Hisilicon/HiKey/HiKey.dec
> index d5de1a1659..3164c4c223 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.dec
> +++ b/Platform/Hisilicon/HiKey/HiKey.dec
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2014-2018, Linaro Limited. 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
>  #
>  
>  [Defines]
> diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
> index 7e05babb6c..44f21700dd 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.dsc
> +++ b/Platform/Hisilicon/HiKey/HiKey.dsc
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2014-2018, Linaro Limited. 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/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf
> index 7e6c8083bb..3d85f01eca 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.fdf
> +++ b/Platform/Hisilicon/HiKey/HiKey.fdf
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2014-2018, Linaro Limited. 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/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
> index 2162b68529..47fbe02e53 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
> index 0ababfa32e..954f31e461 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
> index 4c4644a0fe..0181999a3b 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
> @@ -2,13 +2,7 @@
>  #  Copyright (c) 2013 - 2014, ARM Ltd. All rights reserved.
>  #  Copyright (c) 2018, Linaro Ltd. 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
>  #
>  
>  [Defines]
> diff --git a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
> index be535f8f19..efdd76768b 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
> +++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (c) 2018, Linaro. 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/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
> index 2791b9f44c..3564b07633 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
> +++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2018, Linaro. 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
>  #
>  
>  [Defines]
> diff --git a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
> index e60478f6b7..6962da30a3 100644
> --- a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
> +++ b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
> index 6bf0d39bd4..801d633985 100644
> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
> index 0e8f1bbacd..253b7c6e70 100644
> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
> index 6a47a4501e..18b74bc42e 100644
> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2014-2017, Linaro Limited. 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
>  #
>  
>  [Defines]
> diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
> index 0f6ad89a02..118c66942e 100644
> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey960/HiKey960.dec b/Platform/Hisilicon/HiKey960/HiKey960.dec
> index aa5a0caf52..1273c28ed0 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960.dec
> +++ b/Platform/Hisilicon/HiKey960/HiKey960.dec
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2018, Linaro Limited. 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
>  #
>  
>  [Defines]
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
> index a4a1a371de..db6e5b918d 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
> +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/HiKey960.fdf b/Platform/Hisilicon/HiKey960/HiKey960.fdf
> index 1b07284dc8..01ae18499f 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
> +++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
> index 47ec879861..8e94bec41c 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
> index 630aabcb23..0629fa4a81 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
> index 54105bdb3c..5e1c52b84b 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2018, Linaro Limited. 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
>  #
>  
>  [Defines]
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
> index b196455072..74f10bf9e6 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
> +++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (c) 2018, Linaro. 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/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
> index 5ea3747321..9fe2d2fe52 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
> +++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2018, Linaro. 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
>  #
>  
>  [Defines]
> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
> index 9ae4610a29..89cca920ad 100644
> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
> index eb85f67520..a3638cef4d 100644
> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
> index e16e5a623b..81167c76f9 100644
> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (c) 2018, Linaro Limited. 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
>  #
>  
>  [Defines]
> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
> index 0c37c3791a..68ca76688e 100644
> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
> index 6aff5cdd3d..1be7de5ccf 100644
> --- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
> +++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
> @@ -4,13 +4,7 @@
>    Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>    Copyright (c) 2017 - 2018, 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
>  
>  **/
>  #include <PiDxe.h>
> diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> index dd451cff33..6f2576c61c 100644
> --- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> +++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> @@ -4,13 +4,7 @@
>  #  Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>  #  Copyright (c) 2017 - 2018, 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
>  #
>  #
>  ##
> -- 
> 2.21.0.windows.1
> 
> 
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40906): https://edk2.groups.io/g/devel/message/40906
Mute This Topic: https://groups.io/mt/31635479/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

On 5/17/2019 6:59 PM, Leif Lindholm wrote:
> On Wed, May 15, 2019 at 04:09:48PM -0700, Michael D Kinney wrote:
>> 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
> 
> As far as I can tell, this excludes 4 (iasl generated) .asl files
> currently not displaying any explicit license at all.
> 
> This is correct, and as discussed offline, but it would be worth
> pointing it out explicitly in the commit message.
> 
> Ming, Heyi - can you confirm that:
> 
> Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
> Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl
> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl
> 
> were intended to be contributed with a 2-clause BSD license and under
> TianoCore Contribution Agreement 1.1?

Yes.

Thanks

> 
> Other than that, looks good to me.
> 
> /
>     Leif
> 
>> Cc: Leif Lindholm <leif.lindholm@linaro.org>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
>> ---
>>  .../SystemFirmwareUpdateConfig.ini            |   8 +-------
>>  Platform/Hisilicon/D03/D03.dec                |   8 +-------
>>  Platform/Hisilicon/D03/D03.dsc                |   8 +-------
>>  Platform/Hisilicon/D03/D03.fdf                |   8 +-------
>>  .../OemNicConfig2PHi1610/OemNicConfig.h       |   8 +-------
>>  .../OemNicConfig2PHi1610/OemNicConfig2P.c     |   8 +-------
>>  .../OemNicConfig2PHi1610/OemNicConfig2P.inf   |   8 +-------
>>  .../SystemFirmwareDescriptor.aslc             |   8 +-------
>>  .../SystemFirmwareDescriptor.inf              |   8 +-------
>>  .../SystemFirmwareDescriptorPei.c             |   8 +-------
>>  .../D03/EarlyConfigPeim/EarlyConfigPeimD03.c  |   8 +-------
>>  .../EarlyConfigPeim/EarlyConfigPeimD03.inf    |   8 +-------
>>  .../Hisilicon/D03/Include/Library/CpldD03.h   |   8 +-------
>>  .../DS3231RealTimeClock.h                     |   8 +-------
>>  .../DS3231RealTimeClockLib.c                  |   8 +-------
>>  .../DS3231RealTimeClockLib.inf                |   7 +------
>>  .../D03/Library/FdtUpdateLib/FdtUpdateLib.c   |   8 +-------
>>  .../D03/Library/FdtUpdateLib/FdtUpdateLib.inf |   8 +-------
>>  .../OemMiscLib2P/BoardFeature2PHi1610.c       |   8 +-------
>>  .../BoardFeature2PHi1610Strings.uni           | Bin 4292 -> 3538 bytes
>>  .../Library/OemMiscLib2P/OemMiscLib2PHi1610.c |   8 +-------
>>  .../OemMiscLib2P/OemMiscLib2PHi1610.inf       |   8 +-------
>>  .../Library/PlatformPciLib/PlatformPciLib.c   |   8 +-------
>>  .../Library/PlatformPciLib/PlatformPciLib.inf |   7 +------
>>  .../SystemFirmwareUpdateConfig.ini            |   8 +-------
>>  Platform/Hisilicon/D05/D05.dsc                |   8 +-------
>>  Platform/Hisilicon/D05/D05.fdf                |   8 +-------
>>  .../SystemFirmwareDescriptor.aslc             |   8 +-------
>>  .../SystemFirmwareDescriptor.inf              |   8 +-------
>>  .../SystemFirmwareDescriptorPei.c             |   8 +-------
>>  .../D05/EarlyConfigPeim/EarlyConfigPeimD05.c  |   8 +-------
>>  .../EarlyConfigPeim/EarlyConfigPeimD05.inf    |   8 +-------
>>  .../Library/OemMiscLibD05/BoardFeatureD05.c   |   8 +-------
>>  .../OemMiscLibD05/BoardFeatureD05Strings.uni  |   8 +-------
>>  .../D05/Library/OemMiscLibD05/OemMiscLibD05.c |   8 +-------
>>  .../Library/OemMiscLibD05/OemMiscLibD05.inf   |   8 +-------
>>  .../Library/PlatformPciLib/PlatformPciLib.c   |   8 +-------
>>  .../Library/PlatformPciLib/PlatformPciLib.inf |   7 +------
>>  .../SystemFirmwareUpdateConfig.ini            |   8 +-------
>>  Platform/Hisilicon/D06/D06.dec                |   8 +-------
>>  Platform/Hisilicon/D06/D06.dsc                |   8 +-------
>>  Platform/Hisilicon/D06/D06.fdf                |   8 +-------
>>  .../OemNicConfig2PHi1620/OemNicConfig.h       |   8 +-------
>>  .../OemNicConfig2PHi1620/OemNicConfig2P.c     |   8 +-------
>>  .../OemNicConfig2PHi1620/OemNicConfig2P.inf   |   8 +-------
>>  .../SystemFirmwareDescriptor.aslc             |   8 +-------
>>  .../SystemFirmwareDescriptor.inf              |   8 +-------
>>  .../SystemFirmwareDescriptorPei.c             |   8 +-------
>>  .../D06/EarlyConfigPeim/EarlyConfigPeimD06.c  |   8 +-------
>>  .../EarlyConfigPeim/EarlyConfigPeimD06.inf    |   8 +-------
>>  .../Hisilicon/D06/Include/Library/CpldD06.h   |   8 +-------
>>  .../Library/OemMiscLibD06/BoardFeatureD06.c   |   8 +-------
>>  .../OemMiscLibD06/BoardFeatureD06Strings.uni  |   8 +-------
>>  .../D06/Library/OemMiscLibD06/OemMiscLibD06.c |   8 +-------
>>  .../Library/OemMiscLibD06/OemMiscLibD06.inf   |   8 +-------
>>  .../D06/Library/OemNicLib/OemNicLib.c         |   8 +-------
>>  .../D06/Library/OemNicLib/OemNicLib.inf       |   8 +-------
>>  .../PciHostBridgeLib/PciHostBridgeLib.c       |   8 +-------
>>  .../PciHostBridgeLib/PciHostBridgeLib.inf     |   7 +------
>>  Platform/Hisilicon/HiKey/HiKey.dec            |   8 +-------
>>  Platform/Hisilicon/HiKey/HiKey.dsc            |   8 +-------
>>  Platform/Hisilicon/HiKey/HiKey.fdf            |   8 +-------
>>  Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c  |   8 +-------
>>  Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h  |   8 +-------
>>  .../Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf     |   8 +-------
>>  .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c         |   8 +-------
>>  .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf       |   8 +-------
>>  .../Hisilicon/HiKey/Include/ArmPlatform.h     |   8 +-------
>>  .../Hisilicon/HiKey/Library/HiKeyLib/HiKey.c  |   8 +-------
>>  .../HiKey/Library/HiKeyLib/HiKeyHelper.S      |   8 +-------
>>  .../HiKey/Library/HiKeyLib/HiKeyLib.inf       |   8 +-------
>>  .../HiKey/Library/HiKeyLib/HiKeyMem.c         |   8 +-------
>>  Platform/Hisilicon/HiKey960/HiKey960.dec      |   8 +-------
>>  Platform/Hisilicon/HiKey960/HiKey960.dsc      |   8 +-------
>>  Platform/Hisilicon/HiKey960/HiKey960.fdf      |   8 +-------
>>  .../HiKey960/HiKey960Dxe/HiKey960Dxe.c        |   8 +-------
>>  .../HiKey960/HiKey960Dxe/HiKey960Dxe.h        |   8 +-------
>>  .../HiKey960/HiKey960Dxe/HiKey960Dxe.inf      |   8 +-------
>>  .../HiKey960GpioDxe/HiKey960GpioDxe.c         |   8 +-------
>>  .../HiKey960GpioDxe/HiKey960GpioDxe.inf       |   8 +-------
>>  .../HiKey960/Library/HiKey960Lib/HiKey960.c   |   8 +-------
>>  .../Library/HiKey960Lib/HiKey960Helper.S      |   8 +-------
>>  .../Library/HiKey960Lib/HiKey960Lib.inf       |   8 +-------
>>  .../Library/HiKey960Lib/HiKey960Mem.c         |   8 +-------
>>  .../PciHostBridgeLib/PciHostBridgeLib.c       |   8 +-------
>>  .../PciHostBridgeLib/PciHostBridgeLib.inf     |   8 +-------
>>  86 files changed, 85 insertions(+), 591 deletions(-)
>>
>> diff --git a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> index fc834d9c7c..dd575965c6 100644
>> --- a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> +++ b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> @@ -3,13 +3,7 @@
>>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  #
>> -#  This program and the accompanying materials
>> -#  are licensed and made available under the terms and conditions of the BSD License
>> -#  which accompanies this distribution.  The full text of the license may be found at
>> -#  http://opensource.org/licenses/bsd-license.php
>> -#
>> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  #
>>  ##
>>  
>> diff --git a/Platform/Hisilicon/D03/D03.dec b/Platform/Hisilicon/D03/D03.dec
>> index 8b08a32773..206a632d5b 100644
>> --- a/Platform/Hisilicon/D03/D03.dec
>> +++ b/Platform/Hisilicon/D03/D03.dec
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
>> index 07ff461277..60b0d6393e 100644
>> --- a/Platform/Hisilicon/D03/D03.dsc
>> +++ b/Platform/Hisilicon/D03/D03.dsc
>> @@ -3,13 +3,7 @@
>>  #  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>>  #  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
>> index 3f07b2e577..f5d0c66f63 100644
>> --- a/Platform/Hisilicon/D03/D03.fdf
>> +++ b/Platform/Hisilicon/D03/D03.fdf
>> @@ -3,13 +3,7 @@
>>  #  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>>  #  Copyright (c) 2015, Linaro Limited. 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
>>  #
>>  
>>  [DEFINES]
>> diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
>> index 46c77d3061..94d904c35f 100644
>> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
>> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
>> index dcaf3aa827..814378b39b 100644
>> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
>> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
>> index ee5596a4ce..1071f5d651 100644
>> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
>> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> index 2589e20a43..52149b1ed0 100644
>> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> @@ -5,13 +5,7 @@
>>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  
>> -  This program and the accompanying materials
>> -  are licensed and made available under the terms and conditions of the BSD License
>> -  which accompanies this distribution.  The full text of the license may be found at
>> -  http://opensource.org/licenses/bsd-license.php
>> -
>> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  
>>  **/
>>  
>> diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> index fc1832fa5f..6756814574 100644
>> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> @@ -5,13 +5,7 @@
>>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  #
>> -#  This program and the accompanying materials
>> -#  are licensed and made available under the terms and conditions of the BSD License
>> -#  which accompanies this distribution.  The full text of the license may be found at
>> -#  http://opensource.org/licenses/bsd-license.php
>> -#
>> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  #
>>  ##
>>  
>> diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> index 27c0a718f8..77f631d5d6 100644
>> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> @@ -5,13 +5,7 @@
>>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  
>> -  This program and the accompanying materials
>> -  are licensed and made available under the terms and conditions of the BSD License
>> -  which accompanies this distribution.  The full text of the license may be found at
>> -  http://opensource.org/licenses/bsd-license.php
>> -
>> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  
>>  **/
>>  
>> diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
>> index dacd9e871f..75b6dec34b 100644
>> --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
>> +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
>> index 90e40ae2b3..1f992024ac 100644
>> --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
>> +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Include/Library/CpldD03.h b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
>> index 456bf4b5c9..fce3319c44 100644
>> --- a/Platform/Hisilicon/D03/Include/Library/CpldD03.h
>> +++ b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
>> index d1e6c41dd7..da18d0f558 100644
>> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
>> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
>> @@ -4,13 +4,7 @@
>>  *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2015, Linaro Limited. 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
>>  *
>>  *  Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
>>  **/
>> diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
>> index f6dbcf6b75..898335a7b7 100644
>> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
>> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
>> @@ -8,13 +8,7 @@
>>    Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
>>    Copyright (c) 2015, Linaro Limited. 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
>>  
>>    Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
>>  
>> diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
>> index ae7116dc31..29c6ecf98b 100644
>> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
>> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
>> @@ -5,12 +5,7 @@
>>  # Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>>  # Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
>>  #
>> -#  This program and the accompanying materials
>> -#  are licensed and made available under the terms and conditions of the BSD License
>> -#  which accompanies this distribution. The full text of the license may be found at
>> -#  http://opensource.org/licenses/bsd-license.php
>> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  #
>>  #
>>  #**/
>> diff --git a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
>> index d00cb9b2ab..a242e4bd9a 100755
>> --- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
>> +++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
>> index 2d9d53d149..e02c7b229a 100755
>> --- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
>> +++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
>> index 218b3540eb..1670cac1d4 100644
>> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
>> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni
>> index 38def406b9485966b67944d615b8908c250dc2c6..3e321f98848ef80ad178dde66ea72366306d73e4 100644
>> GIT binary patch
>> delta 99
>> zcmX@2cu9J~w(wwv00tL^2nJmSABIeZWQJ6RJceQ*smtKWkOJnF0L9aQIF+G@!HPkF
>> j!HFRls6&^*2#B2-au^aBN})Oefb0^8p3VQ6kMaNjEm9Q<
>>
>> delta 859
>> zcmZ9KO->t85QHmRl$?Oggf%hy>~NSQqksq5MkLFzJ;WpVC$gOoR&xdJg2V~n0-Pvc
>> z_4qGn<oCK?S6A1o=a<8$_xF!=Ut?8TD$y@3G}lkoLR0cWGmY3+Aj-&x8iJUDbnTA5
>> z8Tf>g0#r$7MKpo!Kqq|WSVZrH%8+PAtqj&RdmYWA02TT}Lj^&h0jr1p4iTo_328=6
>> zL-a<Zg;{QekSbzdX|9{SzP5TgBR}60Q<qz<x8cN))w=(`YlRpS+Ka|5k6M!Z&I4p_
>> z#<oBuva6PVLuJC}&QgC_Ux}(I?pxECc?WE;CYY~1u&C8m?3j4PLwpRQ=R}RUMlZtZ
>> z7PnvUJSVRvEIAn<eWVXm>iyv@XvX}S*W0{dUtg6X=u%zf`oemu3-Sy*6Abm<=QLAW
>> zS43%;e5DS1%DLTW7<Lbk=@Ye%dUa6egbB1>kJwFY+9URM<j#(_x4))p(mVzxx(3q?
>> zVI9shIL(m9@GhC9`^+QzV2$z2o^r!J1NQJA?B6I^`7v?29@E?+)%PvYjy}VSOa4+G
>> NdZyOHyEo5o{{i*wj{pDw
>>
>> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
>> index c8a9da73bb..1d9c3dfd49 100644
>> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
>> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
>> index c0195b2fa9..ab14597d8b 100644
>> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
>> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2015, Linaro Limited. 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/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
>> index 59c468ac4b..419eb878f3 100644
>> --- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
>> +++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
>> @@ -3,13 +3,7 @@
>>    Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>>    Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
>>  
>> -  This program and the accompanying materials
>> -  are licensed and made available under the terms and conditions of the BSD License
>> -  which accompanies this distribution.  The full text of the license may be found at
>> -  http://opensource.org/licenses/bsd-license.php
>> -
>> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  
>>  **/
>>  
>> diff --git a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
>> index 4d2dbbaf0d..63d57ec46d 100644
>> --- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
>> +++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
>> @@ -3,12 +3,7 @@
>>  #  Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>>  #  Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
>>  #
>> -#  This program and the accompanying materials
>> -#  are licensed and made available under the terms and conditions of the BSD License
>> -#  which accompanies this distribution. The full text of the license may be found at
>> -#  http://opensource.org/licenses/bsd-license.php
>> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  #
>>  #
>>  ##
>> diff --git a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> index fc834d9c7c..dd575965c6 100644
>> --- a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> +++ b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> @@ -3,13 +3,7 @@
>>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  #
>> -#  This program and the accompanying materials
>> -#  are licensed and made available under the terms and conditions of the BSD License
>> -#  which accompanies this distribution.  The full text of the license may be found at
>> -#  http://opensource.org/licenses/bsd-license.php
>> -#
>> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  #
>>  ##
>>  
>> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
>> index 70b044c7e3..dc9e1407ba 100644
>> --- a/Platform/Hisilicon/D05/D05.dsc
>> +++ b/Platform/Hisilicon/D05/D05.dsc
>> @@ -3,13 +3,7 @@
>>  #  Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
>>  #  Copyright (c) 2015-2016, Linaro Limited. 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/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
>> index 9632aea4b0..812f7f2690 100644
>> --- a/Platform/Hisilicon/D05/D05.fdf
>> +++ b/Platform/Hisilicon/D05/D05.fdf
>> @@ -3,13 +3,7 @@
>>  #  Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
>>  #  Copyright (c) 2015-2016, Linaro Limited. 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
>>  #
>>  
>>  [DEFINES]
>> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> index 5091c7a25d..210141d019 100644
>> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> @@ -5,13 +5,7 @@
>>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  
>> -  This program and the accompanying materials
>> -  are licensed and made available under the terms and conditions of the BSD License
>> -  which accompanies this distribution.  The full text of the license may be found at
>> -  http://opensource.org/licenses/bsd-license.php
>> -
>> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  
>>  **/
>>  
>> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> index fc1832fa5f..6756814574 100644
>> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> @@ -5,13 +5,7 @@
>>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  #
>> -#  This program and the accompanying materials
>> -#  are licensed and made available under the terms and conditions of the BSD License
>> -#  which accompanies this distribution.  The full text of the license may be found at
>> -#  http://opensource.org/licenses/bsd-license.php
>> -#
>> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  #
>>  ##
>>  
>> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> index 27c0a718f8..77f631d5d6 100644
>> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> @@ -5,13 +5,7 @@
>>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  
>> -  This program and the accompanying materials
>> -  are licensed and made available under the terms and conditions of the BSD License
>> -  which accompanies this distribution.  The full text of the license may be found at
>> -  http://opensource.org/licenses/bsd-license.php
>> -
>> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  
>>  **/
>>  
>> diff --git a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
>> index b374347e5c..05aefc90f7 100644
>> --- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
>> +++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
>> index e82c9204d5..c42d0dd6cd 100644
>> --- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
>> +++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
>> index 1a9ed620c8..ac013ca308 100644
>> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
>> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
>> index 9f5be02d8a..8b36905f0f 100644
>> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
>> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
>> @@ -3,13 +3,7 @@
>>  // Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
>>  // Copyright (c) 2016, Hisilicon Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
>> index a1458da7f0..2ee15dbc7b 100644
>> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
>> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2016 - 2018, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2016 - 2018, Linaro Limited. 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/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
>> index 7ec5775306..d471102199 100644
>> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
>> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2016, Linaro Limited. 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/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
>> index 0dc988a1d3..18d2bf2f98 100644
>> --- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
>> +++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
>> @@ -3,13 +3,7 @@
>>    Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>>    Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
>>  
>> -  This program and the accompanying materials
>> -  are licensed and made available under the terms and conditions of the BSD License
>> -  which accompanies this distribution.  The full text of the license may be found at
>> -  http://opensource.org/licenses/bsd-license.php
>> -
>> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  
>>  **/
>>  
>> diff --git a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
>> index 21bb33a318..e20d350cd5 100644
>> --- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
>> +++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
>> @@ -3,12 +3,7 @@
>>  #  Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>>  #  Copyright (c) 2016, Linaro Limited. All rights reserved.<BR>
>>  #
>> -#  This program and the accompanying materials
>> -#  are licensed and made available under the terms and conditions of the BSD License
>> -#  which accompanies this distribution. The full text of the license may be found at
>> -#  http://opensource.org/licenses/bsd-license.php
>> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  #
>>  #
>>  ##
>> diff --git a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> index 80f253b235..af7d57fd6e 100644
>> --- a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> +++ b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> @@ -3,13 +3,7 @@
>>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  #
>> -#  This program and the accompanying materials
>> -#  are licensed and made available under the terms and conditions of the BSD License
>> -#  which accompanies this distribution.  The full text of the license may be found at
>> -#  http://opensource.org/licenses/bsd-license.php
>> -#
>> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  #
>>  ##
>>  
>> diff --git a/Platform/Hisilicon/D06/D06.dec b/Platform/Hisilicon/D06/D06.dec
>> index 710f083eee..64607fed0e 100644
>> --- a/Platform/Hisilicon/D06/D06.dec
>> +++ b/Platform/Hisilicon/D06/D06.dec
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
>> index 73bea728b0..5387daf553 100644
>> --- a/Platform/Hisilicon/D06/D06.dsc
>> +++ b/Platform/Hisilicon/D06/D06.dsc
>> @@ -3,13 +3,7 @@
>>  #  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>>  #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
>> index e402628a1b..976b597647 100644
>> --- a/Platform/Hisilicon/D06/D06.fdf
>> +++ b/Platform/Hisilicon/D06/D06.fdf
>> @@ -3,13 +3,7 @@
>>  #  Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
>>  #  Copyright (c) 2017 - 2018, Linaro Limited. 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
>>  #
>>  
>>  [DEFINES]
>> diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
>> index 35228fdf1d..40bd87e5c8 100644
>> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
>> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2016-2018, Linaro Limited. 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/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
>> index c01c49150a..c5c3290130 100644
>> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
>> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2016-2018, Linaro Limited. 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/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
>> index a91f2b6005..ebc7e7791e 100644
>> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
>> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2016-2018, Linaro Limited. 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/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> index 1287dfd834..63ce447292 100644
>> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> @@ -5,13 +5,7 @@
>>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  
>> -  This program and the accompanying materials
>> -  are licensed and made available under the terms and conditions of the BSD License
>> -  which accompanies this distribution.  The full text of the license may be found at
>> -  http://opensource.org/licenses/bsd-license.php
>> -
>> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  
>>  **/
>>  
>> diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> index fc1832fa5f..6756814574 100644
>> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> @@ -5,13 +5,7 @@
>>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.
>>  #  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  #
>> -#  This program and the accompanying materials
>> -#  are licensed and made available under the terms and conditions of the BSD License
>> -#  which accompanies this distribution.  The full text of the license may be found at
>> -#  http://opensource.org/licenses/bsd-license.php
>> -#
>> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  #
>>  ##
>>  
>> diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> index 27c0a718f8..77f631d5d6 100644
>> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> @@ -5,13 +5,7 @@
>>    Copyright (c) 2018, Linaro Limited. All rights reserved.
>>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>>  
>> -  This program and the accompanying materials
>> -  are licensed and made available under the terms and conditions of the BSD License
>> -  which accompanies this distribution.  The full text of the license may be found at
>> -  http://opensource.org/licenses/bsd-license.php
>> -
>> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  
>>  **/
>>  
>> diff --git a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
>> index a8261d3706..72f30ff075 100644
>> --- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
>> +++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
>> index 715a4efadd..8eaec842c8 100644
>> --- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
>> +++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2017, Linaro Limited. 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/Platform/Hisilicon/D06/Include/Library/CpldD06.h b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
>> index 8eb333de52..e5adfb316f 100644
>> --- a/Platform/Hisilicon/D06/Include/Library/CpldD06.h
>> +++ b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
>> @@ -3,13 +3,7 @@
>>    Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>>    Copyright (c) 2018, Linaro Limited. All rights reserved.<BR>
>>  
>> -  This program and the accompanying materials
>> -  are licensed and made available under the terms and conditions of the BSD License
>> -  which accompanies this distribution.  The full text of the license may be found at
>> -  http://opensource.org/licenses/bsd-license.php
>> -
>> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  
>>  **/
>>  
>> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
>> index c28ac6266f..980eabfe33 100644
>> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
>> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
>> index e3fa5fa5ab..3696d1f11e 100644
>> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
>> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
>> @@ -4,13 +4,7 @@
>>  *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
>> index 758157525f..1b0a2180c1 100644
>> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
>> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
>> index 9bc6eb549c..59373a9685 100644
>> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
>> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
>> index 678c2107bd..42a5a08077 100644
>> --- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
>> +++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
>> @@ -3,13 +3,7 @@
>>  *  Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>>  *  Copyright (c) 2017, Linaro Limited. 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/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
>> index 3b0bd2d60c..c42f5d6e6a 100644
>> --- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
>> +++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
>> @@ -3,13 +3,7 @@
>>  #    Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>>  #    Copyright (c) 2017, Linaro Limited. 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/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> index d13178e925..c44959b7f1 100644
>> --- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> +++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> @@ -3,13 +3,7 @@
>>    Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>>    Copyright (c) 2018, Linaro Limited. 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 <PiDxe.h>
>> diff --git a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> index 8a998681a3..d8d2940344 100644
>> --- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> +++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> @@ -3,12 +3,7 @@
>>  #  Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>>  #  Copyright (c) 2018, Linaro Limited. All rights reserved.<BR>
>>  #
>> -#  This program and the accompanying materials
>> -#  are licensed and made available under the terms and conditions of the BSD License
>> -#  which accompanies this distribution. The full text of the license may be found at
>> -#  http://opensource.org/licenses/bsd-license.php
>> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>>  #
>>  #
>>  ##
>> diff --git a/Platform/Hisilicon/HiKey/HiKey.dec b/Platform/Hisilicon/HiKey/HiKey.dec
>> index d5de1a1659..3164c4c223 100644
>> --- a/Platform/Hisilicon/HiKey/HiKey.dec
>> +++ b/Platform/Hisilicon/HiKey/HiKey.dec
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2014-2018, Linaro Limited. 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
>>  #
>>  
>>  [Defines]
>> diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
>> index 7e05babb6c..44f21700dd 100644
>> --- a/Platform/Hisilicon/HiKey/HiKey.dsc
>> +++ b/Platform/Hisilicon/HiKey/HiKey.dsc
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2014-2018, Linaro Limited. 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/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf
>> index 7e6c8083bb..3d85f01eca 100644
>> --- a/Platform/Hisilicon/HiKey/HiKey.fdf
>> +++ b/Platform/Hisilicon/HiKey/HiKey.fdf
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2014-2018, Linaro Limited. 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/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
>> index 2162b68529..47fbe02e53 100644
>> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
>> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
>> @@ -2,13 +2,7 @@
>>  *
>>  *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
>> index 0ababfa32e..954f31e461 100644
>> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
>> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
>> @@ -2,13 +2,7 @@
>>  *
>>  *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
>> index 4c4644a0fe..0181999a3b 100644
>> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
>> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
>> @@ -2,13 +2,7 @@
>>  #  Copyright (c) 2013 - 2014, ARM Ltd. All rights reserved.
>>  #  Copyright (c) 2018, Linaro Ltd. 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
>>  #
>>  
>>  [Defines]
>> diff --git a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
>> index be535f8f19..efdd76768b 100644
>> --- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
>> +++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
>> @@ -2,13 +2,7 @@
>>  *
>>  *  Copyright (c) 2018, Linaro. 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/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
>> index 2791b9f44c..3564b07633 100644
>> --- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
>> +++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2018, Linaro. 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
>>  #
>>  
>>  [Defines]
>> diff --git a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
>> index e60478f6b7..6962da30a3 100644
>> --- a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
>> +++ b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
>> @@ -2,13 +2,7 @@
>>  *
>>  *  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
>> index 6bf0d39bd4..801d633985 100644
>> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
>> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
>> @@ -2,13 +2,7 @@
>>  *
>>  *  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
>> index 0e8f1bbacd..253b7c6e70 100644
>> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
>> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
>> index 6a47a4501e..18b74bc42e 100644
>> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
>> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2014-2017, Linaro Limited. 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
>>  #
>>  
>>  [Defines]
>> diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
>> index 0f6ad89a02..118c66942e 100644
>> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
>> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
>> @@ -2,13 +2,7 @@
>>  *
>>  *  Copyright (c) 2014-2017, Linaro Limited. 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/Platform/Hisilicon/HiKey960/HiKey960.dec b/Platform/Hisilicon/HiKey960/HiKey960.dec
>> index aa5a0caf52..1273c28ed0 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960.dec
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960.dec
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2018, Linaro Limited. 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
>>  #
>>  
>>  [Defines]
>> diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
>> index a4a1a371de..db6e5b918d 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/HiKey960.fdf b/Platform/Hisilicon/HiKey960/HiKey960.fdf
>> index 1b07284dc8..01ae18499f 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
>> index 47ec879861..8e94bec41c 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
>> @@ -2,13 +2,7 @@
>>  *
>>  *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
>> index 630aabcb23..0629fa4a81 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
>> @@ -2,13 +2,7 @@
>>  *
>>  *  Copyright (c) 2018, Linaro Ltd. 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/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
>> index 54105bdb3c..5e1c52b84b 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2018, Linaro Limited. 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
>>  #
>>  
>>  [Defines]
>> diff --git a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
>> index b196455072..74f10bf9e6 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
>> @@ -2,13 +2,7 @@
>>  *
>>  *  Copyright (c) 2018, Linaro. 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/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
>> index 5ea3747321..9fe2d2fe52 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2018, Linaro. 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
>>  #
>>  
>>  [Defines]
>> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
>> index 9ae4610a29..89cca920ad 100644
>> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
>> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
>> @@ -2,13 +2,7 @@
>>  *
>>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
>> index eb85f67520..a3638cef4d 100644
>> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
>> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
>> index e16e5a623b..81167c76f9 100644
>> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
>> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
>> @@ -1,13 +1,7 @@
>>  #
>>  #  Copyright (c) 2018, Linaro Limited. 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
>>  #
>>  
>>  [Defines]
>> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
>> index 0c37c3791a..68ca76688e 100644
>> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
>> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
>> @@ -2,13 +2,7 @@
>>  *
>>  *  Copyright (c) 2018, Linaro Limited. 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/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> index 6aff5cdd3d..1be7de5ccf 100644
>> --- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> +++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> @@ -4,13 +4,7 @@
>>    Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>>    Copyright (c) 2017 - 2018, 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
>>  
>>  **/
>>  #include <PiDxe.h>
>> diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> index dd451cff33..6f2576c61c 100644
>> --- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> +++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> @@ -4,13 +4,7 @@
>>  #  Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>>  #  Copyright (c) 2017 - 2018, 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
>>  #
>>  #
>>  ##
>> -- 
>> 2.21.0.windows.1
>>
>>
>> 
>>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41048): https://edk2.groups.io/g/devel/message/41048
Mute This Topic: https://groups.io/mt/31635479/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-