[PATCH 1/5] ArmPkg/ArmDmaLib: add missing DxeServicesTableLib dependency

[PATCH 1/5] ArmPkg/ArmDmaLib: add missing DxeServicesTableLib dependency

[Ard Biesheuvel]

This missing dependency has gone unnoticed until now, but it is breaking
the Omap35xxPkg.dsc build.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
index 20228d286427..95c13006eaac 100644
--- a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
+++ b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
@@ -31,6 +31,7 @@ [Packages]
 
 [LibraryClasses]
   DebugLib
+  DxeServicesTableLib
   UefiBootServicesTableLib
   MemoryAllocationLib
   UncachedMemoryAllocationLib
-- 
2.7.4

[PATCH 2/5] Omap35xxPkg: remove unused ResetSystemLib implementation

[Ard Biesheuvel]

This code is unused so remove it.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Omap35xxPkg/Library/ResetSystemLib/ResetSystemLib.c   | 90 --------------------
 Omap35xxPkg/Library/ResetSystemLib/ResetSystemLib.inf | 40 ---------
 2 files changed, 130 deletions(-)

diff --git a/Omap35xxPkg/Library/ResetSystemLib/ResetSystemLib.c b/Omap35xxPkg/Library/ResetSystemLib/ResetSystemLib.c
deleted file mode 100644
index 82f04eaad1c8..000000000000
--- a/Omap35xxPkg/Library/ResetSystemLib/ResetSystemLib.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/** @file
-  Template library implementation to support ResetSystem Runtime call.
-
-  Fill in the templates with what ever makes you system reset.
-
-
-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-
-  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 <PiDxe.h>
-
-#include <Library/PcdLib.h>
-#include <Library/ArmLib.h>
-#include <Library/CacheMaintenanceLib.h>
-#include <Library/DebugLib.h>
-#include <Library/EfiResetSystemLib.h>
-
-
-/**
-  Resets the entire platform.
-
-  @param  ResetType             The type of reset to perform.
-  @param  ResetStatus           The status code for the reset.
-  @param  DataSize              The size, in bytes, of WatchdogData.
-  @param  ResetData             For a ResetType of EfiResetCold, EfiResetWarm, or
-                                EfiResetShutdown the data buffer starts with a Null-terminated
-                                Unicode string, optionally followed by additional binary data.
-
-**/
-EFI_STATUS
-EFIAPI
-LibResetSystem (
-  IN EFI_RESET_TYPE   ResetType,
-  IN EFI_STATUS       ResetStatus,
-  IN UINTN            DataSize,
-  IN CHAR16           *ResetData OPTIONAL
-  )
-{
-  if (ResetData != NULL) {
-    DEBUG((EFI_D_ERROR, "%s", ResetData));
-  }
-
-  switch (ResetType) {
-  case EfiResetWarm:
-    // Map a warm reset into a cold reset
-  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;
-  }
-
-  // If the reset didn't work, return an error.
-  ASSERT (FALSE);
-  return EFI_DEVICE_ERROR;
-}
-
-
-
-/**
-  Initialize any infrastructure required for LibResetSystem () to function.
-
-  @param  ImageHandle   The firmware allocated handle for the EFI image.
-  @param  SystemTable   A pointer to the EFI System Table.
-
-  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.
-
-**/
-EFI_STATUS
-EFIAPI
-LibInitializeResetSystem (
-  IN EFI_HANDLE        ImageHandle,
-  IN EFI_SYSTEM_TABLE  *SystemTable
-  )
-{
-  return EFI_SUCCESS;
-}
-
diff --git a/Omap35xxPkg/Library/ResetSystemLib/ResetSystemLib.inf b/Omap35xxPkg/Library/ResetSystemLib/ResetSystemLib.inf
deleted file mode 100644
index 3ca5c518205c..000000000000
--- a/Omap35xxPkg/Library/ResetSystemLib/ResetSystemLib.inf
+++ /dev/null
@@ -1,40 +0,0 @@
-#/** @file
-# Reset System lib to make it easy to port new platforms
-#
-# Copyright (c) 2008, Apple Inc. All rights reserved.<BR>
-#
-#  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                      = BeagleBoardResetSystemLib
-  FILE_GUID                      = 781371a2-3fdd-41d4-96a1-7b34cbc9e895
-  MODULE_TYPE                    = BASE
-  VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = EfiResetSystemLib
-
-
-[Sources.common]
-  ResetSystemLib.c
-
-[Packages]
-  Omap35xxPkg/Omap35xxPkg.dec
-  ArmPkg/ArmPkg.dec
-  MdePkg/MdePkg.dec
-  EmbeddedPkg/EmbeddedPkg.dec
-
-[Pcd.common]
-  gArmTokenSpaceGuid.PcdCpuResetAddress
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress
-
-[LibraryClasses]
-  DebugLib
-  BeagleBoardSystemLib
-- 
2.7.4

[PATCH 3/5] Omap35xxPkg/MMCHSDxe: fix device path initializer

[Ard Biesheuvel]

Fix the braces in a static device path template definition.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Omap35xxPkg/MMCHSDxe/MMCHS.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Omap35xxPkg/MMCHSDxe/MMCHS.c b/Omap35xxPkg/MMCHSDxe/MMCHS.c
index 9f0ebe0f65d5..5c8e1bd74692 100644
--- a/Omap35xxPkg/MMCHSDxe/MMCHS.c
+++ b/Omap35xxPkg/MMCHSDxe/MMCHS.c
@@ -43,11 +43,15 @@ typedef struct {
 
 MMCHS_DEVICE_PATH gMmcHsDevicePath = {
   {
-    HARDWARE_DEVICE_PATH,
-    HW_VENDOR_DP,
-    (UINT8)(sizeof(VENDOR_DEVICE_PATH)),
-    (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8),
-    0xb615f1f5, 0x5088, 0x43cd, 0x80, 0x9c, 0xa1, 0x6e, 0x52, 0x48, 0x7d, 0x00
+    {
+      HARDWARE_DEVICE_PATH,
+      HW_VENDOR_DP,
+      {
+        (UINT8)(sizeof(VENDOR_DEVICE_PATH)),
+        (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8),
+      },
+    },
+    { 0xb615f1f5, 0x5088, 0x43cd, { 0x80, 0x9c, 0xa1, 0x6e, 0x52, 0x48, 0x7d, 0x00 } },
   },
   {
     END_DEVICE_PATH_TYPE,
-- 
2.7.4

[PATCH 4/5] Omap35xxPkg/Omap35xxPkg.dsc: fix build and add missing modules

[Ard Biesheuvel]

Bring Omap35xxPkg.dsc up to date so it covers all modules and builds
correctly with the latest toolchains.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Omap35xxPkg/Omap35xxPkg.dsc | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc
index 2b339253ff9c..7fb5a689ae9d 100644
--- a/Omap35xxPkg/Omap35xxPkg.dsc
+++ b/Omap35xxPkg/Omap35xxPkg.dsc
@@ -62,6 +62,8 @@ [LibraryClasses.common]
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
 
+  TimerLib|Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
+
 #
 # Assume everything is fixed at build
 #
@@ -80,12 +82,8 @@ [LibraryClasses.common.DXE_DRIVER]
 
 
 [LibraryClasses.ARM]
-  #
-  # Note: This NULL library feature is not yet in the edk2/BaseTools, but it is checked in to
-  # the BaseTools project. So you need to build with the BaseTools project util this feature gets synced.
-  #
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
+  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
 [BuildOptions]
   XCODE:*_*_ARM_ARCHCC_FLAGS     == -arch armv7 -march=armv7
@@ -140,9 +138,6 @@ [PcdsFixedAtBuild.common]
 
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
 
-  gEmbeddedTokenSpaceGuid.PcdPrePiTempMemorySize|0
-  gEmbeddedTokenSpaceGuid.PcdPrePiBfvBaseAddress|0
-  gEmbeddedTokenSpaceGuid.PcdPrePiBfvSize|0
   gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase|0
   gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize|0
   gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0x87FE0000 # stack at top of memory
@@ -186,5 +181,13 @@ [Components.common]
   Omap35xxPkg/TimerDxe/TimerDxe.inf
   Omap35xxPkg/TPS65950Dxe/TPS65950.inf
 
+  Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
+  Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
+  Omap35xxPkg/Library/EblCmdLib/EblCmdLib.inf
+  Omap35xxPkg/Library/GdbSerialLib/GdbSerialLib.inf
+  Omap35xxPkg/Library/RealTimeClockLib/RealTimeClockLib.inf
+  Omap35xxPkg/Library/SerialPortLib/SerialPortLib.inf
+  Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf
+  Omap35xxPkg/PciEmulation/PciEmulation.inf
 
 
-- 
2.7.4

[PATCH 5/5] Omap35xxPkg: enable -DDISABLE_NEW_DEPRECATED_INTERFACES

[Ard Biesheuvel]

Define DISABLE_NEW_DEPRECATED_INTERFACES on the compiler command line by
default, to prevent deprecated interfaces from being used in core EDK2
code.

Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=164
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Omap35xxPkg/Omap35xxPkg.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc
index 7fb5a689ae9d..4a3317f255f6 100644
--- a/Omap35xxPkg/Omap35xxPkg.dsc
+++ b/Omap35xxPkg/Omap35xxPkg.dsc
@@ -96,6 +96,7 @@ [BuildOptions]
   RVCT:*_*_ARM_ARCHCC_FLAGS     == --cpu 7-A
   RVCT:*_*_ARM_ARCHASM_FLAGS    == --cpu 7-A
 
+  *_*_*_CC_FLAGS = -DDISABLE_NEW_DEPRECATED_INTERFACES
 
 ################################################################################
 #
-- 
2.7.4

Re: [PATCH 1/5] ArmPkg/ArmDmaLib: add missing DxeServicesTableLib dependency

[Leif Lindholm]

No 0/5 for this series.

But I'll give the series
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
on this patch (unless you insist on having one per patch).

On Tue, Oct 25, 2016 at 06:10:23PM +0100, Ard Biesheuvel wrote:
> This missing dependency has gone unnoticed until now, but it is breaking
> the Omap35xxPkg.dsc build.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>  ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
> index 20228d286427..95c13006eaac 100644
> --- a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
> +++ b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
> @@ -31,6 +31,7 @@ [Packages]
>  
>  [LibraryClasses]
>    DebugLib
> +  DxeServicesTableLib
>    UefiBootServicesTableLib
>    MemoryAllocationLib
>    UncachedMemoryAllocationLib
> -- 
> 2.7.4
> 

Re: [PATCH 1/5] ArmPkg/ArmDmaLib: add missing DxeServicesTableLib dependency

[Ard Biesheuvel]

On 25 October 2016 at 18:46, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> No 0/5 for this series.
>
> But I'll give the series
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> on this patch (unless you insist on having one per patch).
>

Works for me

Thanks,
Ard.


> On Tue, Oct 25, 2016 at 06:10:23PM +0100, Ard Biesheuvel wrote:
>> This missing dependency has gone unnoticed until now, but it is breaking
>> the Omap35xxPkg.dsc build.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.0
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> ---
>>  ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
>> index 20228d286427..95c13006eaac 100644
>> --- a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
>> +++ b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
>> @@ -31,6 +31,7 @@ [Packages]
>>
>>  [LibraryClasses]
>>    DebugLib
>> +  DxeServicesTableLib
>>    UefiBootServicesTableLib
>>    MemoryAllocationLib
>>    UncachedMemoryAllocationLib
>> --
>> 2.7.4
>>

Re: [PATCH 1/5] ArmPkg/ArmDmaLib: add missing DxeServicesTableLib dependency

[Ard Biesheuvel]

On 25 October 2016 at 18:47, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> On 25 October 2016 at 18:46, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>> No 0/5 for this series.
>>
>> But I'll give the series
>> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>> on this patch (unless you insist on having one per patch).
>>
>

Series pushed