From 382127fc4ce6acbae01a128230e41a07faf868f2 Mon Sep 17 00:00:00 2001 From: andrewfish Date: Tue, 13 Apr 2010 18:31:27 +0000 Subject: [PATCH] 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 --- .../BeagleBoardSystemLib.c | 110 ------------------ .../BeagleBoardSystemLib.inf | 44 ------- .../BeagleBoardSystemLib/GoLittleEndian.S | 27 ----- .../BeagleBoardSystemLib/GoLittleEndian.asm | 27 ----- .../Omap35xxTimerLib.inf} | 0 .../TimerLib.c | 0 6 files changed, 208 deletions(-) delete mode 100644 Omap35xxPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.c delete mode 100644 Omap35xxPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf delete mode 100644 Omap35xxPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S delete mode 100644 Omap35xxPkg/Library/BeagleBoardSystemLib/GoLittleEndian.asm rename Omap35xxPkg/Library/{BeagleBoardTimerLib/BeagleBoardTimerLib.inf => Omap35xxTimerLib/Omap35xxTimerLib.inf} (100%) rename Omap35xxPkg/Library/{BeagleBoardTimerLib => Omap35xxTimerLib}/TimerLib.c (100%) diff --git a/Omap35xxPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.c b/Omap35xxPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.c deleted file mode 100644 index f8d7b97ca8..0000000000 --- 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 - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -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 index 4df8c86f6d..0000000000 --- a/Omap35xxPkg/Library/BeagleBoardSystemLib/BeagleBoardSystemLib.inf +++ /dev/null @@ -1,44 +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 - -[LibraryClasses] - ArmLib - CacheMaintenanceLib - MemoryAllocationLib - UefiRuntimeServicesTableLib - TimerLib - UefiLib - -[Pcd] - gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase diff --git a/Omap35xxPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S b/Omap35xxPkg/Library/BeagleBoardSystemLib/GoLittleEndian.S deleted file mode 100644 index a37ae7c883..0000000000 --- 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 index 8daced6b8f..0000000000 --- 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/Omap35xxTimerLib/Omap35xxTimerLib.inf similarity index 100% rename from Omap35xxPkg/Library/BeagleBoardTimerLib/BeagleBoardTimerLib.inf rename to Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf diff --git a/Omap35xxPkg/Library/BeagleBoardTimerLib/TimerLib.c b/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c similarity index 100% rename from Omap35xxPkg/Library/BeagleBoardTimerLib/TimerLib.c rename to Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c