From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@google.com header.s=20161025 header.b=aCYEF5wL;
 spf=pass (domain: flex--joerichey.bounces.google.com, ip: 209.85.161.73, mailfrom: 3kkbvxakkbfcindqhbgdxfnnfkd.bnlcdudkdcj1.fqntor.hn@flex--joerichey.bounces.google.com)
Received: from mail-yw1-f73.google.com (mail-yw1-f73.google.com [209.85.161.73])
 by groups.io with SMTP; Fri, 10 May 2019 02:36:44 -0700
Received: by mail-yw1-f73.google.com with SMTP id v191so3426466ywc.11
        for <devel@edk2.groups.io>; Fri, 10 May 2019 02:36:43 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=google.com; s=20161025;
        h=date:in-reply-to:message-id:mime-version:references:subject:from:to
         :cc;
        bh=ejYf0qYQME5HdKJjv2ANVeuCazASvF/KOpC6B0rsuhU=;
        b=aCYEF5wLdaYW6Aj5tIEoYYqF1O5/UHSgOiMCIo3Mtxo2ByIHdt2h/SbNOaTpGzLYZm
         P+srIlKHe05+rFDjR9Fb5YV0Zfd/PuoDlJj2GIL4L9OfQRpNL0wlPbwmYZ9a2+jZF0am
         BJh/uNd8iHleawTKLh+59eK72b+xswZ6WT0vwtx3B/euHtDWDQHDneGcBQOmFESVrQCK
         03e30bVMDkaISHN5XXBRIKOom7PD0NIqVbLyemdGkLRVS+1M8z7v/+VKavxHc6bXFpMf
         u+mB+sSmEjbtSZPQoz3hTltlpoimXsIS9PoX1cyft62JkUZEgvHcxVF5t0V/6Fx4iqnB
         umUA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:date:in-reply-to:message-id:mime-version
         :references:subject:from:to:cc;
        bh=ejYf0qYQME5HdKJjv2ANVeuCazASvF/KOpC6B0rsuhU=;
        b=tEmn3iBzektiZKj459QcDmsCtbZD8rLJlYu0X+J//VNeb0dFGNLO2SEIEWW/3bnmn9
         EGKqk3Rw1CkBGBfT2XKBUgKs8dDYJ33NAo0e2pMXKSeQF6IEhJ4Oef9cjtxJbu11ffgU
         RkNeo4dVCvGZZtEgKm63egpkleo8TzwIQFNvvfKtWZdpO6oPJ+AiVvONE+WEe4A1Tb6G
         LmsjptKPvewv9Ol/eUdIyq5mXP/O2Z/cwrfA+T9TbpT5hzTVu4pxjovYuYnx32I7Khem
         J1M2J3SgBvGHv8Oau8REUaiROm0JrPb/17d/OniTVrNFRxlGlvWhGBE4DRyF9WARzL0l
         JmZg==
X-Gm-Message-State: APjAAAV/4cXbJSdGvFKJ2DC7kTmyvf/mfHuHs1UWVgbigHx6kh9m5PHL
	WXvx/aDU3zI29iF0e+dofZts8L7LAXspgBxm8hZQNrL1ZtvKv5rXLLve16jQu9230GAsot/2pA2
	aWt251009WIW6XFKvPftaTJufvJDxqT4pITbBqxfZmaOwZNaYvZIgL2I4185QutrBOR0=
X-Google-Smtp-Source: APXvYqy+i8wiEwRJrHEIipAB1v9aU1pT9mSiv9csgqYqeQlI4DPbelqcVexEHmwf4oTj+7TAa2X/oGE99WwzjK4=
X-Received: by 2002:a81:4c2:: with SMTP id 185mr3954324ywe.411.1557481002711;
 Fri, 10 May 2019 02:36:42 -0700 (PDT)
Date: Fri, 10 May 2019 02:36:34 -0700
In-Reply-To: <20190510093634.12732-1-joerichey@google.com>
Message-Id: <20190510093634.12732-4-joerichey@google.com>
Mime-Version: 1.0
References: <20190510093634.12732-1-joerichey@google.com>
X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog
Subject: [PATCH v3 3/3] Vlv2TbltDevicePkg: Remove double \r
From: "Joe Richey" <joerichey@google.com>
To: devel@edk2.groups.io
Cc: Zailiang Sun <zailiang.sun@intel.com>, Yi Qian <yi.qian@intel.com>
Content-Type: text/plain; charset="UTF-8"

This is a large change, but it shouldn't mess up the git blame. All of
the bad line endings are in the copyright headers.

Note that this commit does not pass the PatchCheck.py presubmit script
due to issues caused by the repeated \r characters.

Command run to fix these files (on Linux):
  find Vlv2TbltDevicePkg -type f -print0 | xargs -0 sed -i "s/\r\r/\r/g"

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Joe Richey <joerichey@google.com>
---
 Vlv2TbltDevicePkg/PlatformPkgConfig.dsc                                                     | 4 ++--
 Vlv2TbltDevicePkg/BootScriptSaveDxe/BootScriptSaveDxe.inf                                   | 4 ++--
 Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.inf                                                   | 4 ++--
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf                                           | 4 ++--
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf                                                  | 4 ++--
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.inf                                               | 4 ++--
 Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf                                           | 4 ++--
 Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf                                         | 4 ++--
 Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf                                 | 4 ++--
 Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf                     | 4 ++--
 Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLib.inf                                 | 4 ++--
 Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf                                           | 4 ++--
 Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.inf                               | 4 ++--
 Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf                                 | 4 ++--
 Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.inf                                 | 4 ++--
 Vlv2TbltDevicePkg/Library/SerialPortLib/SerialPortLib.inf                                   | 4 ++--
 Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.inf                                             | 4 ++--
 Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf                                       | 4 ++--
 Vlv2TbltDevicePkg/Metronome/Metronome.inf                                                   | 4 ++--
 Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf                                               | 4 ++--
 Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf                                   | 4 ++--
 Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf                                       | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf                                     | 4 ++--
 Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf                                               | 4 ++--
 Vlv2TbltDevicePkg/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf | 4 ++--
 Vlv2TbltDevicePkg/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf                       | 4 ++--
 Vlv2TbltDevicePkg/UiApp/UiApp.inf                                                           | 4 ++--
 Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf                                 | 4 ++--
 Vlv2TbltDevicePkg/Wpce791/Wpce791.inf                                                       | 4 ++--
 Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h                                               | 4 ++--
 Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooks.h                                          | 4 ++--
 Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooksLib.h                                       | 4 ++--
 Vlv2TbltDevicePkg/AcpiPlatform/Osfr.h                                                       | 4 ++--
 Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.h                               | 4 ++--
 Vlv2TbltDevicePkg/BootScriptSaveDxe/InternalBootScriptSave.h                                | 4 ++--
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.h                                                | 4 ++--
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmCommon.h                                              | 4 ++--
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.h                                                 | 4 ++--
 Vlv2TbltDevicePkg/Include/AlertStandardFormatTable.h                                        | 4 ++--
 Vlv2TbltDevicePkg/Include/ChipsetAccess.h                                                   | 4 ++--
 Vlv2TbltDevicePkg/Include/CommonIncludes.h                                                  | 4 ++--
 Vlv2TbltDevicePkg/Include/CpuType.h                                                         | 4 ++--
 Vlv2TbltDevicePkg/Include/FileHandleLib.h                                                   | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/AcpiTableStorage.h                                           | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/AlertStandardFormat.h                                        | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/BiosId.h                                                     | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/BoardFeatures.h                                              | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/EfiVpdData.h                                                 | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/FirmwareId.h                                                 | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/HwWatchdogTimerHob.h                                         | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/IdccData.h                                                   | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/ItkData.h                                                    | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/MemoryConfigData.h                                           | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/OsSelection.h                                                | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/PciLanInfo.h                                                 | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h                                            | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h                                               | 4 ++--
 Vlv2TbltDevicePkg/Include/Guid/SensorInfoVariable.h                                         | 4 ++--
 Vlv2TbltDevicePkg/Include/Hpet.h                                                            | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h                                               | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/CpuIA32.h                                                 | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/EfiRegTableLib.h                                          | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/Esrt.h                                                    | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/Fd.h                                                      | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/FlashDeviceLib.h                                          | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/I2cMmioConfigLib.h                                        | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/I2cPort_platform.h                                        | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/PlatformFsaLib.h                                          | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/PlatformFspLib.h                                          | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/StallSmmLib.h                                             | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/UsbDeviceModeLib.h                                        | 4 ++--
 Vlv2TbltDevicePkg/Include/Mcfg.h                                                            | 4 ++--
 Vlv2TbltDevicePkg/Include/McfgTable.h                                                       | 4 ++--
 Vlv2TbltDevicePkg/Include/Platform.h                                                        | 4 ++--
 Vlv2TbltDevicePkg/Include/PlatformBootMode.h                                                | 4 ++--
 Vlv2TbltDevicePkg/Include/PlatformDefinitions.h                                             | 4 ++--
 Vlv2TbltDevicePkg/Include/Ppi/MfgMemoryTest.h                                               | 4 ++--
 Vlv2TbltDevicePkg/Include/Ppi/Sha256Hash.h                                                  | 4 ++--
 Vlv2TbltDevicePkg/Include/Ppi/Speaker.h                                                     | 4 ++--
 Vlv2TbltDevicePkg/Include/Ppi/UsbController.h                                               | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/CK505ClockPlatformInfo.h                                 | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/EnhancedSpeedstep.h                                      | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/HwWatchdogTimer.h                                        | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/I2cAcpi.h                                                | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/I2cBus.h                                                 | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/I2cBusMcg.h                                              | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/I2cHostMcg.h                                             | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/I2cMasterMcg.h                                           | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/I2cSlave.h                                               | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/LpcWpc83627Policy.h                                      | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/LpcWpce791Policy.h                                       | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/MmioDevice.h                                             | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/Observable.h                                             | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/PlatformGopPolicy.h                                      | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/PlatformIdeInit.h                                        | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/SetupMode.h                                              | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/SmbiosSlotPopulation.h                                   | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/Speaker.h                                                | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/TcoReset.h                                               | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/TpmMp.h                                                  | 4 ++--
 Vlv2TbltDevicePkg/Include/Protocol/UsbPolicy.h                                              | 4 ++--
 Vlv2TbltDevicePkg/Include/SetupMode.h                                                       | 4 ++--
 Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/CommonHeader.h                               | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.h                      | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.h                          | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardJumpers/BoardJumpers.h                      | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.h                        | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.h                    | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.h                               | 4 ++--
 Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLibrary.h                               | 4 ++--
 Vlv2TbltDevicePkg/Library/PchSmmLib/CommonHeader.h                                          | 4 ++--
 Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.h                                      | 4 ++--
 Vlv2TbltDevicePkg/Library/SmbusLib/CommonHeader.h                                           | 4 ++--
 Vlv2TbltDevicePkg/Metronome/LegacyMetronome.h                                               | 4 ++--
 Vlv2TbltDevicePkg/MonoStatusCode/EfiStatusCode.h                                            | 4 ++--
 Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.h                                           | 4 ++--
 Vlv2TbltDevicePkg/PciPlatform/PciPlatform.h                                                 | 4 ++--
 Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.h                                   | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/AzaliaVerbTable.h                                             | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/BoardIdDecode.h                                               | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/Configuration.h                                               | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/LegacySpeaker.h                                               | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/Observable/Observable.h                                       | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/PciBus.h                                                      | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/SlotConfig.h                                                  | 4 ++--
 Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.h                                         | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/LegacySpeaker.h                                           | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h                                       | 4 ++--
 Vlv2TbltDevicePkg/PlatformPei/CommonHeader.h                                                | 4 ++--
 Vlv2TbltDevicePkg/PlatformPei/Platform.h                                                    | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/Configuration.h                                          | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h                                       | 4 ++--
 Vlv2TbltDevicePkg/PlatformSmm/SmmPlatform.h                                                 | 4 ++--
 Vlv2TbltDevicePkg/PlatformSmm/SmmScriptSave.h                                               | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/CommonHeader.h                                              | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriver.h                                        | 4 ++--
 Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.h                                          | 4 ++--
 Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInit.h                                      | 4 ++--
 Vlv2TbltDevicePkg/Wpce791/LpcDriver.h                                                       | 4 ++--
 Vlv2TbltDevicePkg/Wpce791/LpcIsaAcpi.h                                                      | 4 ++--
 Vlv2TbltDevicePkg/Wpce791/LpcSio.h                                                          | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr                                                  | 4 ++--
 Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooks.c                                          | 4 ++--
 Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c                               | 4 ++--
 Vlv2TbltDevicePkg/BootScriptSaveDxe/ScriptSave.c                                            | 4 ++--
 Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.c                                                     | 4 ++--
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbInfo.c                                                   | 4 ++--
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c                                                | 4 ++--
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbServiceDxe.c                                             | 4 ++--
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbServiceSmm.c                                             | 4 ++--
 Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.c                                                 | 4 ++--
 Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c                                             | 4 ++--
 Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c                                        | 4 ++--
 Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c                                         | 4 ++--
 Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c                                   | 4 ++--
 Vlv2TbltDevicePkg/Library/I2CLib/I2CLib.c                                                   | 4 ++--
 Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.c                       | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c                      | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c                          | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardJumpers/BoardJumpers.c                      | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c                        | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c                    | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.c                               | 4 ++--
 Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c                                | 4 ++--
 Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLibrary.c                               | 4 ++--
 Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.c                                             | 4 ++--
 Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformData.c                                     | 4 ++--
 Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.c                                 | 4 ++--
 Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.c                                   | 4 ++--
 Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.c                                   | 2 +-
 Vlv2TbltDevicePkg/Library/SerialPortLib/SioInit.c                                           | 4 ++--
 Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.c                                               | 4 ++--
 Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmm.c                                            | 4 ++--
 Vlv2TbltDevicePkg/Metronome/LegacyMetronome.c                                               | 4 ++--
 Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.c                                           | 4 ++--
 Vlv2TbltDevicePkg/MonoStatusCode/PeiPostCode.c                                              | 4 ++--
 Vlv2TbltDevicePkg/MonoStatusCode/PlatformStatusCode.c                                       | 4 ++--
 Vlv2TbltDevicePkg/PciPlatform/BoardPciPlatform.c                                            | 4 ++--
 Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c                                                 | 4 ++--
 Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.c                                   | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/BoardId.c                                                     | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/BoardIdDecode.c                                               | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/ClockControl.c                                                | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/ExI.c                                                         | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c                                                 | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/IchTcoReset.c                                                 | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/IdccInfo.c                                                    | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/LegacySpeaker.c                                               | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/Observable/Observable.c                                       | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c                                                   | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/SensorVar.c                                                   | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/SioPlatformPolicy.c                                           | 4 ++--
 Vlv2TbltDevicePkg/PlatformDxe/SlotConfig.c                                                  | 4 ++--
 Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.c                                     | 4 ++--
 Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.c                                         | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/BootMode.c                                                | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c                                             | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/Dimm.c                                                    | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/FlashMap.c                                                | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/LegacySpeaker.c                                           | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/MchInit.c                                                 | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c                                          | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/MemoryPeim.c                                              | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c                                             | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c                                       | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/PlatformInfoInit.c                                        | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/PlatformSsaInitPeim.c                                     | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/Recovery.c                                                | 4 ++--
 Vlv2TbltDevicePkg/PlatformInitPei/Stall.c                                                   | 4 ++--
 Vlv2TbltDevicePkg/PlatformPei/BootMode.c                                                    | 4 ++--
 Vlv2TbltDevicePkg/PlatformPei/MemoryCallback.c                                              | 4 ++--
 Vlv2TbltDevicePkg/PlatformPei/Platform.c                                                    | 4 ++--
 Vlv2TbltDevicePkg/PlatformPei/Stall.c                                                       | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.c                                       | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/SetupFunctions.c                                         | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c                                       | 4 ++--
 Vlv2TbltDevicePkg/PlatformSmm/Platform.c                                                    | 4 ++--
 Vlv2TbltDevicePkg/PlatformSmm/S3Save.c                                                      | 4 ++--
 Vlv2TbltDevicePkg/PlatformSmm/SmmScriptSave.c                                               | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerData.c                             | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorData.c                                        | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c                                    | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBootInformationData.c                                   | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBootInformationFunction.c                               | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerData.c                               | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c                           | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryDeviceData.c                                      | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryDeviceFunction.c                                  | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesData.c                      | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemStringData.c                                         | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemStringFunction.c                                     | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Data.c                                       | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Function.c                                   | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Data.c                                       | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Function.c                                   | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOnboardDeviceData.c                                     | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOnboardDeviceFunction.c                                 | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPhysicalArrayData.c                                     | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPhysicalArrayFunction.c                                 | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorData.c                   | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorFunction.c               | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorCacheData.c                                    | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorCacheFunction.c                                | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationData.c                              | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationFunction.c                          | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscResetCapabilitiesData.c                                 | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscResetCapabilitiesFunction.c                             | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriverDataTable.c                               | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriverEntryPoint.c                              | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemLanguageStringData.c                              | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemLanguageStringFunction.c                          | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerData.c                                | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemOptionStringData.c                                | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemOptionStringFunction.c                            | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemSlotDesignationData.c                             | 4 ++--
 Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemSlotDesignationFunction.c                         | 4 ++--
 Vlv2TbltDevicePkg/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.c   | 4 ++--
 Vlv2TbltDevicePkg/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c                         | 4 ++--
 Vlv2TbltDevicePkg/UiApp/FrontPage.c                                                         | 4 ++--
 Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c                                          | 4 ++--
 Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInit.c                                      | 4 ++--
 Vlv2TbltDevicePkg/Wpce791/LpcDriver.c                                                       | 4 ++--
 Vlv2TbltDevicePkg/Wpce791/LpcIsaAcpi.c                                                      | 4 ++--
 Vlv2TbltDevicePkg/Wpce791/LpcSio.c                                                          | 4 ++--
 Vlv2TbltDevicePkg/BiosIdD.env                                                               | 4 ++--
 Vlv2TbltDevicePkg/BiosIdR.env                                                               | 4 ++--
 Vlv2TbltDevicePkg/BiosIdx64D.env                                                            | 4 ++--
 Vlv2TbltDevicePkg/BiosIdx64R.env                                                            | 4 ++--
 Vlv2TbltDevicePkg/Include/Library/SpiFlash.H                                                | 4 ++--
 Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S                                         | 4 ++--
 Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm                                       | 4 ++--
 Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S                                              | 4 ++--
 Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm                                            | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/Boot.vfi                                                 | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/DebugConfig.vfi                                          | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/Main.vfi                                                 | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi                                             | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/SystemComponent.vfi                                      | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/Thermal.vfi                                              | 4 ++--
 Vlv2TbltDevicePkg/PlatformSetupDxe/UnCore.vfi                                               | 4 ++--
 280 files changed, 559 insertions(+), 559 deletions(-)

diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index 6d556c1be249..c546e9f6d2a1 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -2,10 +2,10 @@
 # platform configuration file.
 #
 # Copyright (c) 2012  - 2016, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #**/
 
diff --git a/Vlv2TbltDevicePkg/BootScriptSaveDxe/BootScriptSaveDxe.inf b/Vlv2TbltDevicePkg/BootScriptSaveDxe/BootScriptSaveDxe.inf
index d2fa62109643..63dc0861da88 100644
--- a/Vlv2TbltDevicePkg/BootScriptSaveDxe/BootScriptSaveDxe.inf
+++ b/Vlv2TbltDevicePkg/BootScriptSaveDxe/BootScriptSaveDxe.inf
@@ -5,10 +5,10 @@
 #
 # This is an implementation of the Boot Script Save protocol.
 # Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.inf b/Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.inf
index 397c2ce2a9ea..456aa7936990 100644
--- a/Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.inf
+++ b/Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.inf
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #  Module Name:
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf
index 670db1346553..11a742849848 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf
@@ -2,10 +2,10 @@
 # This driver implement the EFI_FIRMWARE_VOLUMEN_PROTOCOL.
 #
 # Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf
index 4e33c3b9fb3c..81c265092e0c 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf
@@ -2,10 +2,10 @@
 # This driver implement the EFI_SMM_FIRMWARE_VOLUMEN_PROTOCOL.
 #
 # Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.inf b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.inf
index aa2b63fe138b..21ad9cbd6a1c 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.inf
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.inf
@@ -2,10 +2,10 @@
 # Component description file for Firmware Volume Block module.
 #
 # Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 ##
diff --git a/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf b/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
index 3e53680d08cd..d20406925518 100644
--- a/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
+++ b/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
@@ -1,10 +1,10 @@
 #/*++
 #
 # Copyright (c)  2010  - 2014, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 
 #
 #  Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
index c9f0a434ace8..5d617f194281 100644
--- a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
+++ b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #   Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf b/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
index 9cb8841d65e9..1ebf43d655a0 100644
--- a/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
+++ b/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
@@ -3,10 +3,10 @@
 #/*++
 #
 # Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 
 #
 #  Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf b/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
index f30d70e01fff..6a49132b02b7 100644
--- a/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
+++ b/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
@@ -4,10 +4,10 @@
 # ICH9 Acpi timer implements one instance of Timer Library. Acpi timer cannot be programmed,
 #  so it could be used by any types of drivers, including SMM drivers and Runtime drivers.
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLib.inf b/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLib.inf
index 6b5cc2861cdb..7bcaee084201 100644
--- a/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLib.inf
+++ b/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLib.inf
@@ -3,10 +3,10 @@
 #/*++
 #
 #  Copyright (c) 2012  - 2014, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #  Module Name:
 #
diff --git a/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf b/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
index 9d4823d48817..d2b831630ee1 100644
--- a/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
+++ b/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
@@ -4,10 +4,10 @@
 # ICH SMM Library that layers on top of the I/O Library to directly
 #  access SMM power management registers.
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.inf b/Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.inf
index c5d8b6659168..568fe7729df3 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.inf
+++ b/Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.inf
@@ -1,10 +1,10 @@
 #/** @file
 #
 # Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #**/
diff --git a/Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf b/Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf
index ddd97c5ad9f5..f6542911d778 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf
+++ b/Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.inf b/Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.inf
index db1a92b34e88..43f2b14626fb 100644
--- a/Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.inf
+++ b/Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.inf
@@ -4,10 +4,10 @@
 # Reset System Library that layers on top of the I/O Library to directly
 #  access a standard SMBUS host controller.
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/Library/SerialPortLib/SerialPortLib.inf b/Vlv2TbltDevicePkg/Library/SerialPortLib/SerialPortLib.inf
index 0e7a6d3cfc6d..b24114eda0db 100644
--- a/Vlv2TbltDevicePkg/Library/SerialPortLib/SerialPortLib.inf
+++ b/Vlv2TbltDevicePkg/Library/SerialPortLib/SerialPortLib.inf
@@ -1,10 +1,10 @@
 #/** @file
 #
 # Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.inf b/Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.inf
index b13e3de0cc3d..26660b5c8799 100644
--- a/Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.inf
+++ b/Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.inf
@@ -4,10 +4,10 @@
 # SMBUS Library that layers on top of the I/O Library to directly
 #  access a standard SMBUS host controller.
 # Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf b/Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
index 703ea3238ca5..ede76a107a31 100644
--- a/Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
+++ b/Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
@@ -1,10 +1,10 @@
 #/*++
 #
 # Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 
 #
 #  Module Name:
diff --git a/Vlv2TbltDevicePkg/Metronome/Metronome.inf b/Vlv2TbltDevicePkg/Metronome/Metronome.inf
index 173370d652c7..9700382a23f2 100644
--- a/Vlv2TbltDevicePkg/Metronome/Metronome.inf
+++ b/Vlv2TbltDevicePkg/Metronome/Metronome.inf
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 
 #  Module Name:
diff --git a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf
index a0837917d879..3714ae8e0d02 100644
--- a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf
+++ b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf
@@ -1,10 +1,10 @@
 #/*++
 #
 # Copyright (c)  2003  - 2018, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 
 #
 #  Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf b/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf
index 948793f719ee..b39f0670071b 100644
--- a/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf
+++ b/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 ##
diff --git a/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf b/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf
index ae3c2bf41b30..c00d9090ebab 100644
--- a/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf
+++ b/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #  Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf b/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
index 6d7e7c3f6caf..e604af4bb2d7 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #  This driver produces UEFI PLATFORM_DRIVER_OVERRIDE_PROTOCOL if this protocol doesn't exist.
diff --git a/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf b/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf
index 1b7b05d9b3f1..710003111f42 100644
--- a/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf
+++ b/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c)  1999  - 2018, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #  Module Name:
diff --git a/Vlv2TbltDevicePkg/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf b/Vlv2TbltDevicePkg/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
index 4f95fc281e65..2c1ad1ef0a1b 100644
--- a/Vlv2TbltDevicePkg/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
+++ b/Vlv2TbltDevicePkg/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
@@ -2,10 +2,10 @@
 #  Component description file for SMM SwDispatch2 Protocol on SMM SwDispatch Protocol Thunk driver.
 #
 #  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf b/Vlv2TbltDevicePkg/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf
index ec42c84472cc..cd82384664b7 100644
--- a/Vlv2TbltDevicePkg/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf
+++ b/Vlv2TbltDevicePkg/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf
@@ -3,10 +3,10 @@
 #  A helper driver to save information to SMRAM after SMRR is enabled.
 #
 #  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/UiApp/UiApp.inf b/Vlv2TbltDevicePkg/UiApp/UiApp.inf
index f7a0a83b801c..423b8319c935 100644
--- a/Vlv2TbltDevicePkg/UiApp/UiApp.inf
+++ b/Vlv2TbltDevicePkg/UiApp/UiApp.inf
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 ##
 
diff --git a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf
index 9d277dd7cff3..4dad8541a949 100644
--- a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf
+++ b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf
@@ -3,10 +3,10 @@
 #/*++
 #
 #  Copyright (c)  1999  - 2018, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #  Module Name:
 #
diff --git a/Vlv2TbltDevicePkg/Wpce791/Wpce791.inf b/Vlv2TbltDevicePkg/Wpce791/Wpce791.inf
index 5fd458e265f8..8d44c2aed577 100644
--- a/Vlv2TbltDevicePkg/Wpce791/Wpce791.inf
+++ b/Vlv2TbltDevicePkg/Wpce791/Wpce791.inf
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h
index 598756846ae6..b9177e497d05 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooks.h b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooks.h
index 471894961075..396eba14a1f8 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooks.h
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooks.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooksLib.h b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooksLib.h
index a253d64ec064..c94fa0aa6fcd 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooksLib.h
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooksLib.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/Osfr.h b/Vlv2TbltDevicePkg/AcpiPlatform/Osfr.h
index 4d98db7592eb..630c5d834f8d 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/Osfr.h
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/Osfr.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.h b/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.h
index 745fb3aca41b..858ea1e1b140 100644
--- a/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.h
+++ b/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.h
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 1999  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/BootScriptSaveDxe/InternalBootScriptSave.h b/Vlv2TbltDevicePkg/BootScriptSaveDxe/InternalBootScriptSave.h
index f232281e2bbc..d95bd11664a2 100644
--- a/Vlv2TbltDevicePkg/BootScriptSaveDxe/InternalBootScriptSave.h
+++ b/Vlv2TbltDevicePkg/BootScriptSaveDxe/InternalBootScriptSave.h
@@ -4,10 +4,10 @@
   Internal header file for S3 Boot Script Saver driver.
 
   Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.h b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.h
index 89e0212f9838..4b7fb857c9fb 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.h
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.h
@@ -2,10 +2,10 @@
   The header file for Firmware volume block driver.
 
 Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmCommon.h b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmCommon.h
index 236e487111e4..533cfc5a5c6e 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmCommon.h
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmCommon.h
@@ -3,10 +3,10 @@
   The common header file for SMM FVB module and SMM FVB runtime Module.
 
 Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved. <BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.h b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.h
index 9edb1bcaf097..7b4a4aa7233f 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.h
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.h
@@ -4,10 +4,10 @@
   internal structure and functions used by FVB module.
 
 Copyright (c) 2010  - 2014, Intel Corporation. All rights reserved. <BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Include/AlertStandardFormatTable.h b/Vlv2TbltDevicePkg/Include/AlertStandardFormatTable.h
index 3b0f00198bed..05e262943449 100644
--- a/Vlv2TbltDevicePkg/Include/AlertStandardFormatTable.h
+++ b/Vlv2TbltDevicePkg/Include/AlertStandardFormatTable.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/ChipsetAccess.h b/Vlv2TbltDevicePkg/Include/ChipsetAccess.h
index 31ccfe6d5fca..9338d099c0af 100644
--- a/Vlv2TbltDevicePkg/Include/ChipsetAccess.h
+++ b/Vlv2TbltDevicePkg/Include/ChipsetAccess.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/CommonIncludes.h b/Vlv2TbltDevicePkg/Include/CommonIncludes.h
index eab47b28d921..8b60ebffe4f2 100644
--- a/Vlv2TbltDevicePkg/Include/CommonIncludes.h
+++ b/Vlv2TbltDevicePkg/Include/CommonIncludes.h
@@ -1,10 +1,10 @@
 /**
 
 Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 @file
   CommonIncludes.h
diff --git a/Vlv2TbltDevicePkg/Include/CpuType.h b/Vlv2TbltDevicePkg/Include/CpuType.h
index c195dee77389..5af055cfb370 100644
--- a/Vlv2TbltDevicePkg/Include/CpuType.h
+++ b/Vlv2TbltDevicePkg/Include/CpuType.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/FileHandleLib.h b/Vlv2TbltDevicePkg/Include/FileHandleLib.h
index 5d733a024015..4297fa454489 100644
--- a/Vlv2TbltDevicePkg/Include/FileHandleLib.h
+++ b/Vlv2TbltDevicePkg/Include/FileHandleLib.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Include/Guid/AcpiTableStorage.h b/Vlv2TbltDevicePkg/Include/Guid/AcpiTableStorage.h
index 7320bf6cfe9f..235d61653242 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/AcpiTableStorage.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/AcpiTableStorage.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Guid/AlertStandardFormat.h b/Vlv2TbltDevicePkg/Include/Guid/AlertStandardFormat.h
index f0459545e4ea..3075bb11b3e1 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/AlertStandardFormat.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/AlertStandardFormat.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/Guid/BiosId.h b/Vlv2TbltDevicePkg/Include/Guid/BiosId.h
index e86fc852fcdc..bd60b85a073a 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/BiosId.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/BiosId.h
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Guid/BoardFeatures.h b/Vlv2TbltDevicePkg/Include/Guid/BoardFeatures.h
index ae3c2d9aea70..7f2aa984ccab 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/BoardFeatures.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/BoardFeatures.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Guid/EfiVpdData.h b/Vlv2TbltDevicePkg/Include/Guid/EfiVpdData.h
index e00e582ce1ee..c9491c9d7e73 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/EfiVpdData.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/EfiVpdData.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Guid/FirmwareId.h b/Vlv2TbltDevicePkg/Include/Guid/FirmwareId.h
index fd524b8ce58e..71395ef20aef 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/FirmwareId.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/FirmwareId.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Guid/HwWatchdogTimerHob.h b/Vlv2TbltDevicePkg/Include/Guid/HwWatchdogTimerHob.h
index 3cd6c843b196..97de59e3a17a 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/HwWatchdogTimerHob.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/HwWatchdogTimerHob.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Guid/IdccData.h b/Vlv2TbltDevicePkg/Include/Guid/IdccData.h
index 7e3b96566658..d6e58b9baed2 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/IdccData.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/IdccData.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Guid/ItkData.h b/Vlv2TbltDevicePkg/Include/Guid/ItkData.h
index e7bd29e6e49f..82f68a2a8d3e 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/ItkData.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/ItkData.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/Guid/MemoryConfigData.h b/Vlv2TbltDevicePkg/Include/Guid/MemoryConfigData.h
index 0fe759a16efa..6dbc9c488f50 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/MemoryConfigData.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/MemoryConfigData.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/Include/Guid/OsSelection.h b/Vlv2TbltDevicePkg/Include/Guid/OsSelection.h
index e7bbcf67c90f..93abfa9c35f0 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/OsSelection.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/OsSelection.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Guid/PciLanInfo.h b/Vlv2TbltDevicePkg/Include/Guid/PciLanInfo.h
index 46c45b030317..702ca45f69e7 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/PciLanInfo.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/PciLanInfo.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h b/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h
index f1756662bd54..2ebaac371c20 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h b/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
index cac31e2a40a3..799012647d8d 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/Include/Guid/SensorInfoVariable.h b/Vlv2TbltDevicePkg/Include/Guid/SensorInfoVariable.h
index 19eee2b72901..ead7e451c5ad 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/SensorInfoVariable.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/SensorInfoVariable.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/Include/Hpet.h b/Vlv2TbltDevicePkg/Include/Hpet.h
index e448ee97963f..56b7c6dd338c 100644
--- a/Vlv2TbltDevicePkg/Include/Hpet.h
+++ b/Vlv2TbltDevicePkg/Include/Hpet.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h b/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
index 484b35826476..bfd026e6b3e1 100644
--- a/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
+++ b/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h b/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h
index 78c78319ce72..043b92025229 100644
--- a/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h
+++ b/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Library/EfiRegTableLib.h b/Vlv2TbltDevicePkg/Include/Library/EfiRegTableLib.h
index 915f8b39d9f6..ac4883c78a91 100644
--- a/Vlv2TbltDevicePkg/Include/Library/EfiRegTableLib.h
+++ b/Vlv2TbltDevicePkg/Include/Library/EfiRegTableLib.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Library/Esrt.h b/Vlv2TbltDevicePkg/Include/Library/Esrt.h
index a92a27cade33..bce6664be917 100644
--- a/Vlv2TbltDevicePkg/Include/Library/Esrt.h
+++ b/Vlv2TbltDevicePkg/Include/Library/Esrt.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Library/Fd.h b/Vlv2TbltDevicePkg/Include/Library/Fd.h
index a54ac1116260..10ca3dc4586b 100644
--- a/Vlv2TbltDevicePkg/Include/Library/Fd.h
+++ b/Vlv2TbltDevicePkg/Include/Library/Fd.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/Include/Library/FlashDeviceLib.h b/Vlv2TbltDevicePkg/Include/Library/FlashDeviceLib.h
index 43c5e8858659..3dd46efb6816 100644
--- a/Vlv2TbltDevicePkg/Include/Library/FlashDeviceLib.h
+++ b/Vlv2TbltDevicePkg/Include/Library/FlashDeviceLib.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
   Flash device library class header file.
diff --git a/Vlv2TbltDevicePkg/Include/Library/I2cMmioConfigLib.h b/Vlv2TbltDevicePkg/Include/Library/I2cMmioConfigLib.h
index 7eea7e1d292a..4459f6e073ff 100644
--- a/Vlv2TbltDevicePkg/Include/Library/I2cMmioConfigLib.h
+++ b/Vlv2TbltDevicePkg/Include/Library/I2cMmioConfigLib.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Include/Library/I2cPort_platform.h b/Vlv2TbltDevicePkg/Include/Library/I2cPort_platform.h
index 9975faeac802..dd2d67a5a06f 100644
--- a/Vlv2TbltDevicePkg/Include/Library/I2cPort_platform.h
+++ b/Vlv2TbltDevicePkg/Include/Library/I2cPort_platform.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Include/Library/PlatformFsaLib.h b/Vlv2TbltDevicePkg/Include/Library/PlatformFsaLib.h
index 06dab3016bc3..d300b1645402 100644
--- a/Vlv2TbltDevicePkg/Include/Library/PlatformFsaLib.h
+++ b/Vlv2TbltDevicePkg/Include/Library/PlatformFsaLib.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 --*/
 
diff --git a/Vlv2TbltDevicePkg/Include/Library/PlatformFspLib.h b/Vlv2TbltDevicePkg/Include/Library/PlatformFspLib.h
index c3235afa90c0..5223d71a0135 100644
--- a/Vlv2TbltDevicePkg/Include/Library/PlatformFspLib.h
+++ b/Vlv2TbltDevicePkg/Include/Library/PlatformFspLib.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 --*/
 
diff --git a/Vlv2TbltDevicePkg/Include/Library/StallSmmLib.h b/Vlv2TbltDevicePkg/Include/Library/StallSmmLib.h
index 49baffdcc566..2769247e7483 100644
--- a/Vlv2TbltDevicePkg/Include/Library/StallSmmLib.h
+++ b/Vlv2TbltDevicePkg/Include/Library/StallSmmLib.h
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/Library/UsbDeviceModeLib.h b/Vlv2TbltDevicePkg/Include/Library/UsbDeviceModeLib.h
index c52417f00fd2..300d8ff29fba 100644
--- a/Vlv2TbltDevicePkg/Include/Library/UsbDeviceModeLib.h
+++ b/Vlv2TbltDevicePkg/Include/Library/UsbDeviceModeLib.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Include/Mcfg.h b/Vlv2TbltDevicePkg/Include/Mcfg.h
index 2751a27d2dae..a27c55f818a4 100644
--- a/Vlv2TbltDevicePkg/Include/Mcfg.h
+++ b/Vlv2TbltDevicePkg/Include/Mcfg.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/McfgTable.h b/Vlv2TbltDevicePkg/Include/McfgTable.h
index dc9dc49e7488..1ea8e6edf180 100644
--- a/Vlv2TbltDevicePkg/Include/McfgTable.h
+++ b/Vlv2TbltDevicePkg/Include/McfgTable.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/Platform.h b/Vlv2TbltDevicePkg/Include/Platform.h
index 4d1932febd55..8d8f4067fbc8 100644
--- a/Vlv2TbltDevicePkg/Include/Platform.h
+++ b/Vlv2TbltDevicePkg/Include/Platform.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/PlatformBootMode.h b/Vlv2TbltDevicePkg/Include/PlatformBootMode.h
index 812077ce144f..edc56b12bcbe 100644
--- a/Vlv2TbltDevicePkg/Include/PlatformBootMode.h
+++ b/Vlv2TbltDevicePkg/Include/PlatformBootMode.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h b/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
index a64cda07990e..af602b661d29 100644
--- a/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
+++ b/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Ppi/MfgMemoryTest.h b/Vlv2TbltDevicePkg/Include/Ppi/MfgMemoryTest.h
index 353c80b62948..ac5eeb3ce3e6 100644
--- a/Vlv2TbltDevicePkg/Include/Ppi/MfgMemoryTest.h
+++ b/Vlv2TbltDevicePkg/Include/Ppi/MfgMemoryTest.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/Ppi/Sha256Hash.h b/Vlv2TbltDevicePkg/Include/Ppi/Sha256Hash.h
index 1c9b2b9ea17d..0e17b9c2ed6b 100644
--- a/Vlv2TbltDevicePkg/Include/Ppi/Sha256Hash.h
+++ b/Vlv2TbltDevicePkg/Include/Ppi/Sha256Hash.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/Ppi/Speaker.h b/Vlv2TbltDevicePkg/Include/Ppi/Speaker.h
index b8c817e4ca0b..674d801a851f 100644
--- a/Vlv2TbltDevicePkg/Include/Ppi/Speaker.h
+++ b/Vlv2TbltDevicePkg/Include/Ppi/Speaker.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/Ppi/UsbController.h b/Vlv2TbltDevicePkg/Include/Ppi/UsbController.h
index 54485661169a..7436a3755c30 100644
--- a/Vlv2TbltDevicePkg/Include/Ppi/UsbController.h
+++ b/Vlv2TbltDevicePkg/Include/Ppi/UsbController.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
   Define APIs to retrieve USB Host Controller Info such as controller type and
   I/O Port Base Address.
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/CK505ClockPlatformInfo.h b/Vlv2TbltDevicePkg/Include/Protocol/CK505ClockPlatformInfo.h
index daf5d22d7190..ae6ee8cd9eb9 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/CK505ClockPlatformInfo.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/CK505ClockPlatformInfo.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/EnhancedSpeedstep.h b/Vlv2TbltDevicePkg/Include/Protocol/EnhancedSpeedstep.h
index 9b7418084520..5a9a56a2249e 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/EnhancedSpeedstep.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/EnhancedSpeedstep.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/HwWatchdogTimer.h b/Vlv2TbltDevicePkg/Include/Protocol/HwWatchdogTimer.h
index 71fe6275eea3..021bb9779d49 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/HwWatchdogTimer.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/HwWatchdogTimer.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/I2cAcpi.h b/Vlv2TbltDevicePkg/Include/Protocol/I2cAcpi.h
index 9ec5e1473b04..d079ff8cdb76 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/I2cAcpi.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/I2cAcpi.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 **/
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/I2cBus.h b/Vlv2TbltDevicePkg/Include/Protocol/I2cBus.h
index b321a026b2a0..053b4003545c 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/I2cBus.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/I2cBus.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/I2cBusMcg.h b/Vlv2TbltDevicePkg/Include/Protocol/I2cBusMcg.h
index 1cfca218bd4f..00bb080d03bc 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/I2cBusMcg.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/I2cBusMcg.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/I2cHostMcg.h b/Vlv2TbltDevicePkg/Include/Protocol/I2cHostMcg.h
index 1d94ee41064b..e937db070cfb 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/I2cHostMcg.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/I2cHostMcg.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/I2cMasterMcg.h b/Vlv2TbltDevicePkg/Include/Protocol/I2cMasterMcg.h
index 5ca47b2c7fc5..b5c0d3ac3042 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/I2cMasterMcg.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/I2cMasterMcg.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
   \section I2cDriverStack       I2C Driver Stack
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/I2cSlave.h b/Vlv2TbltDevicePkg/Include/Protocol/I2cSlave.h
index 64cb2b739888..2b101b7f872c 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/I2cSlave.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/I2cSlave.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 **/
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/LpcWpc83627Policy.h b/Vlv2TbltDevicePkg/Include/Protocol/LpcWpc83627Policy.h
index 62d026f13347..ed3ac240a461 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/LpcWpc83627Policy.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/LpcWpc83627Policy.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/LpcWpce791Policy.h b/Vlv2TbltDevicePkg/Include/Protocol/LpcWpce791Policy.h
index 1b2459e54ad7..3aeb981142cd 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/LpcWpce791Policy.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/LpcWpce791Policy.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/MmioDevice.h b/Vlv2TbltDevicePkg/Include/Protocol/MmioDevice.h
index 3c0eb5201a22..0c7cd682e7d3 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/MmioDevice.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/MmioDevice.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/Observable.h b/Vlv2TbltDevicePkg/Include/Protocol/Observable.h
index bc5571e6d58b..21edbb4b9455 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/Observable.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/Observable.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/PlatformGopPolicy.h b/Vlv2TbltDevicePkg/Include/Protocol/PlatformGopPolicy.h
index ef2ad3d5582f..fc7d17778547 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/PlatformGopPolicy.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/PlatformGopPolicy.h
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 --*/
 
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/PlatformIdeInit.h b/Vlv2TbltDevicePkg/Include/Protocol/PlatformIdeInit.h
index a8b6900d16e2..4e31940f969f 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/PlatformIdeInit.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/PlatformIdeInit.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/SetupMode.h b/Vlv2TbltDevicePkg/Include/Protocol/SetupMode.h
index 6892106a363a..2d3bd647add9 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/SetupMode.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/SetupMode.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/SmbiosSlotPopulation.h b/Vlv2TbltDevicePkg/Include/Protocol/SmbiosSlotPopulation.h
index ac051d175908..185389641cc7 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/SmbiosSlotPopulation.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/SmbiosSlotPopulation.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/Speaker.h b/Vlv2TbltDevicePkg/Include/Protocol/Speaker.h
index 9bffcad24e0f..aa68c666f872 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/Speaker.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/Speaker.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/TcoReset.h b/Vlv2TbltDevicePkg/Include/Protocol/TcoReset.h
index bda47c359dbc..35e1b982687b 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/TcoReset.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/TcoReset.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/TpmMp.h b/Vlv2TbltDevicePkg/Include/Protocol/TpmMp.h
index 415e53daf29a..a9fdace5e4dd 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/TpmMp.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/TpmMp.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/UsbPolicy.h b/Vlv2TbltDevicePkg/Include/Protocol/UsbPolicy.h
index 16e9f9c6bc77..a076a9770ab6 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/UsbPolicy.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/UsbPolicy.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
   UsbPolicy.h
diff --git a/Vlv2TbltDevicePkg/Include/SetupMode.h b/Vlv2TbltDevicePkg/Include/SetupMode.h
index 53abd1d3a62f..6b96416c505c 100644
--- a/Vlv2TbltDevicePkg/Include/SetupMode.h
+++ b/Vlv2TbltDevicePkg/Include/SetupMode.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/CommonHeader.h b/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/CommonHeader.h
index 794c9178f1fa..0e1dfe8a6310 100644
--- a/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/CommonHeader.h
+++ b/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/CommonHeader.h
@@ -4,10 +4,10 @@
   This file includes package header files, library classes and protocol, PPI & GUID definitions.
 
   Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.h b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.h
index e153933d72a6..b6ca2dd21744 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.h
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.h
@@ -4,10 +4,10 @@
   This file includes package header files, library classes.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 **/
 
 #ifndef _BOARD_CLK_GEN_H_
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.h b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.h
index 0e19819b22f6..7482f312fdba 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.h
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.h
@@ -4,10 +4,10 @@
   This file includes package header files, library classes.
 
   Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 **/
 
 #ifndef _BOARDGPIOS_H_
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardJumpers/BoardJumpers.h b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardJumpers/BoardJumpers.h
index 7c1fc8890996..0abee7cd3d16 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardJumpers/BoardJumpers.h
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardJumpers/BoardJumpers.h
@@ -4,10 +4,10 @@
   This file includes package header files, library classes.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 **/
 
 #ifndef _BOARDJUMPERS_H_
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.h b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.h
index 3598a21a6195..1b083dd03f17 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.h
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.h
@@ -4,10 +4,10 @@
   This file includes package header files, library classes.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 **/
 
 #include <Guid/PlatformInfo.h>
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.h b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.h
index 6a9995c34c5e..2264d6e7f4a2 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.h
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.h
@@ -4,10 +4,10 @@
   This file includes package header files, library classes.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 **/
 
 #include <Guid/PlatformInfo.h>
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.h b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.h
index 807ca20acb59..76309c3880e9 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.h
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.h
@@ -4,10 +4,10 @@
   This file includes package header files, library classes.
 
   Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 **/
 
 #ifndef _MULTIPLATFORM_LIB_H_
diff --git a/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLibrary.h b/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLibrary.h
index da1f77f680b6..c4c0a8c7c0e2 100644
--- a/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLibrary.h
+++ b/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLibrary.h
@@ -3,10 +3,10 @@
 /**
 
 Copyright (c) 2012  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
   @file
   PchPlatformLibrary.h
diff --git a/Vlv2TbltDevicePkg/Library/PchSmmLib/CommonHeader.h b/Vlv2TbltDevicePkg/Library/PchSmmLib/CommonHeader.h
index e0a1f3a0f74e..f9e3a3abb5ef 100644
--- a/Vlv2TbltDevicePkg/Library/PchSmmLib/CommonHeader.h
+++ b/Vlv2TbltDevicePkg/Library/PchSmmLib/CommonHeader.h
@@ -4,10 +4,10 @@
   This file includes package header files, library classes and protocol, PPI & GUID definitions.
 
   Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 **/
 
 #ifndef __COMMON_HEADER_H_
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.h b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.h
index b5bb5197473f..09652fc05d9a 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.h
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/SmbusLib/CommonHeader.h b/Vlv2TbltDevicePkg/Library/SmbusLib/CommonHeader.h
index d34dd942d35b..1efba04b70a5 100644
--- a/Vlv2TbltDevicePkg/Library/SmbusLib/CommonHeader.h
+++ b/Vlv2TbltDevicePkg/Library/SmbusLib/CommonHeader.h
@@ -4,10 +4,10 @@
   This file includes package header files, library classes.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 **/
 
 #ifndef __COMMON_HEADER_H_
diff --git a/Vlv2TbltDevicePkg/Metronome/LegacyMetronome.h b/Vlv2TbltDevicePkg/Metronome/LegacyMetronome.h
index 9599eca70272..7c32cbff8695 100644
--- a/Vlv2TbltDevicePkg/Metronome/LegacyMetronome.h
+++ b/Vlv2TbltDevicePkg/Metronome/LegacyMetronome.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/MonoStatusCode/EfiStatusCode.h b/Vlv2TbltDevicePkg/MonoStatusCode/EfiStatusCode.h
index 1d396ffde2e4..9f34c10b2fb0 100644
--- a/Vlv2TbltDevicePkg/MonoStatusCode/EfiStatusCode.h
+++ b/Vlv2TbltDevicePkg/MonoStatusCode/EfiStatusCode.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.h b/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.h
index 0b256093a6f2..0d2ecc517081 100644
--- a/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.h
+++ b/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.h b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.h
index cd846eae75ff..752ab92cfd4e 100644
--- a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.h
+++ b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.h b/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.h
index b13611f4f8b3..80d0d6548cc6 100644
--- a/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.h
+++ b/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/AzaliaVerbTable.h b/Vlv2TbltDevicePkg/PlatformDxe/AzaliaVerbTable.h
index 331d0cbede6a..0d9377ac5076 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/AzaliaVerbTable.h
+++ b/Vlv2TbltDevicePkg/PlatformDxe/AzaliaVerbTable.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 --*/
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/BoardIdDecode.h b/Vlv2TbltDevicePkg/PlatformDxe/BoardIdDecode.h
index 8068768a3a5a..3af0269abc1d 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/BoardIdDecode.h
+++ b/Vlv2TbltDevicePkg/PlatformDxe/BoardIdDecode.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/Configuration.h b/Vlv2TbltDevicePkg/PlatformDxe/Configuration.h
index 23e03111c914..9c194dc2e38d 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/Configuration.h
+++ b/Vlv2TbltDevicePkg/PlatformDxe/Configuration.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/LegacySpeaker.h b/Vlv2TbltDevicePkg/PlatformDxe/LegacySpeaker.h
index 0ab39b78fa7c..fb73a0799209 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/LegacySpeaker.h
+++ b/Vlv2TbltDevicePkg/PlatformDxe/LegacySpeaker.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/Observable/Observable.h b/Vlv2TbltDevicePkg/PlatformDxe/Observable/Observable.h
index f46efe0f1b12..fe2a32fd063d 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/Observable/Observable.h
+++ b/Vlv2TbltDevicePkg/PlatformDxe/Observable/Observable.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/PciBus.h b/Vlv2TbltDevicePkg/PlatformDxe/PciBus.h
index 40c0d99392da..221512ebe4b3 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/PciBus.h
+++ b/Vlv2TbltDevicePkg/PlatformDxe/PciBus.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/SlotConfig.h b/Vlv2TbltDevicePkg/PlatformDxe/SlotConfig.h
index 738798261bd5..6635325b4dcf 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/SlotConfig.h
+++ b/Vlv2TbltDevicePkg/PlatformDxe/SlotConfig.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.h b/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.h
index 615b32bb08ae..58b20a6ea029 100644
--- a/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.h
+++ b/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
   PlatformInfoDxe.h
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/LegacySpeaker.h b/Vlv2TbltDevicePkg/PlatformInitPei/LegacySpeaker.h
index dee022bf9b41..ef94fa6d4d72 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/LegacySpeaker.h
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/LegacySpeaker.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
index 29749277d77b..4f42bc1be153 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformPei/CommonHeader.h b/Vlv2TbltDevicePkg/PlatformPei/CommonHeader.h
index 283993b44c35..2ec367a46bd0 100644
--- a/Vlv2TbltDevicePkg/PlatformPei/CommonHeader.h
+++ b/Vlv2TbltDevicePkg/PlatformPei/CommonHeader.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/PlatformPei/Platform.h b/Vlv2TbltDevicePkg/PlatformPei/Platform.h
index e1817b28c6e1..41fde9f0343b 100644
--- a/Vlv2TbltDevicePkg/PlatformPei/Platform.h
+++ b/Vlv2TbltDevicePkg/PlatformPei/Platform.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 **/
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/Configuration.h b/Vlv2TbltDevicePkg/PlatformSetupDxe/Configuration.h
index 7d7920c244b1..0cde40d23da9 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/Configuration.h
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/Configuration.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h b/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h
index 53372bb922ce..23d6b2001af2 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 **/
diff --git a/Vlv2TbltDevicePkg/PlatformSmm/SmmPlatform.h b/Vlv2TbltDevicePkg/PlatformSmm/SmmPlatform.h
index 8bf2ebafc154..55daa2bb7039 100644
--- a/Vlv2TbltDevicePkg/PlatformSmm/SmmPlatform.h
+++ b/Vlv2TbltDevicePkg/PlatformSmm/SmmPlatform.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformSmm/SmmScriptSave.h b/Vlv2TbltDevicePkg/PlatformSmm/SmmScriptSave.h
index d3eca8cdc084..643fd7004a49 100644
--- a/Vlv2TbltDevicePkg/PlatformSmm/SmmScriptSave.h
+++ b/Vlv2TbltDevicePkg/PlatformSmm/SmmScriptSave.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/CommonHeader.h b/Vlv2TbltDevicePkg/SmBiosMiscDxe/CommonHeader.h
index e339b3106591..96de985359da 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/CommonHeader.h
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/CommonHeader.h
@@ -4,10 +4,10 @@
   This file includes package header files, library classes and protocol, PPI & GUID definitions.
 
   Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 **/
 
 #ifndef __COMMON_HEADER_H_
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriver.h b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriver.h
index 67ea100fadde..2da4ddbd12ab 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriver.h
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriver.h
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.h b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.h
index cd1d208d6197..6c70e9a6eddf 100644
--- a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.h
+++ b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.h
@@ -2,10 +2,10 @@
 /*++
 
 Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInit.h b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInit.h
index 5caf54bb8af1..c361602ce3c2 100644
--- a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInit.h
+++ b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInit.h
@@ -2,10 +2,10 @@
 /*++
 
 Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Wpce791/LpcDriver.h b/Vlv2TbltDevicePkg/Wpce791/LpcDriver.h
index 5e264485e71a..65651d4bd664 100644
--- a/Vlv2TbltDevicePkg/Wpce791/LpcDriver.h
+++ b/Vlv2TbltDevicePkg/Wpce791/LpcDriver.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Wpce791/LpcIsaAcpi.h b/Vlv2TbltDevicePkg/Wpce791/LpcIsaAcpi.h
index 2291fd2c1d3f..487423f7c507 100644
--- a/Vlv2TbltDevicePkg/Wpce791/LpcIsaAcpi.h
+++ b/Vlv2TbltDevicePkg/Wpce791/LpcIsaAcpi.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Wpce791/LpcSio.h b/Vlv2TbltDevicePkg/Wpce791/LpcSio.h
index 52c1499e3d86..a3bf10fc8729 100644
--- a/Vlv2TbltDevicePkg/Wpce791/LpcSio.h
+++ b/Vlv2TbltDevicePkg/Wpce791/LpcSio.h
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr b/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr
index 77976322deee..a687b21ec246 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr
@@ -2,10 +2,10 @@
 //
 //
 // Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-//                                                                                  

+//                                                                                  
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
-//                                                                                  

+//                                                                                  
 //
 //
 #include "Configuration.h"
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooks.c b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooks.c
index ebe783e29e33..e48ddc10b43c 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooks.c
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatformHooks.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c b/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c
index a2fc54e20ea3..8fc31ae7518f 100644
--- a/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c
+++ b/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2007  - 2015, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/BootScriptSaveDxe/ScriptSave.c b/Vlv2TbltDevicePkg/BootScriptSaveDxe/ScriptSave.c
index 837a8c95cd1d..d56e08c3b49a 100644
--- a/Vlv2TbltDevicePkg/BootScriptSaveDxe/ScriptSave.c
+++ b/Vlv2TbltDevicePkg/BootScriptSaveDxe/ScriptSave.c
@@ -2,10 +2,10 @@
   Implementation for S3 Boot Script Saver driver.
 
 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.c b/Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.c
index 11832bd295e1..9ae7d75dec98 100644
--- a/Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.c
+++ b/Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbInfo.c b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbInfo.c
index d3b9145db01c..004cade83a44 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbInfo.c
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbInfo.c
@@ -3,10 +3,10 @@
   These data is intent to decouple FVB driver with FV header.
 
 Copyright (c) 2006  - 2015, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
index aa4fab013da9..5ff63db0c056 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
@@ -5,10 +5,10 @@
   It depends on which Flash Device Library to be linked with this driver.
 
 Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbServiceDxe.c b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbServiceDxe.c
index 32aa216728fb..639819a2e9f5 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbServiceDxe.c
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbServiceDxe.c
@@ -5,10 +5,10 @@
   It depends on which Flash Device Library to be linked with this driver.
 
 Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbServiceSmm.c b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbServiceSmm.c
index d1360bb90d0a..6fd81f7a0f82 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbServiceSmm.c
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbServiceSmm.c
@@ -5,10 +5,10 @@
   It depends on which Flash Device Library to be linked with this driver.
 
 Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.c b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.c
index e46c65c3fcb0..91430839f316 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.c
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmmDxe.c
@@ -4,10 +4,10 @@
   module and install FVB protocol.
 
 Copyright (c) 2010  - 2014, Intel Corporation. All rights reserved. <BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c b/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
index 3f0e20c7a8a2..bc5f74034472 100644
--- a/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
+++ b/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2011  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c
index 935f11e87136..05cbc6c0f237 100644
--- a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c
+++ b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c
index cb8de2f9c73e..34f200d66b48 100644
--- a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c
+++ b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c b/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
index b7d896d9fdb4..b7226a114ff3 100644
--- a/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
+++ b/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/I2CLib/I2CLib.c b/Vlv2TbltDevicePkg/Library/I2CLib/I2CLib.c
index 85f066a9e3fb..ddc6ee79e875 100644
--- a/Vlv2TbltDevicePkg/Library/I2CLib/I2CLib.c
+++ b/Vlv2TbltDevicePkg/Library/I2CLib/I2CLib.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.c b/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.c
index af44c6bd274a..dda9da94683a 100644
--- a/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.c
+++ b/Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.c
@@ -2,10 +2,10 @@
   ICH9 ACPI Timer implements one instance of Timer Library.
 
 Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
index 919032c2dfb3..cf1b685dc11e 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
@@ -2,10 +2,10 @@
   Clock generator setting for multiplatform.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
index 5790d045fc23..948b05c3d0f6 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
@@ -2,10 +2,10 @@
   Gpio setting for multiplatform..
 
   Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardJumpers/BoardJumpers.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardJumpers/BoardJumpers.c
index 67f5e24edee4..cd9aa4077024 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardJumpers/BoardJumpers.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardJumpers/BoardJumpers.c
@@ -2,10 +2,10 @@
   Jumper setting for multiplatform.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
index bb3f4c0a33eb..1d25084300eb 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
@@ -2,10 +2,10 @@
   ACPI oem ids setting for multiplatform.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
index 77764945c3fd..1914cdb1de7a 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
@@ -2,10 +2,10 @@
   Subsystem IDs setting for multiplatform.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.c
index d24e90c7f41c..8dacc0329ac9 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.c
@@ -2,10 +2,10 @@
   Multiplatform initialization.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c
index efa3619a76c9..2ba4abb3ea3c 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c
@@ -2,10 +2,10 @@
   Platform Hob access interface for multiplatform.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLibrary.c b/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLibrary.c
index c31fd754cb7c..3b07d1fef8d5 100644
--- a/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLibrary.c
+++ b/Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLibrary.c
@@ -1,10 +1,10 @@
 /**
 
 Copyright (c) 2012  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
   @file
   PchPlatformLib.c
diff --git a/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.c b/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.c
index 2b0aacaccf04..cebaceeb2fe9 100644
--- a/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.c
+++ b/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.c
@@ -2,10 +2,10 @@
   PCH Smm Library Services that implements both S/W SMI generation and detection.
 
   Copyright (c) 2007  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformData.c b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformData.c
index 9dff93f52b4e..0737d061c523 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformData.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformData.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.c b/Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.c
index 2a02cabcaf81..105f6a777618 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.c b/Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.c
index b99c3b0122cf..c11d65ea195c 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 #include "PiPei.h"
diff --git a/Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.c b/Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.c
index fac998fefab5..fd7c55af8965 100644
--- a/Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.c
+++ b/Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.c
@@ -3,7 +3,7 @@
   Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/SerialPortLib/SioInit.c b/Vlv2TbltDevicePkg/Library/SerialPortLib/SioInit.c
index d9d48539dc03..bf4ff716798e 100644
--- a/Vlv2TbltDevicePkg/Library/SerialPortLib/SioInit.c
+++ b/Vlv2TbltDevicePkg/Library/SerialPortLib/SioInit.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.c b/Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.c
index 4052724812d6..203f76d4d35e 100644
--- a/Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.c
+++ b/Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.c
@@ -2,10 +2,10 @@
   Intel ICH9 SMBUS library implementation built upon I/O library.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmm.c b/Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmm.c
index 062994f088c2..8d77b061d962 100644
--- a/Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmm.c
+++ b/Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmm.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Metronome/LegacyMetronome.c b/Vlv2TbltDevicePkg/Metronome/LegacyMetronome.c
index b1fb4adb343c..348685c4d7c1 100644
--- a/Vlv2TbltDevicePkg/Metronome/LegacyMetronome.c
+++ b/Vlv2TbltDevicePkg/Metronome/LegacyMetronome.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.c b/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.c
index 8283483ff8a8..023102ec3c46 100644
--- a/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.c
+++ b/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/MonoStatusCode/PeiPostCode.c b/Vlv2TbltDevicePkg/MonoStatusCode/PeiPostCode.c
index 92dbef551e68..04b814a0b5af 100644
--- a/Vlv2TbltDevicePkg/MonoStatusCode/PeiPostCode.c
+++ b/Vlv2TbltDevicePkg/MonoStatusCode/PeiPostCode.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/MonoStatusCode/PlatformStatusCode.c b/Vlv2TbltDevicePkg/MonoStatusCode/PlatformStatusCode.c
index a1abddc512fb..7c20c2bb9804 100644
--- a/Vlv2TbltDevicePkg/MonoStatusCode/PlatformStatusCode.c
+++ b/Vlv2TbltDevicePkg/MonoStatusCode/PlatformStatusCode.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PciPlatform/BoardPciPlatform.c b/Vlv2TbltDevicePkg/PciPlatform/BoardPciPlatform.c
index 0372c175a6ca..66ee003e080e 100644
--- a/Vlv2TbltDevicePkg/PciPlatform/BoardPciPlatform.c
+++ b/Vlv2TbltDevicePkg/PciPlatform/BoardPciPlatform.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
index b135e2646c68..083559fe60fc 100644
--- a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
+++ b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.c b/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.c
index d35a15818157..aafb130c645f 100644
--- a/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.c
+++ b/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/BoardId.c b/Vlv2TbltDevicePkg/PlatformDxe/BoardId.c
index 7d774568e32b..18b9c6e2f400 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/BoardId.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/BoardId.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/BoardIdDecode.c b/Vlv2TbltDevicePkg/PlatformDxe/BoardIdDecode.c
index d4bf5df6904d..2a5a1e67e888 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/BoardIdDecode.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/BoardIdDecode.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/ClockControl.c b/Vlv2TbltDevicePkg/PlatformDxe/ClockControl.c
index 1669f0357f58..7d7e2d52039c 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/ClockControl.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/ClockControl.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/ExI.c b/Vlv2TbltDevicePkg/PlatformDxe/ExI.c
index ad667b0bd887..4f40908efa7f 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/ExI.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/ExI.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c b/Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c
index cac61bffd085..d93da502e100 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/IchTcoReset.c b/Vlv2TbltDevicePkg/PlatformDxe/IchTcoReset.c
index 5b7822deda74..b47bb98ee6e2 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/IchTcoReset.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/IchTcoReset.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/IdccInfo.c b/Vlv2TbltDevicePkg/PlatformDxe/IdccInfo.c
index 3b3e4b4c8299..c87fb5172c25 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/IdccInfo.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/IdccInfo.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/LegacySpeaker.c b/Vlv2TbltDevicePkg/PlatformDxe/LegacySpeaker.c
index 09e7fe311328..552af49e41be 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/LegacySpeaker.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/LegacySpeaker.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/Observable/Observable.c b/Vlv2TbltDevicePkg/PlatformDxe/Observable/Observable.c
index af466ce96d67..67bb54fd3954 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/Observable/Observable.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/Observable/Observable.c
@@ -7,10 +7,10 @@
 /*++
 
 Copyright (c)  2010  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c b/Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c
index 582d8627cda3..cf11ad985571 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/SensorVar.c b/Vlv2TbltDevicePkg/PlatformDxe/SensorVar.c
index 5d13e99443a4..8539e054954c 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/SensorVar.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/SensorVar.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/SioPlatformPolicy.c b/Vlv2TbltDevicePkg/PlatformDxe/SioPlatformPolicy.c
index 32bee75f9550..0c76bf23526a 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/SioPlatformPolicy.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/SioPlatformPolicy.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/SlotConfig.c b/Vlv2TbltDevicePkg/PlatformDxe/SlotConfig.c
index f9b53ead9531..4178389ce90c 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/SlotConfig.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/SlotConfig.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.c b/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.c
index 3900603d68e6..d3362ca69e52 100644
--- a/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.c
+++ b/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 --*/
 
diff --git a/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.c b/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.c
index fc784034cd7b..981dc8f6b5a7 100644
--- a/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.c
+++ b/Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/BootMode.c b/Vlv2TbltDevicePkg/PlatformInitPei/BootMode.c
index c906562c7e07..08f9873f72dc 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/BootMode.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/BootMode.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c b/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c
index a3a3d5cbc944..9c88853cc7f7 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/Dimm.c b/Vlv2TbltDevicePkg/PlatformInitPei/Dimm.c
index 3fda6313d0ed..f503f9c99c22 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/Dimm.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/Dimm.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/FlashMap.c b/Vlv2TbltDevicePkg/PlatformInitPei/FlashMap.c
index f32eaac4798c..9c3fb4a5aa9f 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/FlashMap.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/FlashMap.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/LegacySpeaker.c b/Vlv2TbltDevicePkg/PlatformInitPei/LegacySpeaker.c
index 6711f5486359..7c523b711c31 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/LegacySpeaker.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/LegacySpeaker.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/MchInit.c b/Vlv2TbltDevicePkg/PlatformInitPei/MchInit.c
index 7d1a20c104f6..522326658cdc 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/MchInit.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/MchInit.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c b/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c
index 070848ed1e38..9a83ae7225be 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/MemoryPeim.c b/Vlv2TbltDevicePkg/PlatformInitPei/MemoryPeim.c
index e6189b7713df..22cd8bfe9447 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/MemoryPeim.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/MemoryPeim.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c b/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c
index 38b17156f431..d03e8666693c 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
index a359c959203f..1a7ad827bcd4 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInfoInit.c b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInfoInit.c
index c6948d99d5d5..7575a49d1f33 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInfoInit.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInfoInit.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformSsaInitPeim.c b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformSsaInitPeim.c
index 4ffa3a20a27c..608d94299190 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformSsaInitPeim.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformSsaInitPeim.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/Recovery.c b/Vlv2TbltDevicePkg/PlatformInitPei/Recovery.c
index 53cd2c6c0cb7..8c5430f59d5b 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/Recovery.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/Recovery.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/Stall.c b/Vlv2TbltDevicePkg/PlatformInitPei/Stall.c
index d9c24c01940b..dc875ec76b31 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/Stall.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/Stall.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/PlatformPei/BootMode.c b/Vlv2TbltDevicePkg/PlatformPei/BootMode.c
index 9fdcb620a3bd..6decc3d2a474 100644
--- a/Vlv2TbltDevicePkg/PlatformPei/BootMode.c
+++ b/Vlv2TbltDevicePkg/PlatformPei/BootMode.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2018, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformPei/MemoryCallback.c b/Vlv2TbltDevicePkg/PlatformPei/MemoryCallback.c
index 7dcc2c3ce95d..396384684778 100644
--- a/Vlv2TbltDevicePkg/PlatformPei/MemoryCallback.c
+++ b/Vlv2TbltDevicePkg/PlatformPei/MemoryCallback.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
   This file includes a memory call back function notified when MRC is done,
diff --git a/Vlv2TbltDevicePkg/PlatformPei/Platform.c b/Vlv2TbltDevicePkg/PlatformPei/Platform.c
index eba1dfff30c6..382724c088e8 100644
--- a/Vlv2TbltDevicePkg/PlatformPei/Platform.c
+++ b/Vlv2TbltDevicePkg/PlatformPei/Platform.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformPei/Stall.c b/Vlv2TbltDevicePkg/PlatformPei/Stall.c
index 5e68f803db54..864360f3296a 100644
--- a/Vlv2TbltDevicePkg/PlatformPei/Stall.c
+++ b/Vlv2TbltDevicePkg/PlatformPei/Stall.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.c b/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.c
index 0bfa3e7cf45e..3ba0b0a4302d 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.c
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupFunctions.c b/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupFunctions.c
index a84b42582688..1250bf0291e7 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupFunctions.c
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupFunctions.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c b/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
index c404ada58803..895090c87d3e 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformSmm/Platform.c b/Vlv2TbltDevicePkg/PlatformSmm/Platform.c
index 8b46fbdfd193..9101fddbaad7 100644
--- a/Vlv2TbltDevicePkg/PlatformSmm/Platform.c
+++ b/Vlv2TbltDevicePkg/PlatformSmm/Platform.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/PlatformSmm/S3Save.c b/Vlv2TbltDevicePkg/PlatformSmm/S3Save.c
index 19089233b2e6..84ae38fc3e83 100644
--- a/Vlv2TbltDevicePkg/PlatformSmm/S3Save.c
+++ b/Vlv2TbltDevicePkg/PlatformSmm/S3Save.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformSmm/SmmScriptSave.c b/Vlv2TbltDevicePkg/PlatformSmm/SmmScriptSave.c
index 26599620ba5a..2eae5fb670c3 100644
--- a/Vlv2TbltDevicePkg/PlatformSmm/SmmScriptSave.c
+++ b/Vlv2TbltDevicePkg/PlatformSmm/SmmScriptSave.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerData.c
index 068a32f390d4..455539fe0c9b 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorData.c
index 91e8efc22845..5ed1c5518878 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c
index 1817f456cbd2..87708195dc66 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBootInformationData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBootInformationData.c
index 6b0f562261c0..c3cc85ebe0b4 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBootInformationData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBootInformationData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBootInformationFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBootInformationFunction.c
index 0d4d50c6632c..e47e35cf01bd 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBootInformationFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBootInformationFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerData.c
index ee11c9eac464..6d88a6cc9e33 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
index c42ba3d0d192..122b465ccb8f 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryDeviceData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryDeviceData.c
index 4a416dfdebf8..8096fa9d4d84 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryDeviceData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryDeviceData.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryDeviceFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryDeviceFunction.c
index 3872312c308e..c0bd1409e58d 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryDeviceFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryDeviceFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesData.c
index 1b41d8fac72f..674ffd8dabda 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemStringData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemStringData.c
index ceecaad5493c..989583301a12 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemStringData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemStringData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemStringFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemStringFunction.c
index 862448114976..d9e2c90e4215 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemStringFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemStringFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Data.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Data.c
index 9b348813a73f..9c8c70d204b8 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Data.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Data.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2012  - 2014, Intel Corporation.  All rights reserved.
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Function.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Function.c
index 684cda83ec02..c3f49ef391be 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Function.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Function.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 1999  - 2014, Intel Corporation.  All rights reserved.
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Data.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Data.c
index 8709d6184765..59fd7a1d9518 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Data.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Data.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2012  - 2014, Intel Corporation.  All rights reserved.
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Function.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Function.c
index 15c180129c9e..30e6f661d46b 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Function.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Function.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 1999  - 2014, Intel Corporation.  All rights reserved.
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOnboardDeviceData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOnboardDeviceData.c
index f82cfa89852c..69de2d72e7d2 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOnboardDeviceData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOnboardDeviceData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOnboardDeviceFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOnboardDeviceFunction.c
index aef25065b8fe..cc30b4384840 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOnboardDeviceFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOnboardDeviceFunction.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 1999  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPhysicalArrayData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPhysicalArrayData.c
index 66370f7eea03..991f41e55527 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPhysicalArrayData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPhysicalArrayData.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPhysicalArrayFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPhysicalArrayFunction.c
index 67fc04152c39..ecc7033187e1 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPhysicalArrayFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPhysicalArrayFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorData.c
index b98bab40ab1f..e7a43562c070 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorFunction.c
index 6bc088cd137f..0a32ee360fac 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorFunction.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorCacheData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorCacheData.c
index 6af7f56107ec..3be79f881f9f 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorCacheData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorCacheData.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorCacheFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorCacheFunction.c
index ca121525a0c0..2e8c26884a96 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorCacheFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorCacheFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationData.c
index 846e9ec83886..77a70e890616 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationData.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationFunction.c
index e01693ede7ff..be7e23b1b25e 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscResetCapabilitiesData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscResetCapabilitiesData.c
index e3b847f7ce23..ac3765d8a456 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscResetCapabilitiesData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscResetCapabilitiesData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscResetCapabilitiesFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscResetCapabilitiesFunction.c
index 67a549a6ba59..bbc09efd9d12 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscResetCapabilitiesFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscResetCapabilitiesFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriverDataTable.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriverDataTable.c
index 93347a1a0422..b3c3a0d3aa8f 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriverDataTable.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriverDataTable.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriverEntryPoint.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriverEntryPoint.c
index e70732f5c2f9..65817c3e08e7 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriverEntryPoint.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSubclassDriverEntryPoint.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemLanguageStringData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemLanguageStringData.c
index a9def2356019..4ae7d4531645 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemLanguageStringData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemLanguageStringData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemLanguageStringFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemLanguageStringFunction.c
index 8abfa4074af9..b4602203daa6 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemLanguageStringFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemLanguageStringFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerData.c
index dc12fa8e160c..691717879b3c 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemOptionStringData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemOptionStringData.c
index e8d5fb3ee904..b2b85a42f872 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemOptionStringData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemOptionStringData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemOptionStringFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemOptionStringFunction.c
index ee27a75e3a0f..8b73ce37e885 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemOptionStringFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemOptionStringFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemSlotDesignationData.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemSlotDesignationData.c
index 48beeb52d303..077bf26842b5 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemSlotDesignationData.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemSlotDesignationData.c
@@ -1,10 +1,10 @@
 /** @file
 
 Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemSlotDesignationFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemSlotDesignationFunction.c
index 7270ef826f71..f2d94e7796e4 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemSlotDesignationFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemSlotDesignationFunction.c
@@ -1,10 +1,10 @@
 /*++
 
 Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.c b/Vlv2TbltDevicePkg/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.c
index 0dbd6f00e160..b371e57ca98f 100644
--- a/Vlv2TbltDevicePkg/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.c
+++ b/Vlv2TbltDevicePkg/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.c
@@ -2,10 +2,10 @@
   SMM SwDispatch2 Protocol on SMM SwDispatch Protocol Thunk driver.
 
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c b/Vlv2TbltDevicePkg/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c
index de257b35b5db..c51a5b28a8ea 100644
--- a/Vlv2TbltDevicePkg/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c
+++ b/Vlv2TbltDevicePkg/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c
@@ -4,10 +4,10 @@
   This driver is for ECP platforms.
 
   Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 **/
 
diff --git a/Vlv2TbltDevicePkg/UiApp/FrontPage.c b/Vlv2TbltDevicePkg/UiApp/FrontPage.c
index 3e58a6d22a78..f199767617ab 100644
--- a/Vlv2TbltDevicePkg/UiApp/FrontPage.c
+++ b/Vlv2TbltDevicePkg/UiApp/FrontPage.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 
diff --git a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c
index ba81bd9def84..475de55eca42 100644
--- a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c
+++ b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c
@@ -2,10 +2,10 @@
 /*++
 
 Copyright (c)  2011  - 2018, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInit.c b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInit.c
index 75675fbf00b0..5f4222bf9de3 100644
--- a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInit.c
+++ b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInit.c
@@ -2,10 +2,10 @@
 /*++
 
 Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Wpce791/LpcDriver.c b/Vlv2TbltDevicePkg/Wpce791/LpcDriver.c
index f98265761b4c..91495d7a476e 100644
--- a/Vlv2TbltDevicePkg/Wpce791/LpcDriver.c
+++ b/Vlv2TbltDevicePkg/Wpce791/LpcDriver.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 
 Module Name:
diff --git a/Vlv2TbltDevicePkg/Wpce791/LpcIsaAcpi.c b/Vlv2TbltDevicePkg/Wpce791/LpcIsaAcpi.c
index 9c0b79b15c37..33a62963c727 100644
--- a/Vlv2TbltDevicePkg/Wpce791/LpcIsaAcpi.c
+++ b/Vlv2TbltDevicePkg/Wpce791/LpcIsaAcpi.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/Wpce791/LpcSio.c b/Vlv2TbltDevicePkg/Wpce791/LpcSio.c
index f23e48ccf2d3..9206575c675f 100644
--- a/Vlv2TbltDevicePkg/Wpce791/LpcSio.c
+++ b/Vlv2TbltDevicePkg/Wpce791/LpcSio.c
@@ -1,10 +1,10 @@
 /** @file
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 
 Module Name:
 
diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env
index 85313dfbd759..5d7672ab5732 100644
--- a/Vlv2TbltDevicePkg/BiosIdD.env
+++ b/Vlv2TbltDevicePkg/BiosIdD.env
@@ -9,10 +9,10 @@
 #    Example: "TRFTCRB1.86C.0008.D03.0506081529"
 #
 #  Copyright (c) 2008  - 2015, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #**/
 
diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env
index 4af249dc19d9..3c5c8b6e1619 100644
--- a/Vlv2TbltDevicePkg/BiosIdR.env
+++ b/Vlv2TbltDevicePkg/BiosIdR.env
@@ -9,10 +9,10 @@
 #    Example: "TRFTCRB1.86C.0008.D03.0506081529"
 #
 #  Copyright (c) 2008  - 2015, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #**/
 
diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env b/Vlv2TbltDevicePkg/BiosIdx64D.env
index a2173b7e44f5..bbe4d2e8f49e 100644
--- a/Vlv2TbltDevicePkg/BiosIdx64D.env
+++ b/Vlv2TbltDevicePkg/BiosIdx64D.env
@@ -9,10 +9,10 @@
 #    Example: "TRFTCRB1.86C.0008.D03.0506081529"
 #
 #  Copyright (c) 2008  - 2015, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #**/
 
diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env b/Vlv2TbltDevicePkg/BiosIdx64R.env
index c235177e1bde..fdda2e1f3b79 100644
--- a/Vlv2TbltDevicePkg/BiosIdx64R.env
+++ b/Vlv2TbltDevicePkg/BiosIdx64R.env
@@ -9,10 +9,10 @@
 #    Example: "TRFTCRB1.86C.0008.D03.0506081529"
 #
 #  Copyright (c) 2008  - 2015, Intel Corporation. All rights reserved.<BR>
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #**/
 
diff --git a/Vlv2TbltDevicePkg/Include/Library/SpiFlash.H b/Vlv2TbltDevicePkg/Include/Library/SpiFlash.H
index 335660cd4c1e..fe0846ea99ea 100644
--- a/Vlv2TbltDevicePkg/Include/Library/SpiFlash.H
+++ b/Vlv2TbltDevicePkg/Include/Library/SpiFlash.H
@@ -1,10 +1,10 @@
 /*++
 
   Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-                                                                                   

+                                                                                   
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
-                                                                                   

+                                                                                   
 **/
 
 #ifndef _SPIFlash_H_
diff --git a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S
index ba1bd448c086..0c7b9ea98e6c 100644
--- a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S
+++ b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm
index 3fdf16f8eeb0..5d20bc748ad0 100644
--- a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm
+++ b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm
@@ -7,10 +7,10 @@
 ;
 ;
 ; Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-;                                                                                  

+;                                                                                  
 ; SPDX-License-Identifier: BSD-2-Clause-Patent
 
-;                                                                                  

+;                                                                                  
 ;
 
 ;Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S
index 3a8d6e6bc50b..364bd277e312 100644
--- a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S
+++ b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S
@@ -1,10 +1,10 @@
 #
 #
 # Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-#                                                                                  

+#                                                                                  
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#                                                                                  

+#                                                                                  
 #
 #
 #*   Module Name:
diff --git a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm
index 44aae7de644b..a09988c8b731 100644
--- a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm
+++ b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm
@@ -10,10 +10,10 @@ TITLE   Cpu.asm: Assembly code for the x64 resources
 ;
 ;
 ; Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
-;                                                                                  

+;                                                                                  
 ; SPDX-License-Identifier: BSD-2-Clause-Patent
 
-;                                                                                  

+;                                                                                  
 ;
 ;
 ;
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/Boot.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/Boot.vfi
index 9c155e5328d4..bae2bdcee990 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/Boot.vfi
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/Boot.vfi
@@ -1,10 +1,10 @@
 //
 //
 // Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-//                                                                                  

+//                                                                                  
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
-//                                                                                  

+//                                                                                  
 //
 //
 // Module Name:
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/DebugConfig.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/DebugConfig.vfi
index eea41a520285..940a6c1c04b0 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/DebugConfig.vfi
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/DebugConfig.vfi
@@ -1,10 +1,10 @@
 //
 //
 // Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-//                                                                                  

+//                                                                                  
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
-//                                                                                  

+//                                                                                  
 //
 //
 //
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/Main.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/Main.vfi
index 6093262e3fd3..bd4aa12e54fa 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/Main.vfi
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/Main.vfi
@@ -1,10 +1,10 @@
 //
 //
 // Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-//                                                                                  

+//                                                                                  
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
-//                                                                                  

+//                                                                                  
 //
 //
 //
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi
index 49669e684dce..0c1948957716 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi
@@ -1,10 +1,10 @@
 //
 //
 // Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-//                                                                                  

+//                                                                                  
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
-//                                                                                  

+//                                                                                  
 //
 //
 //
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/SystemComponent.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/SystemComponent.vfi
index 96cf470eaf05..438218e5cb93 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/SystemComponent.vfi
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/SystemComponent.vfi
@@ -1,10 +1,10 @@
 //
 //
 // Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-//                                                                                  

+//                                                                                  
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
-//                                                                                  

+//                                                                                  
 //
 //
 //
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/Thermal.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/Thermal.vfi
index 63063a73b254..9916f96f4f71 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/Thermal.vfi
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/Thermal.vfi
@@ -1,10 +1,10 @@
 //
 //
 // Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-//                                                                                  

+//                                                                                  
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
-//                                                                                  

+//                                                                                  
 //
 //
 //
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/UnCore.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/UnCore.vfi
index ed6bb3a00ba8..7165efb75764 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/UnCore.vfi
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/UnCore.vfi
@@ -1,10 +1,10 @@
 //
 //
 // Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
-//                                                                                  

+//                                                                                  
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
-//                                                                                  

+//                                                                                  
 //
 //
 //
-- 
2.21.0.1020.gf2820cf01a-goog