Pushed as 60bb320b9e..73d1067db3 -----Original Message----- From: Desimone, Nathaniel L <nathaniel.l.desim...@intel.com> Sent: Wednesday, January 12, 2022 6:54 PM To: Oram, Isaac W <isaac.w.o...@intel.com>; devel@edk2.groups.io Cc: Chiu, Chasel <chasel.c...@intel.com> Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleyOpenBoardPkg/Include: Remove duplicate file
Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com> > -----Original Message----- > From: Oram, Isaac W <isaac.w.o...@intel.com> > Sent: Monday, January 10, 2022 2:41 PM > To: devel@edk2.groups.io > Cc: Oram, Isaac W <isaac.w.o...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com>; Chiu, Chasel <chasel.c...@intel.com> > Subject: [edk2-devel][edk2-platforms][PATCH V1 1/1] > WhitleyOpenBoardPkg/Include: Remove duplicate file > > Switch to using the IntelSiliconPkg version of the file as both were > identical. > > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Cc: Chasel Chiu <chasel.c...@intel.com> > > Signed-off-by: Isaac Oram <isaac.w.o...@intel.com> > --- > > Platform/Intel/WhitleyOpenBoardPkg/Include/Library/SpiFlashCommonLib.h > | 98 -------------------- > > Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/Sm > mSpiFlashCommonLib.inf | 1 + > 2 files changed, 1 insertion(+), 98 deletions(-) > > diff --git > a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/SpiFlashCommonLi > b.h > b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/SpiFlashCommonLi > b.h > deleted file mode 100644 > index ef62ba238d..0000000000 > --- > a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/SpiFlashCommonLi > b.h > +++ /dev/null > @@ -1,98 +0,0 @@ > -/** @file > - The header file includes the common header files, defines > - internal structure and functions used by SpiFlashCommonLib. > - > - Copyright (c) 2019 Intel Corporation. All rights reserved. <BR> > - SPDX-License-Identifier: BSD-2-Clause-Patent > - > -**/ > - > -#ifndef __SPI_FLASH_COMMON_LIB_H__ > -#define __SPI_FLASH_COMMON_LIB_H__ > - > -#include <Uefi.h> > -#include <Library/BaseLib.h> > -#include <Library/PcdLib.h> > -#include <Library/DebugLib.h> > -#include <Library/BaseMemoryLib.h> > -#include <Library/MemoryAllocationLib.h> -#include > <Library/UefiDriverEntryPoint.h> -#include > <Library/UefiBootServicesTableLib.h> > - > -#define SECTOR_SIZE_4KB 0x1000 // Common 4kBytes sector size > -/** > - Enable block protection on the Serial Flash device. > - > - @retval EFI_SUCCESS Opertion is successful. > - @retval EFI_DEVICE_ERROR If there is any device errors. > - > -**/ > -EFI_STATUS > -EFIAPI > -SpiFlashLock ( > - VOID > - ); > - > -/** > - Read NumBytes bytes of data from the address specified by > - PAddress into Buffer. > - > - @param[in] Address The starting physical address of the read. > - @param[in,out] NumBytes On input, the number of bytes to read. On > output, the number > - of bytes actually read. > - @param[out] Buffer The destination data buffer for the read. > - > - @retval EFI_SUCCESS Opertion is successful. > - @retval EFI_DEVICE_ERROR If there is any device errors. > - > -**/ > -EFI_STATUS > -EFIAPI > -SpiFlashRead ( > - IN UINTN Address, > - IN OUT UINT32 *NumBytes, > - OUT UINT8 *Buffer > - ); > - > -/** > - Write NumBytes bytes of data from Buffer to the address specified > by > - PAddresss. > - > - @param[in] Address The starting physical address of the write. > - @param[in,out] NumBytes On input, the number of bytes to write. On > output, > - the actual number of bytes written. > - @param[in] Buffer The source data buffer for the write. > - > - @retval EFI_SUCCESS Opertion is successful. > - @retval EFI_DEVICE_ERROR If there is any device errors. > - > -**/ > -EFI_STATUS > -EFIAPI > -SpiFlashWrite ( > - IN UINTN Address, > - IN OUT UINT32 *NumBytes, > - IN UINT8 *Buffer > - ); > - > -/** > - Erase the block starting at Address. > - > - @param[in] Address The starting physical address of the block to > be > erased. > - This library assume that caller garantee that > the PAddress > - is at the starting address of this block. > - @param[in] NumBytes On input, the number of bytes of the logical > block to be erased. > - On output, the actual number of bytes erased. > - > - @retval EFI_SUCCESS. Opertion is successful. > - @retval EFI_DEVICE_ERROR If there is any device errors. > - > -**/ > -EFI_STATUS > -EFIAPI > -SpiFlashBlockErase ( > - IN UINTN Address, > - IN UINTN *NumBytes > - ); > - > -#endif > diff --git > a/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/S > mmSpiFlashCommonLib.inf > b/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/S > mmSpiFlashCommonLib.inf > index a5bcb5e2f2..b1e0896c7c 100644 > --- > a/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/S > mmSpiFlashCommonLib.inf > +++ > b/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/S > m > +++ mSpiFlashCommonLib.inf > @@ -33,6 +33,7 @@ > > [Packages] > MdePkg/MdePkg.dec > + IntelSiliconPkg/IntelSiliconPkg.dec > WhitleySiliconPkg/WhitleySiliconPkg.dec > WhitleySiliconPkg/CpRcPkg.dec > WhitleyOpenBoardPkg/PlatformPkg.dec > -- > 2.27.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85689): https://edk2.groups.io/g/devel/message/85689 Mute This Topic: https://groups.io/mt/88336182/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
