Cleaning up thing Beagle in Omap35xx. Partial checkin as I'm getting errors out of...
authorandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 13 Apr 2010 18:23:42 +0000 (18:23 +0000)
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 13 Apr 2010 18:23:42 +0000 (18:23 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10362 6f19259b-4bc3-4df7-8a09-765794883524

BeagleBoardPkg/BeagleBoardPkg.dsc
BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.c [deleted file]
BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf [deleted file]
BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S [deleted file]
BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.asm [deleted file]

index 450cf765b313a94914830b66febbcbf00ad5451b..1030d3f8a1360f26891755004a6150f6fdb550f3 100644 (file)
@@ -46,7 +46,6 @@
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
 
-  BeagleBoardSystemLib|BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf
   EfiResetSystemLib|BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf
   
   PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
 
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
 
-  TimerLib|Omap35xxPkg/Library/BeagleBoardTimerLib/BeagleBoardTimerLib.inf  
+  TimerLib|Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf  
   OmapLib|Omap35xxPkg/Library/OmapLib/OmapLib.inf
   EblNetworkLib|EmbeddedPkg/Library/EblNetworkLib/EblNetworkLib.inf
   
diff --git a/BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.c b/BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.c
deleted file mode 100644 (file)
index a03ef57..0000000
+++ /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/BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf b/BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf
deleted file mode 100644 (file)
index 0ba46d6..0000000
+++ /dev/null
@@ -1,45 +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
-  BeagleBoardPkg/BeagleBoardPkg.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/BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S b/BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S
deleted file mode 100644 (file)
index a37ae7c..0000000
+++ /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/BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.asm b/BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.asm
deleted file mode 100644 (file)
index 8daced6..0000000
+++ /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