Merge branch 'armlt-tracking-a9' into armlt-tracking

3 files changed, 40 insertions, 5 deletions

diff --git a/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 3f9654f42..11eba89d9 100644
--- a/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -21,8 +21,8 @@
   PLATFORM_GUID                  = eb2bd5ff-2379-4a06-9c12-db905cdee9ea 

   PLATFORM_VERSION               = 0.1

   DSC_SPECIFICATION              = 0x00010005

-!ifdef $(EDK2_ARMVE_STANDALONE)

-  OUTPUT_DIRECTORY               = Build/ArmVExpress-CTA9x4-Standalone

+!ifdef $(EDK2_OUT_DIR)
+  OUTPUT_DIRECTORY               = $(EDK2_OUT_DIR)
 !else

   OUTPUT_DIRECTORY               = Build/ArmVExpress-CTA9x4

 !endif

@@ -30,6 +30,12 @@
   BUILD_TARGETS                  = DEBUG|RELEASE

   SKUID_IDENTIFIER               = DEFAULT

   FLASH_DEFINITION               = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf

+!ifndef $(EDK2_ARMVE_STANDALONE)
+  DEFINE EDK2_ARMVE_STANDALONE=1
+!endif
+!ifndef $(EDK2_ARMVE_SINGLE_BINARY)
+  DEFINE EDK2_ARMVE_SINGLE_BINARY=1
+!endif
 

 !include ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc

 

diff --git a/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index 34b9d250a..d950800d9 100644
--- a/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -25,6 +25,7 @@
 #

 ################################################################################

 

+!ifndef $(EDK2_ARMVE_SINGLE_BINARY)
 [FD.Sec_ArmVExpress_EFI]

 BaseAddress   = 0x44000000|gArmTokenSpaceGuid.PcdSecureFdBaseAddress  #The base address of the Secure FLASH Device.

 Size          = 0x00080000|gArmTokenSpaceGuid.PcdSecureFdSize         #The size in bytes of the Secure FLASH Device

@@ -51,20 +52,32 @@ NumBlocks     = 0x80
 0x00000000|0x00080000

 gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize

 FV = FVMAIN_SEC

-

+!endif
 

 [FD.ArmVExpress_EFI]

 !if $(EDK2_ARMVE_STANDALONE) == 1

+!if $(EDK2_ARMVE_SINGLE_BINARY) == 1
+BaseAddress   = 0x44000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.
+!else
 BaseAddress   = 0x45000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.

+!endif
 !else

 BaseAddress   = 0x80000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in remapped DRAM.

 !endif

+!if $(EDK2_ARMVE_SINGLE_BINARY) == 1
+Size          = 0x00280000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device
+!else
 Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device

+!endif
 ErasePolarity = 1

 

 # This one is tricky, it must be: BlockSize * NumBlocks = Size

 BlockSize     = 0x00001000

+!if $(EDK2_ARMVE_SINGLE_BINARY) == 1
+NumBlocks     = 0x280
+!else
 NumBlocks     = 0x200

+!endif
 

 ################################################################################

 #

@@ -81,11 +94,19 @@ NumBlocks     = 0x200
 # RegionType <FV, DATA, or FILE>

 #

 ################################################################################

-

+!if $(EDK2_ARMVE_SINGLE_BINARY) == 1
+0x00000000|0x00080000
+gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize
+FV = FVMAIN_SEC
+
+0x00080000|0x00280000
+gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
+FV = FVMAIN_COMPACT
+!else
 0x00000000|0x00200000

 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize

 FV = FVMAIN_COMPACT

-

+!endif
 

 ################################################################################

 #

diff --git a/edk2/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4.c b/edk2/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4.c
index b7e7b3700..986044156 100644
--- a/edk2/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4.c
+++ b/edk2/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4.c
@@ -212,3 +212,11 @@ ArmPlatformGetPlatformPpiList (
   *PpiList = gPlatformPpiTable;
 }
 
+UINTN
+ArmPlatformGetCorePosition (
+  IN UINTN MpId
+  )
+{
+  return 1;
+}
+