From fa14cfc927e34ddc07dfbb7af7bbdc51b40c949a Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Tue, 13 Jan 2015 18:58:00 +0000 Subject: [PATCH] ArmPlatformPkg: Fixed builds after some ShellPkg libraries have moved Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16605 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc | 7 +++---- ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf | 4 +--- ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c | 3 +-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc index 8c6368cb78..68e2bc7f6e 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc @@ -1,5 +1,5 @@ # -# Copyright (c) 2011-2014, ARM Limited. All rights reserved. +# Copyright (c) 2011-2015, ARM Limited. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -23,7 +23,6 @@ DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BasePathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf @@ -119,8 +118,8 @@ # It uses the Shell libraries. ArmShellCmdRunAxfLib|ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf - FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf - SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf + SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf [LibraryClasses.common.SEC] ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf diff --git a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf index 43595d88ee..b42d205a2b 100644 --- a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf +++ b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf @@ -1,7 +1,7 @@ #/** @file # Support for ARM Boot Monitor File System # -# Copyright (c) 2012-2014, ARM Ltd. All rights reserved.
+# Copyright (c) 2012-2015, ARM Ltd. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -34,11 +34,9 @@ ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - ShellPkg/ShellPkg.dec [LibraryClasses] BaseLib - BasePathLib DevicePathLib MemoryAllocationLib PrintLib diff --git a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c index dc83b3882b..af2fe514f0 100644 --- a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c +++ b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c @@ -1,6 +1,6 @@ /** @file * -* Copyright (c) 2012-2014, ARM Limited. All rights reserved. +* Copyright (c) 2012-2015, ARM Limited. All rights reserved. * * This program and the accompanying materials * are licensed and made available under the terms and conditions of the BSD License @@ -12,7 +12,6 @@ * **/ -#include #include "BootMonFsInternal.h" // Clear a file's image description on storage media: -- 2.39.2