| Message ID | 1477651478-16830-3-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | c3cbe35be83a413f893bab58de2bded9a55c8a63 |
| Headers | show |
On Fri, Oct 28, 2016 at 11:44:31AM +0100, Ard Biesheuvel wrote: > Remove this unused version: all existing platforms use the one under > ArmPlatformPkg instead. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > --- > EmbeddedPkg/EmbeddedPkg.dec | 1 - > EmbeddedPkg/EmbeddedPkg.dsc | 1 - > EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointer.c | 69 -------------------- > EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf | 38 ----------- > Omap35xxPkg/Omap35xxPkg.dsc | 1 - > 5 files changed, 110 deletions(-) > > diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec > index 775d863c5f64..2c2cf41103c2 100644 > --- a/EmbeddedPkg/EmbeddedPkg.dec > +++ b/EmbeddedPkg/EmbeddedPkg.dec > @@ -97,7 +97,6 @@ [PcdsFixedAtBuild.common] > gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000|UINT32|0x00000009 > gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"Ebl"|VOID*|0x00000034 > > - gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|131072|UINT32|0x00000040 > gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0|UINT32|0x0000000b > gEmbeddedTokenSpaceGuid.PcdPrePiStackSize|131072|UINT32|0x0000000c > > diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc > index cd1f6df06b24..5224bcefa9c7 100644 > --- a/EmbeddedPkg/EmbeddedPkg.dsc > +++ b/EmbeddedPkg/EmbeddedPkg.dsc > @@ -184,7 +184,6 @@ [PcdsFixedAtBuild.common] > gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07 > gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000 > > - gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|0 > gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0 > gEmbeddedTokenSpaceGuid.PcdPrePiStackSize|0 > > diff --git a/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointer.c b/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointer.c > deleted file mode 100644 > index 9065b1132fda..000000000000 > --- a/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointer.c > +++ /dev/null > @@ -1,69 +0,0 @@ > -/** @file > -* > -* Copyright (c) 2011, 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 > -* 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 <PiPei.h> > -#include <Library/PrePiHobListPointerLib.h> > -#include <Library/DebugLib.h> > -#include <Library/PcdLib.h> > - > -// > -// Have to use build system to set the original value in case we are running > -// from FLASH and globals don't work. So if you do a GetHobList() and gHobList > -// and gHobList is NULL the PCD default values are used. > -// > -VOID *gHobList = NULL; > - > - > -/** > - Returns the pointer to the HOB list. > - > - This function returns the pointer to first HOB in the list. > - > - @return The pointer to the HOB list. > - > -**/ > -VOID * > -EFIAPI > -PrePeiGetHobList ( > - VOID > - ) > -{ > - if (gHobList == NULL) { > - return (VOID *)*(UINTN*)PcdGet32 (PcdPrePiHobBase); > - } else { > - return gHobList; > - } > -} > - > - > - > -/** > - Updates the pointer to the HOB list. > - > - @param HobList Hob list pointer to store > - > -**/ > -EFI_STATUS > -EFIAPI > -PrePeiSetHobList ( > - IN VOID *HobList > - ) > -{ > - gHobList = HobList; > - > - // > - // If this code is running from ROM this could fail > - // > - return (gHobList == HobList) ? EFI_SUCCESS: EFI_UNSUPPORTED; > -} > diff --git a/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf b/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf > deleted file mode 100644 > index bfd3c209a13b..000000000000 > --- a/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf > +++ /dev/null > @@ -1,38 +0,0 @@ > -#/** @file > -# > -# Copyright (c) 2011, 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 > -# 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 = PrePiHobListPointerLib > - FILE_GUID = 7a6a7fc0-5ee0-11e0-b47f-0002a5d5c51b > - MODULE_TYPE = BASE > - VERSION_STRING = 1.0 > - LIBRARY_CLASS = PrePiHobListPointerLib > - > -# > -# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) > -# > - > -[Sources] > - PrePiHobListPointer.c > - > -[Packages] > - MdePkg/MdePkg.dec > - EmbeddedPkg/EmbeddedPkg.dec > - > -[LibraryClasses] > - #DebugLib > - > -[FixedPcd.common] > - gEmbeddedTokenSpaceGuid.PcdPrePiHobBase > diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc > index 580be4d6340c..4a3317f255f6 100644 > --- a/Omap35xxPkg/Omap35xxPkg.dsc > +++ b/Omap35xxPkg/Omap35xxPkg.dsc > @@ -141,7 +141,6 @@ [PcdsFixedAtBuild.common] > > gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase|0 > gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize|0 > - gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|0x80001000 > gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0x87FE0000 # stack at top of memory > gEmbeddedTokenSpaceGuid.PcdPrePiStackSize|0x20000 # 128K stack > gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x80000000 > -- > 2.7.4 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec index 775d863c5f64..2c2cf41103c2 100644 --- a/EmbeddedPkg/EmbeddedPkg.dec +++ b/EmbeddedPkg/EmbeddedPkg.dec @@ -97,7 +97,6 @@ [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000|UINT32|0x00000009 gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"Ebl"|VOID*|0x00000034 - gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|131072|UINT32|0x00000040 gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0|UINT32|0x0000000b gEmbeddedTokenSpaceGuid.PcdPrePiStackSize|131072|UINT32|0x0000000c diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index cd1f6df06b24..5224bcefa9c7 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -184,7 +184,6 @@ [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07 gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000 - gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|0 gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0 gEmbeddedTokenSpaceGuid.PcdPrePiStackSize|0 diff --git a/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointer.c b/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointer.c deleted file mode 100644 index 9065b1132fda..000000000000 --- a/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointer.c +++ /dev/null @@ -1,69 +0,0 @@ -/** @file -* -* Copyright (c) 2011, 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 -* 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 <PiPei.h> -#include <Library/PrePiHobListPointerLib.h> -#include <Library/DebugLib.h> -#include <Library/PcdLib.h> - -// -// Have to use build system to set the original value in case we are running -// from FLASH and globals don't work. So if you do a GetHobList() and gHobList -// and gHobList is NULL the PCD default values are used. -// -VOID *gHobList = NULL; - - -/** - Returns the pointer to the HOB list. - - This function returns the pointer to first HOB in the list. - - @return The pointer to the HOB list. - -**/ -VOID * -EFIAPI -PrePeiGetHobList ( - VOID - ) -{ - if (gHobList == NULL) { - return (VOID *)*(UINTN*)PcdGet32 (PcdPrePiHobBase); - } else { - return gHobList; - } -} - - - -/** - Updates the pointer to the HOB list. - - @param HobList Hob list pointer to store - -**/ -EFI_STATUS -EFIAPI -PrePeiSetHobList ( - IN VOID *HobList - ) -{ - gHobList = HobList; - - // - // If this code is running from ROM this could fail - // - return (gHobList == HobList) ? EFI_SUCCESS: EFI_UNSUPPORTED; -} diff --git a/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf b/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf deleted file mode 100644 index bfd3c209a13b..000000000000 --- a/EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf +++ /dev/null @@ -1,38 +0,0 @@ -#/** @file -# -# Copyright (c) 2011, 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 -# 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 = PrePiHobListPointerLib - FILE_GUID = 7a6a7fc0-5ee0-11e0-b47f-0002a5d5c51b - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = PrePiHobListPointerLib - -# -# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) -# - -[Sources] - PrePiHobListPointer.c - -[Packages] - MdePkg/MdePkg.dec - EmbeddedPkg/EmbeddedPkg.dec - -[LibraryClasses] - #DebugLib - -[FixedPcd.common] - gEmbeddedTokenSpaceGuid.PcdPrePiHobBase diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc index 580be4d6340c..4a3317f255f6 100644 --- a/Omap35xxPkg/Omap35xxPkg.dsc +++ b/Omap35xxPkg/Omap35xxPkg.dsc @@ -141,7 +141,6 @@ [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase|0 gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize|0 - gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|0x80001000 gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0x87FE0000 # stack at top of memory gEmbeddedTokenSpaceGuid.PcdPrePiStackSize|0x20000 # 128K stack gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x80000000
Remove this unused version: all existing platforms use the one under ArmPlatformPkg instead. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- EmbeddedPkg/EmbeddedPkg.dec | 1 - EmbeddedPkg/EmbeddedPkg.dsc | 1 - EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointer.c | 69 -------------------- EmbeddedPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf | 38 ----------- Omap35xxPkg/Omap35xxPkg.dsc | 1 - 5 files changed, 110 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel