Re-Merge branch 'armlt-tracking' of git://git.linaro.org/arm/uefi/uefi-nextlinaro-uefi-2013.03-01

The previous merges had been leaving some old changes in the release branch.  This commit forces the branch to take the latest code.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

2 files changed, 0 insertions, 50 deletions

diff --git a/ArmPlatformPkg/Bds/BootMenu.c b/ArmPlatformPkg/Bds/BootMenu.c
index 4b35e90b6..2280e8c3c 100644
--- a/ArmPlatformPkg/Bds/BootMenu.c
+++ b/ArmPlatformPkg/Bds/BootMenu.c
@@ -545,56 +545,6 @@ BootMenuUpdateBootOption (
       goto FREE_DEVICE_PATH;

     }

 

-    FdtLocalSize = ReadUnaligned16 ((CONST UINT16*)&LinuxArguments->FdtLocalSize);
-    if (BootType == BDS_LOADER_KERNEL_LINUX_LOCAL_FDT) {
-      if (FdtLocalSize > 0) {
-        Print(L"Keep the local FDT: ");
-      } else {
-        Print(L"Add a local FDT: ");
-      }
-      Status = GetHIInputBoolean (&FdtLocalSupport);
-      if (EFI_ERROR(Status)) {
-        Status = EFI_ABORTED;
-        goto EXIT;
-      }
-      if (FdtLocalSupport && BootType == BDS_LOADER_KERNEL_LINUX_LOCAL_FDT) {
-        if (FdtLocalSize > 0) {
-          // Case we update the FDT local device path
-          Status = DeviceSupport->UpdateDevicePathNode ((EFI_DEVICE_PATH*)((UINTN)(LinuxArguments + 1) + CmdLineSize + InitrdSize), L"local FDT", &FdtLocalPath, NULL, NULL);
-          if (EFI_ERROR(Status) && Status != EFI_NOT_FOUND) {// EFI_NOT_FOUND is returned on empty input string
-            Status = EFI_ABORTED;
-            goto EXIT;
-          }
-          FdtLocalSize = GetDevicePathSize (FdtLocalPath);
-        } else {
-          // Case we create the FdtLocal device path
-
-          Status = DeviceSupport->CreateDevicePathNode (L"local FDT", &FdtLocalPathNode, NULL, NULL);
-          if (EFI_ERROR(Status) && Status != EFI_NOT_FOUND) { // EFI_NOT_FOUND is returned on empty input string
-            Status = EFI_ABORTED;
-            goto EXIT;
-          }
-
-          if (FdtLocalPathNode != NULL) {
-            // Duplicate Linux kernel Device Path
-            TempFdtLocalPath = DuplicateDevicePath (BootOption->FilePathList);
-            // Replace Linux kernel Node by EndNode
-            SetDevicePathEndNode (GetLastDevicePathNode (TempFdtLocalPath));
-            // Append the Device Path node to the select device path
-            FdtLocalPath = AppendDevicePathNode (TempFdtLocalPath, (CONST EFI_DEVICE_PATH_PROTOCOL *)FdtLocalPathNode);
-            FreePool (TempFdtLocalPath);
-            FdtLocalSize = GetDevicePathSize (FdtLocalPath);
-          } else {
-            FdtLocalPath = NULL;
-          }
-        }
-      } else {
-        FdtLocalSize = 0;
-      }
-    } else {
-      FdtLocalSupport = FALSE;
-    }
-
     CmdLineSize = AsciiStrSize (CmdLine);

 

     BootArguments = (ARM_BDS_LOADER_ARGUMENTS*)AllocatePool(sizeof(ARM_BDS_LOADER_ARGUMENTS) + CmdLineSize + InitrdSize + FdtLocalSize);

diff --git a/PandaBoardPkg/Tools/chtool b/PandaBoardPkg/Tools/chtool
deleted file mode 100755
index a18bdc9a9..000000000
--- a/PandaBoardPkg/Tools/chtool
+++ /dev/null