From bbd6a1617fe08493ef4ac5a952bb9613c1164157 Mon Sep 17 00:00:00 2001
From: Ronald Cron <Ronald.Cron@arm.com>
Date: Tue, 5 May 2015 15:24:17 +0000
Subject: [PATCH] EmbeddedPkg/FdtPlatformDxe: 'setfdt' command, add deletion of
 the UEFI variable "Fdt"

Add deletion of the "Fdt" UEFI variable used to specify
a development FDT device path when the 'setfdt' command
is called with an empty string as file path.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <Ronald.Cron@arm.com>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17300 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Drivers/FdtPlatformDxe/FdtPlatform.c      | 107 ++++++++++--------
 1 file changed, 60 insertions(+), 47 deletions(-)

diff --git a/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.c b/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.c
index b5ae8c0bb5..eb4f554621 100644
--- a/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.c
+++ b/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.c
@@ -747,52 +747,55 @@ UpdateFdtTextDevicePath (
   SHELL_STATUS                        ShellStatus;
 
   ASSERT (FilePath != NULL);
+  DevicePath       = NULL;
   TextDevicePath   = NULL;
   FdtVariableValue = NULL;
 
-  DevicePath = Shell->GetDevicePathFromFilePath (FilePath);
-  if (DevicePath != NULL) {
-    Status = gBS->LocateProtocol (
-                    &gEfiDevicePathToTextProtocolGuid,
-                    NULL,
-                    (VOID **)&EfiDevicePathToTextProtocol
-                    );
-    if (EFI_ERROR (Status)) {
-      goto Error;
-    }
+  if (*FilePath != L'\0') {
+    DevicePath = Shell->GetDevicePathFromFilePath (FilePath);
+    if (DevicePath != NULL) {
+      Status = gBS->LocateProtocol (
+                      &gEfiDevicePathToTextProtocolGuid,
+                      NULL,
+                      (VOID **)&EfiDevicePathToTextProtocol
+                      );
+      if (EFI_ERROR (Status)) {
+        goto Error;
+      }
 
-    TextDevicePath = EfiDevicePathToTextProtocol->ConvertDevicePathToText (
-                                                    DevicePath,
-                                                    FALSE,
-                                                    FALSE
-                                                    );
-    if (TextDevicePath == NULL) {
-      Status = EFI_OUT_OF_RESOURCES;
-      goto Error;
-    }
-    FdtVariableValue = TextDevicePath;
-  } else {
-    //
-    // Try to convert back the EFI Device Path String into a EFI device Path
-    // to ensure the format is valid
-    //
-    Status = gBS->LocateProtocol (
-                    &gEfiDevicePathFromTextProtocolGuid,
-                    NULL,
-                    (VOID **)&EfiDevicePathFromTextProtocol
-                    );
-    if (EFI_ERROR (Status)) {
-      goto Error;
-    }
+      TextDevicePath = EfiDevicePathToTextProtocol->ConvertDevicePathToText (
+                                                      DevicePath,
+                                                      FALSE,
+                                                      FALSE
+                                                      );
+      if (TextDevicePath == NULL) {
+        Status = EFI_OUT_OF_RESOURCES;
+        goto Error;
+      }
+      FdtVariableValue = TextDevicePath;
+    } else {
+      //
+      // Try to convert back the EFI Device Path String into a EFI device Path
+      // to ensure the format is valid
+      //
+      Status = gBS->LocateProtocol (
+                      &gEfiDevicePathFromTextProtocolGuid,
+                      NULL,
+                      (VOID **)&EfiDevicePathFromTextProtocol
+                      );
+      if (EFI_ERROR (Status)) {
+        goto Error;
+      }
 
-    DevicePath = EfiDevicePathFromTextProtocol->ConvertTextToDevicePath (
-                                                  FilePath
-                                                  );
-    if (DevicePath == NULL) {
-      Status = EFI_INVALID_PARAMETER;
-      goto Error;
+      DevicePath = EfiDevicePathFromTextProtocol->ConvertTextToDevicePath (
+                                                    FilePath
+                                                    );
+      if (DevicePath == NULL) {
+        Status = EFI_INVALID_PARAMETER;
+        goto Error;
+      }
+      FdtVariableValue = (CHAR16*)FilePath;
     }
-    FdtVariableValue = (CHAR16*)FilePath;
   }
 
   Status = gRT->SetVariable (
@@ -801,19 +804,29 @@ UpdateFdtTextDevicePath (
                   EFI_VARIABLE_RUNTIME_ACCESS    |
                   EFI_VARIABLE_NON_VOLATILE      |
                   EFI_VARIABLE_BOOTSERVICE_ACCESS ,
-                  StrSize (FdtVariableValue),
+                  (FdtVariableValue != NULL) ?
+                  StrSize (FdtVariableValue) : 0,
                   FdtVariableValue
                   );
 
 Error:
   ShellStatus = EfiCodeToShellCode (Status);
   if (!EFI_ERROR (Status)) {
-    ShellPrintHiiEx (
-      -1, -1, NULL,
-      STRING_TOKEN (STR_SETFDT_UPDATE_SUCCEEDED),
-      mFdtPlatformDxeHiiHandle,
-      FdtVariableValue
-      );
+    if (FdtVariableValue != NULL) {
+      ShellPrintHiiEx (
+        -1, -1, NULL,
+        STRING_TOKEN (STR_SETFDT_UPDATE_SUCCEEDED),
+        mFdtPlatformDxeHiiHandle,
+        FdtVariableValue
+        );
+    } else {
+      ShellPrintHiiEx (
+        -1, -1, NULL,
+        STRING_TOKEN (STR_SETFDT_UPDATE_DELETED),
+        mFdtPlatformDxeHiiHandle,
+        FdtVariableValue
+        );
+    }
   } else {
     if (Status == EFI_INVALID_PARAMETER) {
       ShellPrintHiiEx (
-- 
2.39.2