ArmPlatformPkg: remove ArmPlatformInitializeSystemMemory

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / Library / ArmVExpressLibCTA15-A7 / CTA15-A7.c

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
index c650a6e3a59d118122733ddb14f581e009a88713..a6ddd1b792c9197b5d00e6ff12d2de7a93d08b71 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
@@ -1,14 +1,14 @@
 /** @file\r
 *\r
 *  Copyright (c) 2012, ARM Limited. All rights reserved.\r
-*  \r
-*  This program and the accompanying materials                          \r
-*  are licensed and made available under the terms and conditions of the BSD License         \r
-*  which accompanies this distribution.  The full text of the license may be found at        \r
-*  http://opensource.org/licenses/bsd-license.php                                            \r
 *\r
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+*  This program and the accompanying materials\r
+*  are licensed and made available under the terms and conditions of the BSD License\r
+*  which accompanies this distribution.  The full text of the license may be found at\r
+*  http://opensource.org/licenses/bsd-license.php\r
+*\r
+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 *\r
 **/\r
 \r
@@ -121,7 +121,11 @@ ArmPlatformGetBootMode (
   VOID\r
   )\r
 {\r
-  return BOOT_WITH_FULL_CONFIGURATION;\r
+  if (MmioRead32(ARM_CTA15A7_SCC_SYSINFO) & ARM_CTA15A7_SCC_SYSINFO_UEFI_RESTORE_DEFAULT_NORFLASH) {\r
+    return BOOT_WITH_DEFAULT_SETTINGS;\r
+  } else {\r
+    return BOOT_WITH_FULL_CONFIGURATION;\r
+  }\r
 }\r
 \r
 /**\r
@@ -136,7 +140,7 @@ ArmPlatformInitialize (
   IN  UINTN                     MpId\r
   )\r
 {\r
-  if (!IS_PRIMARY_CORE(MpId)) {\r
+  if (!ArmPlatformIsPrimaryCore (MpId)) {\r
     return RETURN_SUCCESS;\r
   }\r
 \r
@@ -145,19 +149,6 @@ ArmPlatformInitialize (
   return RETURN_SUCCESS;\r
 }\r
 \r
-/**\r
-  Initialize the system (or sometimes called permanent) memory\r
-\r
-  This memory is generally represented by the DRAM.\r
-\r
-**/\r
-VOID\r
-ArmPlatformInitializeSystemMemory (\r
-  VOID\r
-  )\r
-{\r
-}\r
-\r
 EFI_STATUS\r
 PrePeiCoreGetMpCoreInfo (\r
   OUT UINTN                   *CoreCount,\r
@@ -170,14 +161,12 @@ PrePeiCoreGetMpCoreInfo (
   return EFI_SUCCESS;\r
 }\r
 \r
-// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is undefined in the contect of PrePeiCore\r
-EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID;\r
 ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo };\r
 \r
 EFI_PEI_PPI_DESCRIPTOR      gPlatformPpiTable[] = {\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_PPI,\r
-    &mArmMpCoreInfoPpiGuid,\r
+    &gArmMpCoreInfoPpiGuid,\r
     &mMpCoreInfoPpi\r
   }\r
 };\r