Fix Beagle references without using svn mv.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10365 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Omap35xxPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.c b/Omap35xxPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.c
deleted file mode 100644 (file)
index f8d7b97..0000000
--- a/Omap35xxPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/** @file
-
-  Copyright (c) 2008-2009, Apple Inc. All rights reserved.
-  
-  All rights reserved. This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <Uefi.h>
-
-#include <Library/ArmLib.h>
-#include <Library/CacheMaintenanceLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/IoLib.h>
-#include <Library/PcdLib.h>
-#include <Library/DebugLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/BeagleBoardSystemLib.h>
-
-#include <Omap3530/Omap3530.h>
-
-VOID
-ResetSystem (
-  IN EFI_RESET_TYPE   ResetType
-  )
-{
-  switch (ResetType) {
-    case EfiResetWarm:
-      //Perform warm reset of the system.
-      GoLittleEndian(PcdGet32(PcdFlashFvMainBase));
-      break;
-    case EfiResetCold:
-    case EfiResetShutdown:
-    default:
-      //Perform cold reset of the system.
-      MmioOr32 (PRM_RSTCTRL, RST_DPLL3);
-      while ((MmioRead32 (PRM_RSTST) & GLOBAL_COLD_RST) != 0x1);
-      break;
-  }
-
-  //Should never come here.
-  ASSERT(FALSE);
-}
-
-VOID
-ShutdownEfi (
-  VOID
-  )
-{
-  EFI_STATUS              Status;
-  UINTN                   MemoryMapSize;
-  EFI_MEMORY_DESCRIPTOR   *MemoryMap;
-  UINTN                   MapKey;
-  UINTN                   DescriptorSize;
-  UINTN                   DescriptorVersion;
-  UINTN                   Pages;
-
-  MemoryMap = NULL;
-  MemoryMapSize = 0;
-  do {
-    Status = gBS->GetMemoryMap (
-                    &MemoryMapSize,
-                    MemoryMap,
-                    &MapKey,
-                    &DescriptorSize,
-                    &DescriptorVersion
-                    );
-    if (Status == EFI_BUFFER_TOO_SMALL) {
-
-      Pages = EFI_SIZE_TO_PAGES (MemoryMapSize) + 1;
-      MemoryMap = AllocatePages (Pages);
-    
-      //
-      // Get System MemoryMap
-      //
-      Status = gBS->GetMemoryMap (
-                      &MemoryMapSize,
-                      MemoryMap,
-                      &MapKey,
-                      &DescriptorSize,
-                      &DescriptorVersion
-                      );
-      // Don't do anything between the GetMemoryMap() and ExitBootServices()
-      if (!EFI_ERROR (Status)) {
-        Status = gBS->ExitBootServices (gImageHandle, MapKey);
-        if (EFI_ERROR (Status)) {
-          FreePages (MemoryMap, Pages);
-          MemoryMap = NULL;
-          MemoryMapSize = 0;
-        }
-      }
-    }
-  } while (EFI_ERROR (Status));
-
-  //Clean and invalidate caches.
-  WriteBackInvalidateDataCache();
-  InvalidateInstructionCache();
-
-  //Turning off Caches and MMU
-  ArmDisableDataCache();
-  ArmDisableInstructionCache();
-  ArmDisableMmu();
-}
-

diff --git a/Omap35xxPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf b/Omap35xxPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf
deleted file mode 100644 (file)
index 4df8c86..0000000
--- a/Omap35xxPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf
+++ /dev/null
@@ -1,44 +0,0 @@
-#/** @file\r
-# Support for Airport libraries.\r
-#\r
-# Copyright (c) 2009, Apple Inc.\r
-#\r
-#  All rights reserved. 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
-#  http://opensource.org/licenses/bsd-license.php\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-#\r
-#**/\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = BeagleBoardSystemLib\r
-  FILE_GUID                      = b15a2640-fef2-447c-98e1-9ce22cfa529c\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = BeagleBoardSystemLib\r
-\r
-[Sources.ARM]\r
-  BeagleBoardSystemLib.c\r
-  GoLittleEndian.asm | RVCT\r
-  GoLittleEndian.S   | GCC \r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  EmbeddedPkg/EmbeddedPkg.dec\r
-  ArmPkg/ArmPkg.dec\r
-  Omap35xxPkg/Omap35xxPkg.dec\r
-  \r
-[LibraryClasses]\r
-  ArmLib\r
-  CacheMaintenanceLib\r
-  MemoryAllocationLib\r
-  UefiRuntimeServicesTableLib\r
-  TimerLib\r
-  UefiLib\r
-\r
-[Pcd]\r
-  gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase\r

diff --git a/Omap35xxPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S b/Omap35xxPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S
deleted file mode 100644 (file)
index a37ae7c..0000000
--- a/Omap35xxPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S
+++ /dev/null
@@ -1,27 +0,0 @@
-#------------------------------------------------------------------------------ 
-#
-# Copyright (c) 2008-2009 Apple Inc. All rights reserved.
-#
-# All rights reserved. This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution.  The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#------------------------------------------------------------------------------
-
-.text
-.align 3
-.globl ASM_PFX(GoLittleEndian)
-
-// r0 is target address
-ASM_PFX(GoLittleEndian):
-
-  // Switch to SVC Mode
-  mov   r2,#0xD3        // SVC mode
-  msr   CPSR_c,r2       // Switch modes
-  
-  bx    r0
-

diff --git a/Omap35xxPkg/Library/BeagleBoardSystemLib/GoLittleEndian.asm b/Omap35xxPkg/Library/BeagleBoardSystemLib/GoLittleEndian.asm
deleted file mode 100644 (file)
index 8daced6..0000000
--- a/Omap35xxPkg/Library/BeagleBoardSystemLib/GoLittleEndian.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-//------------------------------------------------------------------------------ 
-//
-// Copyright (c) 2008-2009 Apple Inc. All rights reserved.
-//
-// All rights reserved. This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution.  The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
-//------------------------------------------------------------------------------
-
-  EXPORT  GoLittleEndian
-  PRESERVE8
-  AREA    Ebl, CODE, READONLY
-
-// r0 is target address
-GoLittleEndian
-  // Switch to SVC Mode
-  mov   r2,#0xD3        // SVC mode
-  msr   CPSR_c,r2       // Switch modes
-  
-  bx  r0
-  
-  END

diff --git a/Omap35xxPkg/Library/BeagleBoardTimerLib/BeagleBoardTimerLib.inf b/Omap35xxPkg/Library/BeagleBoardTimerLib/BeagleBoardTimerLib.inf
deleted file mode 100644 (file)
index 515dff9..0000000
--- a/Omap35xxPkg/Library/BeagleBoardTimerLib/BeagleBoardTimerLib.inf
+++ /dev/null
@@ -1,45 +0,0 @@
-#/** @file\r
-# Timer library implementation\r
-#\r
-# A non-functional instance of the Timer Library that can be used as a template\r
-#  for the implementation of a functional timer library instance. This library instance can\r
-#  also be used to test build DXE, Runtime, DXE SAL, and DXE SMM modules that require timer\r
-#  services as well as EBC modules that require timer services\r
-# Copyright (c) 2007, Intel Corporation.\r
-#\r
-#  All rights reserved. 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
-#  http://opensource.org/licenses/bsd-license.php\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-#\r
-#**/\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = BeagleBoardTimerLib\r
-  FILE_GUID                      = fe1d7183-9abb-42ce-9a3b-36d7c6a8959f\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = TimerLib \r
-\r
-[Sources.common]\r
-  TimerLib.c\r
-\r
-[Packages]\r
-  Omap35xxPkg/Omap35xxPkg.dec\r
-  MdePkg/MdePkg.dec\r
-  EmbeddedPkg/EmbeddedPkg.dec\r
-\r
-[LibraryClasses]\r
-  DebugLib\r
-  OmapLib\r
-  IoLib\r
-\r
-[Pcd]\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFreqencyInHz\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds\r
-  gOmap35xxTokenSpaceGuid.PcdOmap35xxFreeTimer\r
-\r

diff --git a/Omap35xxPkg/Library/BeagleBoardTimerLib/TimerLib.c b/Omap35xxPkg/Library/BeagleBoardTimerLib/TimerLib.c
deleted file mode 100644 (file)
index 1b1f2a9..0000000
--- a/Omap35xxPkg/Library/BeagleBoardTimerLib/TimerLib.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/** @file\r
-\r
-  Copyright (c) 2008-2009, Apple Inc. All rights reserved.\r
-  \r
-  All rights reserved. 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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#include <Base.h>\r
-\r
-#include <Library/BaseLib.h>\r
-#include <Library/TimerLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/IoLib.h>\r
-#include <Library/OmapLib.h>\r
-\r
-#include <Omap3530/Omap3530.h>\r
-\r
-UINTN\r
-EFIAPI\r
-MicroSecondDelay (\r
-  IN  UINTN MicroSeconds\r
-  )\r
-{\r
-  UINT64  NanoSeconds;\r
-  \r
-  NanoSeconds = MultU64x32(MicroSeconds, 1000);\r
-\r
-  while (NanoSeconds > (UINTN)-1) { \r
-    NanoSecondDelay((UINTN)-1);\r
-    NanoSeconds -= (UINTN)-1;\r
-  }\r
-\r
-  NanoSecondDelay(NanoSeconds);\r
-\r
-  return MicroSeconds;\r
-}\r
-\r
-UINTN\r
-EFIAPI\r
-NanoSecondDelay (\r
-  IN  UINTN NanoSeconds\r
-  )\r
-{\r
-  UINT32  Delay;\r
-  UINT32  StartTime;\r
-  UINT32  CurrentTime;\r
-  UINT32  ElapsedTime;\r
-  UINT32  TimerCountRegister;\r
-\r
-  Delay = (NanoSeconds / PcdGet32(PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds)) + 1;\r
-  \r
-  TimerCountRegister = TimerBase(PcdGet32(PcdOmap35xxFreeTimer)) + GPTIMER_TCRR;\r
-\r
-  StartTime = MmioRead32 (TimerCountRegister);\r
-\r
-  do \r
-  {\r
-    CurrentTime = MmioRead32 (TimerCountRegister);\r
-    ElapsedTime = CurrentTime - StartTime;\r
-  } while (ElapsedTime < Delay);\r
-\r
-  NanoSeconds = ElapsedTime * PcdGet32(PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds);\r
-\r
-  return NanoSeconds;\r
-}\r
-\r
-UINT64\r
-EFIAPI\r
-GetPerformanceCounter (\r
-  VOID\r
-  )\r
-{ \r
-  return (UINT64)MmioRead32 (TimerBase(PcdGet32(PcdOmap35xxFreeTimer)) + GPTIMER_TCRR);\r
-}\r
-\r
-UINT64\r
-EFIAPI\r
-GetPerformanceCounterProperties (\r
-  OUT UINT64  *StartValue,  OPTIONAL\r
-  OUT UINT64  *EndValue     OPTIONAL\r
-  )\r
-{\r
-  if (StartValue != NULL) {\r
-    // Timer starts with the reload value\r
-    *StartValue = (UINT64)MmioRead32 (TimerBase(PcdGet32(PcdOmap35xxFreeTimer)) + GPTIMER_TLDR);\r
-  }\r
-  \r
-  if (EndValue != NULL) {\r
-    // Timer counts up to 0xFFFFFFFF\r
-    *EndValue = 0xFFFFFFFF;\r
-  }\r
-  \r
-  return PcdGet64(PcdEmbeddedPerformanceCounterFreqencyInHz);\r
-}\r

diff --git a/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf b/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
new file mode 100644 (file)
index 0000000..515dff9
--- /dev/null
+++ b/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
@@ -0,0 +1,45 @@
+#/** @file\r
+# Timer library implementation\r
+#\r
+# A non-functional instance of the Timer Library that can be used as a template\r
+#  for the implementation of a functional timer library instance. This library instance can\r
+#  also be used to test build DXE, Runtime, DXE SAL, and DXE SMM modules that require timer\r
+#  services as well as EBC modules that require timer services\r
+# Copyright (c) 2007, Intel Corporation.\r
+#\r
+#  All rights reserved. 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
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = BeagleBoardTimerLib\r
+  FILE_GUID                      = fe1d7183-9abb-42ce-9a3b-36d7c6a8959f\r
+  MODULE_TYPE                    = BASE\r
+  VERSION_STRING                 = 1.0\r
+  LIBRARY_CLASS                  = TimerLib \r
+\r
+[Sources.common]\r
+  TimerLib.c\r
+\r
+[Packages]\r
+  Omap35xxPkg/Omap35xxPkg.dec\r
+  MdePkg/MdePkg.dec\r
+  EmbeddedPkg/EmbeddedPkg.dec\r
+\r
+[LibraryClasses]\r
+  DebugLib\r
+  OmapLib\r
+  IoLib\r
+\r
+[Pcd]\r
+  gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFreqencyInHz\r
+  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds\r
+  gOmap35xxTokenSpaceGuid.PcdOmap35xxFreeTimer\r
+\r

diff --git a/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c b/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c
new file mode 100644 (file)
index 0000000..1b1f2a9
--- /dev/null
+++ b/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c
@@ -0,0 +1,102 @@
+/** @file\r
+\r
+  Copyright (c) 2008-2009, Apple Inc. All rights reserved.\r
+  \r
+  All rights reserved. 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
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#include <Base.h>\r
+\r
+#include <Library/BaseLib.h>\r
+#include <Library/TimerLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/IoLib.h>\r
+#include <Library/OmapLib.h>\r
+\r
+#include <Omap3530/Omap3530.h>\r
+\r
+UINTN\r
+EFIAPI\r
+MicroSecondDelay (\r
+  IN  UINTN MicroSeconds\r
+  )\r
+{\r
+  UINT64  NanoSeconds;\r
+  \r
+  NanoSeconds = MultU64x32(MicroSeconds, 1000);\r
+\r
+  while (NanoSeconds > (UINTN)-1) { \r
+    NanoSecondDelay((UINTN)-1);\r
+    NanoSeconds -= (UINTN)-1;\r
+  }\r
+\r
+  NanoSecondDelay(NanoSeconds);\r
+\r
+  return MicroSeconds;\r
+}\r
+\r
+UINTN\r
+EFIAPI\r
+NanoSecondDelay (\r
+  IN  UINTN NanoSeconds\r
+  )\r
+{\r
+  UINT32  Delay;\r
+  UINT32  StartTime;\r
+  UINT32  CurrentTime;\r
+  UINT32  ElapsedTime;\r
+  UINT32  TimerCountRegister;\r
+\r
+  Delay = (NanoSeconds / PcdGet32(PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds)) + 1;\r
+  \r
+  TimerCountRegister = TimerBase(PcdGet32(PcdOmap35xxFreeTimer)) + GPTIMER_TCRR;\r
+\r
+  StartTime = MmioRead32 (TimerCountRegister);\r
+\r
+  do \r
+  {\r
+    CurrentTime = MmioRead32 (TimerCountRegister);\r
+    ElapsedTime = CurrentTime - StartTime;\r
+  } while (ElapsedTime < Delay);\r
+\r
+  NanoSeconds = ElapsedTime * PcdGet32(PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds);\r
+\r
+  return NanoSeconds;\r
+}\r
+\r
+UINT64\r
+EFIAPI\r
+GetPerformanceCounter (\r
+  VOID\r
+  )\r
+{ \r
+  return (UINT64)MmioRead32 (TimerBase(PcdGet32(PcdOmap35xxFreeTimer)) + GPTIMER_TCRR);\r
+}\r
+\r
+UINT64\r
+EFIAPI\r
+GetPerformanceCounterProperties (\r
+  OUT UINT64  *StartValue,  OPTIONAL\r
+  OUT UINT64  *EndValue     OPTIONAL\r
+  )\r
+{\r
+  if (StartValue != NULL) {\r
+    // Timer starts with the reload value\r
+    *StartValue = (UINT64)MmioRead32 (TimerBase(PcdGet32(PcdOmap35xxFreeTimer)) + GPTIMER_TLDR);\r
+  }\r
+  \r
+  if (EndValue != NULL) {\r
+    // Timer counts up to 0xFFFFFFFF\r
+    *EndValue = 0xFFFFFFFF;\r
+  }\r
+  \r
+  return PcdGet64(PcdEmbeddedPerformanceCounterFreqencyInHz);\r
+}\r