Re: [PATCH edk2-platforms 2/4] Platform/ARM: create local definition of NorFlashPlatformLib

["Sami Mujawar" <sami.mujawar@arm.com>]

Hi Ard,

Thank you for this patch.

The patch at 'https://edk2.groups.io/g/devel/message/95239' is moving 
the NorFlashPlatformLib.h to 
MdePkg/Include/Library/NorFlashPlatformLib.h. Is the plan to drop 
Platform/ARM/Include/Library/NorFlashPlatformLib.h once the MdePkg patch 
is merged?

Other than that, these changes look good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

On 19/10/2022 11:35 am, Ard Biesheuvel wrote:
> The version of NorFlashPlatformLib defined in ArmPlatformPkg will go
> away once we retire its version of NorFlashDxe, so switch to a local
> Platform/ARM version instead.
>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
>   Platform/ARM/ARM.dec                                                |  1 +
>   Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf    |  2 +-
>   Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf             |  2 +-
>   Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf |  2 +-
>   Platform/ARM/Include/Library/NorFlashPlatformLib.h                  | 30 ++++++++++++++++++++
>   5 files changed, 34 insertions(+), 3 deletions(-)
>
> diff --git a/Platform/ARM/ARM.dec b/Platform/ARM/ARM.dec
> index 5175b313f95a..cf1c8ef04742 100644
> --- a/Platform/ARM/ARM.dec
> +++ b/Platform/ARM/ARM.dec
> @@ -17,6 +17,7 @@ [Includes]
>   
>
>   [LibraryClasses]
>
>     BdsLib|Include/Library/BdsLib.h
>
> +  NorFlashPlatformLib|Include/Library/NorFlashPlatformLib.h
>
>   
>
>   [Guids]
>
>     gArmBootMonFsFileInfoGuid   = { 0x41e26b9c, 0xada6, 0x45b3, { 0x80, 0x8e, 0x23, 0x57, 0xa3, 0x5b, 0x60, 0xd6 } }
>
> diff --git a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
> index e5e5628de387..1a38bf81b349 100644
> --- a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
> +++ b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
> @@ -17,8 +17,8 @@ [Sources.common]
>     NorFlashJuno.c
>
>   
>
>   [Packages]
>
> -  ArmPlatformPkg/ArmPlatformPkg.dec
>
>     MdePkg/MdePkg.dec
>
> +  Platform/ARM/ARM.dec
>
>     Platform/ARM/JunoPkg/ArmJuno.dec
>
>   
>
>   [LibraryClasses]
>
> diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
> index 74486eacd009..06068db0e4f3 100644
> --- a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
> +++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
> @@ -18,8 +18,8 @@ [Sources.common]
>     NorFlashLib.c
>
>   
>
>   [Packages]
>
> -  ArmPlatformPkg/ArmPlatformPkg.dec
>
>     MdePkg/MdePkg.dec
>
> +  Platform/ARM/ARM.dec
>
>     Platform/ARM/SgiPkg/SgiPlatform.dec
>
>   
>
>   [LibraryClasses]
>
> diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf b/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf
> index 96bbf1e42313..54b3cb041645 100644
> --- a/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf
> +++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf
> @@ -19,8 +19,8 @@ [Sources.common]
>     StandaloneMmNorFlashLib.c
>
>   
>
>   [Packages]
>
> -  ArmPlatformPkg/ArmPlatformPkg.dec
>
>     MdePkg/MdePkg.dec
>
> +  Platform/ARM/ARM.dec
>
>     Platform/ARM/SgiPkg/SgiPlatform.dec
>
>   
>
>   [LibraryClasses]
>
> diff --git a/Platform/ARM/Include/Library/NorFlashPlatformLib.h b/Platform/ARM/Include/Library/NorFlashPlatformLib.h
> new file mode 100644
> index 000000000000..6ef5b70e9948
> --- /dev/null
> +++ b/Platform/ARM/Include/Library/NorFlashPlatformLib.h
> @@ -0,0 +1,30 @@
> +/** @file
>
> +
>
> + Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
>
> +
>
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> +
>
> + **/
>
> +
>
> +#ifndef _NORFLASHPLATFORMLIB_H_
>
> +#define _NORFLASHPLATFORMLIB_H_
>
> +
>
> +typedef struct {
>
> +  UINTN    DeviceBaseAddress;       // Start address of the Device Base Address (DBA)
>
> +  UINTN    RegionBaseAddress;       // Start address of one single region
>
> +  UINTN    Size;
>
> +  UINTN    BlockSize;
>
> +} NOR_FLASH_DESCRIPTION;
>
> +
>
> +EFI_STATUS
>
> +NorFlashPlatformInitialization (
>
> +  VOID
>
> +  );
>
> +
>
> +EFI_STATUS
>
> +NorFlashPlatformGetDevices (
>
> +  OUT NOR_FLASH_DESCRIPTION  **NorFlashDescriptions,
>
> +  OUT UINT32                 *Count
>
> +  );
>
> +
>
> +#endif /* _NORFLASHPLATFORMLIB_H_ */
>