[edk2,edk2-platforms,1/2] Platform/Hisilicon: fix D05 .dsc line endings

Message ID 20171204171325.3359-1-leif.lindholm@linaro.org
State New
Headers show
Series
  • [edk2,edk2-platforms,1/2] Platform/Hisilicon: fix D05 .dsc line endings
Related show

Commit Message

Leif Lindholm Dec. 4, 2017, 5:13 p.m.
Commit b324d85a466b,
("Hisilicon D03/D05: get firmware version from FIRMWARE_VER"),
added some non CRLF line endings, resolve this.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

---
 Platform/Hisilicon/D05/D05.dsc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ard Biesheuvel Dec. 4, 2017, 5:14 p.m. | #1
On 4 December 2017 at 17:13, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> Commit b324d85a466b,

> ("Hisilicon D03/D05: get firmware version from FIRMWARE_VER"),

> added some non CRLF line endings, resolve this.

>

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>


Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


> ---

>  Platform/Hisilicon/D05/D05.dsc | 8 ++++----

>  1 file changed, 4 insertions(+), 4 deletions(-)

>

> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc

> index efd748e5ef..60eca3c6fc 100644

> --- a/Platform/Hisilicon/D05/D05.dsc

> +++ b/Platform/Hisilicon/D05/D05.dsc

> @@ -181,11 +181,11 @@ [PcdsFixedAtBuild.common]

>

>    gHisiTokenSpaceGuid.PcdIsMPBoot|1

>    gHisiTokenSpaceGuid.PcdSocketMask|0x3

> -  !ifdef $(FIRMWARE_VER)

> -    gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"

> -  !else

> +  !ifdef $(FIRMWARE_VER)

> +    gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"

> +  !else

>      gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build base on Hisilicon D05 UEFI 17.10 Release"

> -  !endif

> +  !endif

>

>    gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18"

>

> --

> 2.11.0

>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index efd748e5ef..60eca3c6fc 100644
--- a/Platform/Hisilicon/D05/D05.dsc
+++ b/Platform/Hisilicon/D05/D05.dsc
@@ -181,11 +181,11 @@  [PcdsFixedAtBuild.common]
 
   gHisiTokenSpaceGuid.PcdIsMPBoot|1
   gHisiTokenSpaceGuid.PcdSocketMask|0x3
-  !ifdef $(FIRMWARE_VER)
-    gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
-  !else
+  !ifdef $(FIRMWARE_VER)
+    gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
+  !else
     gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build base on Hisilicon D05 UEFI 17.10 Release"
-  !endif
+  !endif
 
   gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18"