summaryrefslogtreecommitdiff
path: root/BeagleBoardPkg
diff options
context:
space:
mode:
authorandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2010-04-13 18:23:42 +0000
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2010-04-13 18:23:42 +0000
commitb1c5bd52113e316699aa2501b94c29ed2b7e3139 (patch)
tree6786acc465e9a846883df39e60753aa65cd83591 /BeagleBoardPkg
parent7e3538510fd79177efd1fc9b7937d02d94d2eaae (diff)
downloadedk2-platforms-b1c5bd52113e316699aa2501b94c29ed2b7e3139.tar.xz
Cleaning up thing Beagle in Omap35xx. Partial checkin as I'm getting errors out of svn for doing a svn mv.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10362 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BeagleBoardPkg')
-rw-r--r--BeagleBoardPkg/BeagleBoardPkg.dsc3
-rw-r--r--BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.c110
-rw-r--r--BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf45
-rw-r--r--BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S27
-rw-r--r--BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.asm27
5 files changed, 1 insertions, 211 deletions
diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 450cf765b3..1030d3f8a1 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -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
@@ -105,7 +104,7 @@
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
index a03ef575fb..0000000000
--- a/BeagleBoardPkg/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/BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf b/BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf
deleted file mode 100644
index 0ba46d6cc6..0000000000
--- a/BeagleBoardPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf
+++ /dev/null
@@ -1,45 +0,0 @@
-#/** @file
-# Support for Airport libraries.
-#
-# Copyright (c) 2009, Apple Inc.
-#
-# 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.
-#
-#
-#**/
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = BeagleBoardSystemLib
- FILE_GUID = b15a2640-fef2-447c-98e1-9ce22cfa529c
- MODULE_TYPE = BASE
- VERSION_STRING = 1.0
- LIBRARY_CLASS = BeagleBoardSystemLib
-
-[Sources.ARM]
- BeagleBoardSystemLib.c
- GoLittleEndian.asm | RVCT
- GoLittleEndian.S | GCC
-
-[Packages]
- MdePkg/MdePkg.dec
- EmbeddedPkg/EmbeddedPkg.dec
- ArmPkg/ArmPkg.dec
- Omap35xxPkg/Omap35xxPkg.dec
- BeagleBoardPkg/BeagleBoardPkg.dec
-
-[LibraryClasses]
- ArmLib
- CacheMaintenanceLib
- MemoryAllocationLib
- UefiRuntimeServicesTableLib
- TimerLib
- UefiLib
-
-[Pcd]
- gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase
diff --git a/BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S b/BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S
deleted file mode 100644
index a37ae7c883..0000000000
--- a/BeagleBoardPkg/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/BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.asm b/BeagleBoardPkg/Library/BeagleBoardSystemLib/GoLittleEndian.asm
deleted file mode 100644
index 8daced6b8f..0000000000
--- a/BeagleBoardPkg/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