IntelFsp2Pkg: Clean up source files

1. Do not use tab characters
2. No trailing white space in one line
3. All files must end with CRLF

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>

diff --git a/IntelFsp2Pkg/FspNotifyPhase/FspNotifyPhasePeim.c b/IntelFsp2Pkg/FspNotifyPhase/FspNotifyPhasePeim.c
index 41131d585469485fb8bda418ed8c24f31ec2a3b5..52435fa0b2d82715d76f733ca6d50933bfbcf50a 100644 (file)
--- a/IntelFsp2Pkg/FspNotifyPhase/FspNotifyPhasePeim.c
+++ b/IntelFsp2Pkg/FspNotifyPhase/FspNotifyPhasePeim.c
@@ -1,7 +1,7 @@
 /** @file\r
   Source file for FSP notify phase PEI module\r
 \r
 /** @file\r
   Source file for FSP notify phase PEI module\r
 \r

-  Copyright (c) 2016, Intel Corporation. All rights reserved.\r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,11 +16,11 @@
 /**\r
 \r
    This function waits for FSP notify.\r
 /**\r
 \r
    This function waits for FSP notify.\r

-    \r
+\r

    @param This          Entry point for DXE IPL PPI.\r
    @param PeiServices   General purpose services available to every PEIM.\r
    @param HobList       Address to the Pei HOB list.\r
    @param This          Entry point for DXE IPL PPI.\r
    @param PeiServices   General purpose services available to every PEIM.\r
    @param HobList       Address to the Pei HOB list.\r

-   \r
+\r

    @return EFI_SUCCESS              This function never returns.\r
 \r
 **/\r
    @return EFI_SUCCESS              This function never returns.\r
 \r
 **/\r


@@ -51,11 +51,11 @@ CONST EFI_PEI_PPI_DESCRIPTOR gEndOfPeiSignalPpi = {
 /**\r
 \r
    This function waits for FSP notify.\r
 /**\r
 \r
    This function waits for FSP notify.\r

-    \r
+\r

    @param This          Entry point for DXE IPL PPI.\r
    @param PeiServices   General purpose services available to every PEIM.\r
    @param HobList       Address to the Pei HOB list.\r
    @param This          Entry point for DXE IPL PPI.\r
    @param PeiServices   General purpose services available to every PEIM.\r
    @param HobList       Address to the Pei HOB list.\r

-   \r
+\r

    @return EFI_SUCCESS              This function never returns.\r
 \r
 **/\r
    @return EFI_SUCCESS              This function never returns.\r
 \r
 **/\r

diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
index 611fab215a98914fb1569a2dbb9ce0266105b16a..0500a197f8387adad6da6af47b98013ffcf383e6 100644 (file)
--- a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
+++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Sec Core for FSP\r
 #\r
 ## @file\r
 #  Sec Core for FSP\r
 #\r

-#  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -44,7 +44,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

-  MdeModulePkg/MdeModulePkg.dec  \r
+  MdeModulePkg/MdeModulePkg.dec\r

   IntelFsp2Pkg/IntelFsp2Pkg.dec\r
 \r
 [LibraryClasses]\r
   IntelFsp2Pkg/IntelFsp2Pkg.dec\r
 \r
 [LibraryClasses]\r

diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreS.inf b/IntelFsp2Pkg/FspSecCore/FspSecCoreS.inf
index 8e1bb4a592e5255de5f7c4626be3786beaffb637..a3563dd8cf80966b95f083eb551b290364d5b626 100644 (file)
--- a/IntelFsp2Pkg/FspSecCore/FspSecCoreS.inf
+++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreS.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Sec Core for FSP\r
 #\r
 ## @file\r
 #  Sec Core for FSP\r
 #\r

-#  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -39,7 +39,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

-  MdeModulePkg/MdeModulePkg.dec  \r
+  MdeModulePkg/MdeModulePkg.dec\r

   IntelFsp2Pkg/IntelFsp2Pkg.dec\r
 \r
 [LibraryClasses]\r
   IntelFsp2Pkg/IntelFsp2Pkg.dec\r
 \r
 [LibraryClasses]\r

diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
index b56427670bf5df73318c4c9d91391c123a28913d..9c9a84db0a3e1aa4a9663d587739b6d1a8d0455d 100644 (file)
--- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
+++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
@@ -1,7 +1,7 @@
 ;; @file\r
 ;  Provide FSP API entry points.\r
 ;\r
 ;; @file\r
 ;  Provide FSP API entry points.\r
 ;\r

-; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r

 ; This program and the accompanying materials\r
 ; are licensed and made available under the terms and conditions of the BSD License\r
 ; which accompanies this distribution.  The full text of the license may be found at\r
 ; This program and the accompanying materials\r
 ; are licensed and made available under the terms and conditions of the BSD License\r
 ; which accompanies this distribution.  The full text of the license may be found at\r


@@ -116,10 +116,10 @@ ASM_PFX(FspApiCommonContinue):
   sidt    [esp]\r
 \r
 \r
   sidt    [esp]\r
 \r
 \r

-  ;  Get Stackbase and StackSize from FSPM_UPD Param \r
-  mov    edx, [esp + API_PARAM1_OFFSET] \r
+  ;  Get Stackbase and StackSize from FSPM_UPD Param\r
+  mov    edx, [esp + API_PARAM1_OFFSET]\r

   cmp    edx, 0\r
   cmp    edx, 0\r

-  jnz    FspStackSetup  \r
+  jnz    FspStackSetup\r

 \r
   ; Get UPD default values if FspmUpdDataPtr (ApiParam1) is null\r
   push   eax\r
 \r
   ; Get UPD default values if FspmUpdDataPtr (ApiParam1) is null\r
   push   eax\r


@@ -127,7 +127,7 @@ ASM_PFX(FspApiCommonContinue):
   mov    edx, [eax + FSP_HEADER_IMGBASE_OFFSET]\r
   add    edx, [eax + FSP_HEADER_CFGREG_OFFSET]\r
   pop    eax\r
   mov    edx, [eax + FSP_HEADER_IMGBASE_OFFSET]\r
   add    edx, [eax + FSP_HEADER_CFGREG_OFFSET]\r
   pop    eax\r

-  \r
+\r

   FspStackSetup:\r
   mov    edi, [edx + FSPM_UPD_COMMON.StackBase]\r
   mov    ecx, [edx + FSPM_UPD_COMMON.StackSize]\r
   FspStackSetup:\r
   mov    edi, [edx + FSPM_UPD_COMMON.StackBase]\r
   mov    ecx, [edx + FSPM_UPD_COMMON.StackSize]\r

diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c b/IntelFsp2Pkg/FspSecCore/SecFsp.c
index 96f8fb755467f596eac12c1288da478c8a11e762..3c9de354fdedd865e9790cdc44ba0afb29d72d33 100644 (file)
--- a/IntelFsp2Pkg/FspSecCore/SecFsp.c
+++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -154,7 +154,7 @@ FspGlobalDataInit (
   // Set API calling mode\r
   //\r
   SetFspApiCallingIndex (ApiIdx);\r
   // Set API calling mode\r
   //\r
   SetFspApiCallingIndex (ApiIdx);\r

-  \r
+\r

   //\r
   // Set UPD pointer\r
   //\r
   //\r
   // Set UPD pointer\r
   //\r

diff --git a/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c b/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
index bace5eca4315814a34203bdac4bcdf65c1001e7e..236288f77c9d2d5db9b7960c87c722c263c79497 100644 (file)
--- a/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
+++ b/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -33,7 +33,7 @@ FspApiCallingCheck (
 \r
   Status = EFI_SUCCESS;\r
   FspData = GetFspGlobalDataPointer ();\r
 \r
   Status = EFI_SUCCESS;\r
   FspData = GetFspGlobalDataPointer ();\r

-  \r
+\r

   if (ApiIdx == NotifyPhaseApiIndex) {\r
     //\r
     // NotifyPhase check\r
   if (ApiIdx == NotifyPhaseApiIndex) {\r
     //\r
     // NotifyPhase check\r


@@ -92,6 +92,6 @@ FspApiCallingCheck (
       SetFspApiCallingIndex (ApiIdx);\r
     }\r
   }\r
       SetFspApiCallingIndex (ApiIdx);\r
     }\r
   }\r

-  \r
+\r

   return Status;\r
 }\r
   return Status;\r
 }\r

diff --git a/IntelFsp2Pkg/FspSecCore/SecMain.c b/IntelFsp2Pkg/FspSecCore/SecMain.c
index 0432dee6eae0e011262f050da4c8b02c9598ded6..5a43ba1967143e2fc8849424bf8af32deaef1eff 100644 (file)
--- a/IntelFsp2Pkg/FspSecCore/SecMain.c
+++ b/IntelFsp2Pkg/FspSecCore/SecMain.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -133,7 +133,7 @@ SecStartup (
 \r
   //\r
   // Call PeiCore Entry\r
 \r
   //\r
   // Call PeiCore Entry\r

-  //  \r
+  //\r

   PeiCore (&SecCoreData, mPeiSecPlatformInformationPpi);\r
 \r
   //\r
   PeiCore (&SecCoreData, mPeiSecPlatformInformationPpi);\r
 \r
   //\r


@@ -177,7 +177,7 @@ SecTemporaryRamSupport (
 \r
   HeapSize   = CopySize * PcdGet8 (PcdFspHeapSizePercentage) / 100 ;\r
   StackSize  = CopySize - HeapSize;\r
 \r
   HeapSize   = CopySize * PcdGet8 (PcdFspHeapSizePercentage) / 100 ;\r
   StackSize  = CopySize - HeapSize;\r

-    \r
+\r

   OldHeap = (VOID*)(UINTN)TemporaryMemoryBase;\r
   NewHeap = (VOID*)((UINTN)PermanentMemoryBase + StackSize);\r
 \r
   OldHeap = (VOID*)(UINTN)TemporaryMemoryBase;\r
   NewHeap = (VOID*)((UINTN)PermanentMemoryBase + StackSize);\r
 \r

diff --git a/IntelFsp2Pkg/Include/FspEas/FspApi.h b/IntelFsp2Pkg/Include/FspEas/FspApi.h
index a2e4813baa8f12f4e25a5eeb054c8dc5b4a51ebd..096e067baec1fa6164d3d16ffe1646ef7ca79a11 100644 (file)
--- a/IntelFsp2Pkg/Include/FspEas/FspApi.h
+++ b/IntelFsp2Pkg/Include/FspEas/FspApi.h
@@ -2,7 +2,7 @@
   Intel FSP API definition from Intel Firmware Support Package External\r
   Architecture Specification v2.0.\r
 \r
   Intel FSP API definition from Intel Firmware Support Package External\r
   Architecture Specification v2.0.\r
 \r

-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -216,7 +216,7 @@ EFI_STATUS
   and defined for each FSP binary. This will be documented in Integration guide with\r
   each FSP release.\r
   After FspMemInit completes its execution, it passes the pointer to the HobList and\r
   and defined for each FSP binary. This will be documented in Integration guide with\r
   each FSP release.\r
   After FspMemInit completes its execution, it passes the pointer to the HobList and\r

-  returns to the boot loader from where it was called. BootLoader is responsible to \r
+  returns to the boot loader from where it was called. BootLoader is responsible to\r

   migrate it's stack and data to Memory.\r
   FspMemoryInit, TempRamExit and FspSiliconInit APIs provide an alternate method to\r
   complete the silicon initialization and provides bootloader an opportunity to get\r
   migrate it's stack and data to Memory.\r
   FspMemoryInit, TempRamExit and FspSiliconInit APIs provide an alternate method to\r
   complete the silicon initialization and provides bootloader an opportunity to get\r

diff --git a/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h b/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h
index 96cac001249479e6f5a011488f398495bb5ee22d..ca178512988000b5801b496fa167b8c8074b5558 100644 (file)
--- a/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h
+++ b/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h
@@ -2,7 +2,7 @@
   Intel FSP Header File definition from Intel Firmware Support Package External\r
   Architecture Specification v2.0.\r
 \r
   Intel FSP Header File definition from Intel Firmware Support Package External\r
   Architecture Specification v2.0.\r
 \r

-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -144,7 +144,7 @@ typedef struct {
   ///\r
   UINT8   Reserved;\r
   ///\r
   ///\r
   UINT8   Reserved;\r
   ///\r

-  /// Byte 0x0A: FSP producer identification string \r
+  /// Byte 0x0A: FSP producer identification string\r

   ///\r
   CHAR8   FspProducerId[6];\r
   ///\r
   ///\r
   CHAR8   FspProducerId[6];\r
   ///\r

diff --git a/IntelFsp2Pkg/Include/Library/FspCommonLib.h b/IntelFsp2Pkg/Include/Library/FspCommonLib.h
index 5f7a14b9b24a98671c239ddf71c2dd59728fd664..1c99be3b1f7248bd03e62fb3b4f5c899c913c787 100644 (file)
--- a/IntelFsp2Pkg/Include/Library/FspCommonLib.h
+++ b/IntelFsp2Pkg/Include/Library/FspCommonLib.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -268,7 +268,7 @@ SetFspApiCallingIndex (
 \r
 /**\r
   This function gets FSP Phase StatusCode.\r
 \r
 /**\r
   This function gets FSP Phase StatusCode.\r

-  \r
+\r

   @retval StatusCode\r
 **/\r
 UINT32\r
   @retval StatusCode\r
 **/\r
 UINT32\r

diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.dec b/IntelFsp2Pkg/IntelFsp2Pkg.dec
index 52024af4fb8488a4b1140b0731410478c59cd7c5..b2ee4b6ef5e8a9b17f901f0dbe84a7d6cc021599 100644 (file)
--- a/IntelFsp2Pkg/IntelFsp2Pkg.dec
+++ b/IntelFsp2Pkg/IntelFsp2Pkg.dec
@@ -1,7 +1,7 @@
 ## @file\r
 # Provides driver and definitions to build fsp in EDKII bios.\r
 #\r
 ## @file\r
 # Provides driver and definitions to build fsp in EDKII bios.\r
 #\r

-# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 # This program and the accompanying materials are licensed and made available under\r
 # the terms and conditions of the BSD License that accompanies this distribution.\r
 # The full text of the license may be found at\r
 # This program and the accompanying materials are licensed and made available under\r
 # the terms and conditions of the BSD License that accompanies this distribution.\r
 # The full text of the license may be found at\r


@@ -20,7 +20,7 @@
 \r
 [Includes]\r
   Include\r
 \r
 [Includes]\r
   Include\r

-  \r
+\r

 [LibraryClasses]\r
   ##  @libraryclass  Provides cache-as-ram support.\r
   CacheAsRamLib|Include/Library/CacheAsRamLib.h\r
 [LibraryClasses]\r
   ##  @libraryclass  Provides cache-as-ram support.\r
   CacheAsRamLib|Include/Library/CacheAsRamLib.h\r


@@ -39,7 +39,7 @@
 \r
   ##  @libraryclass  Provides FSP switch stack function.\r
   FspSwitchStackLib|Include/Library/FspSwitchStackLib.h\r
 \r
   ##  @libraryclass  Provides FSP switch stack function.\r
   FspSwitchStackLib|Include/Library/FspSwitchStackLib.h\r

-  \r
+\r

   ##  @libraryclass  Provides FSP platform sec related actions.\r
   FspSecPlatformLib|Include/Library/FspSecPlatformLib.h\r
 \r
   ##  @libraryclass  Provides FSP platform sec related actions.\r
   FspSecPlatformLib|Include/Library/FspSecPlatformLib.h\r
 \r


@@ -74,7 +74,7 @@
   # x % of FSP temporary memory will be used for heap\r
   # (100 - x) % of FSP temporary memory will be used for stack\r
   gIntelFsp2PkgTokenSpaceGuid.PcdFspHeapSizePercentage    |        50| UINT8|0x10000004\r
   # x % of FSP temporary memory will be used for heap\r
   # (100 - x) % of FSP temporary memory will be used for stack\r
   gIntelFsp2PkgTokenSpaceGuid.PcdFspHeapSizePercentage    |        50| UINT8|0x10000004\r

-  \r
+\r

 [PcdsFixedAtBuild,PcdsDynamic,PcdsDynamicEx]\r
   gIntelFsp2PkgTokenSpaceGuid.PcdFspReservedMemoryLength |0x00100000|UINT32|0x46530000\r
   gIntelFsp2PkgTokenSpaceGuid.PcdBootLoaderEntry         |0xFFFFFFE4|UINT32|0x46530100\r
 [PcdsFixedAtBuild,PcdsDynamic,PcdsDynamicEx]\r
   gIntelFsp2PkgTokenSpaceGuid.PcdFspReservedMemoryLength |0x00100000|UINT32|0x46530000\r
   gIntelFsp2PkgTokenSpaceGuid.PcdBootLoaderEntry         |0xFFFFFFE4|UINT32|0x46530100\r

diff --git a/IntelFsp2Pkg/Library/BaseFspCommonLib/BaseFspCommonLib.inf b/IntelFsp2Pkg/Library/BaseFspCommonLib/BaseFspCommonLib.inf
index df8803a036b13eca7a0e560e6d0dab45bd4b1b62..c9d98357e25c84eb114d2aa92f87911a22c3c8ae 100644 (file)
--- a/IntelFsp2Pkg/Library/BaseFspCommonLib/BaseFspCommonLib.inf
+++ b/IntelFsp2Pkg/Library/BaseFspCommonLib/BaseFspCommonLib.inf
@@ -1,6 +1,6 @@
 ## @file\r
 ## @file\r

-#  Instance of FspCommonLib \r
-#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Instance of FspCommonLib\r
+#  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
index 2f2981c99018917739eb20788e0781cf5a0ef7cc..d0128304e6bafdaffe38e70d9674a6b5aea801df 100644 (file)
--- a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
+++ b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -516,7 +516,7 @@ FspApiReturnStatusReset (
   )\r
 {\r
   volatile BOOLEAN  LoopUntilReset;\r
   )\r
 {\r
   volatile BOOLEAN  LoopUntilReset;\r

-  \r
+\r

   LoopUntilReset = TRUE;\r
   DEBUG ((DEBUG_INFO, "FSP returning control to Bootloader with reset required return status %x\n",FspResetType));\r
   ///\r
   LoopUntilReset = TRUE;\r
   DEBUG ((DEBUG_INFO, "FSP returning control to Bootloader with reset required return status %x\n",FspResetType));\r
   ///\r

diff --git a/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c b/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
index edb8d67223824fbcee1b43bf4225ade643a7772e..77d64523316fd82055d498a669751eb6c0344f28 100644 (file)
--- a/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
+++ b/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -48,12 +48,12 @@ FspGetResourceDescriptorByOwner (
     if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
       if ((Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED) && \\r
           (CompareGuid (&Hob.ResourceDescriptor->Owner, OwnerGuid))) {\r
     if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
       if ((Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED) && \\r
           (CompareGuid (&Hob.ResourceDescriptor->Owner, OwnerGuid))) {\r

-        return  Hob.ResourceDescriptor;                     \r
+        return  Hob.ResourceDescriptor;\r

       }\r
     }\r
     Hob.Raw = GET_NEXT_HOB (Hob);\r
   }\r
       }\r
     }\r
     Hob.Raw = GET_NEXT_HOB (Hob);\r
   }\r

-  \r
+\r

   return NULL;\r
 }\r
 \r
   return NULL;\r
 }\r
 \r

diff --git a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/Flat32.nasm b/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/Flat32.nasm
index 122eb9eb3312ed1a5eebc9ce97bb815c259292ad..0d75aae071bb140e843e00faf9650eb504e204f7 100644 (file)
--- a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/Flat32.nasm
+++ b/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/Flat32.nasm
@@ -2,7 +2,7 @@
 ;  This is the code that goes from real-mode to protected mode.\r
 ;  It consumes the reset vector, configures the stack.\r
 ;\r
 ;  This is the code that goes from real-mode to protected mode.\r
 ;  It consumes the reset vector, configures the stack.\r
 ;\r

-; Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 ; This program and the accompanying materials\r
 ; are licensed and made available under the terms and conditions of the BSD License\r
 ; which accompanies this distribution.  The full text of the license may be found at\r
 ; This program and the accompanying materials\r
 ; are licensed and made available under the terms and conditions of the BSD License\r
 ; which accompanies this distribution.  The full text of the license may be found at\r


@@ -124,4 +124,4 @@ ASM_PFX(ProtectedModeEntryLinearAddress):
 ASM_PFX(ProtectedModeEntryLinearOffset):\r
   DD      ASM_PFX(ProtectedModeEntryPoint)  ; Offset of our 32 bit code\r
   DW      LINEAR_CODE_SEL\r
 ASM_PFX(ProtectedModeEntryLinearOffset):\r
   DD      ASM_PFX(ProtectedModeEntryPoint)  ; Offset of our 32 bit code\r
   DW      LINEAR_CODE_SEL\r

-  \r
+\r

diff --git a/IntelFsp2Pkg/Tools/PatchFv.py b/IntelFsp2Pkg/Tools/PatchFv.py
index fc2ee19bcdda29b946dcb317aa520448aa5a8739..b7bcfe6ab4c233d684e30281564c8c9a60402a61 100644 (file)
--- a/IntelFsp2Pkg/Tools/PatchFv.py
+++ b/IntelFsp2Pkg/Tools/PatchFv.py
@@ -1,6 +1,6 @@
 ## @ PatchFv.py\r
 #\r
 ## @ PatchFv.py\r
 #\r

-# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 # This program and the accompanying materials are licensed and made available under\r
 # the terms and conditions of the BSD License that accompanies this distribution.\r
 # The full text of the license may be found at\r
 # This program and the accompanying materials are licensed and made available under\r
 # the terms and conditions of the BSD License that accompanies this distribution.\r
 # The full text of the license may be found at\r


@@ -136,8 +136,8 @@ class Symbols:
         fvInfo['Offset']  = self.getFvOffsetInFd(fvFile)\r
         fvInfo['Size']    = readDataFromFile (fvFile, 0x20, 4)\r
         fdIn        = open(infFile, "r")\r
         fvInfo['Offset']  = self.getFvOffsetInFd(fvFile)\r
         fvInfo['Size']    = readDataFromFile (fvFile, 0x20, 4)\r
         fdIn        = open(infFile, "r")\r

-        rptLines    = fdIn.readlines() \r
-        fdIn.close()       \r
+        rptLines    = fdIn.readlines()\r
+        fdIn.close()\r

         fvInfo['Base'] = 0\r
         for rptLine in rptLines:\r
             match = re.match("^EFI_BASE_ADDRESS\s*=\s*(0x[a-fA-F0-9]+)", rptLine)\r
         fvInfo['Base'] = 0\r
         for rptLine in rptLines:\r
             match = re.match("^EFI_BASE_ADDRESS\s*=\s*(0x[a-fA-F0-9]+)", rptLine)\r


@@ -289,7 +289,7 @@ class Symbols:
     #\r
     def parseInfFile(self, infFile):\r
         #\r
     #\r
     def parseInfFile(self, infFile):\r
         #\r

-        # Get FV offset and search EFI_BASE_ADDRESS in the FD file \r
+        # Get FV offset and search EFI_BASE_ADDRESS in the FD file\r

         # then assign the value of EFI_BASE_ADDRESS to fdBase\r
         #\r
         fvOffset    = self.getFvOffsetInFd(infFile[0:-4] + ".Fv")\r
         # then assign the value of EFI_BASE_ADDRESS to fdBase\r
         #\r
         fvOffset    = self.getFvOffsetInFd(infFile[0:-4] + ".Fv")\r