Merge branch 'linaro-topic-a9' into x-integ

3 files changed, 68 insertions, 13 deletions

diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c
index 4fc6a08b9..aed43cb3e 100644
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c
@@ -49,9 +49,6 @@ ArmCpuSetup (
 

   // If MPCore then Enable the SCU

   if (ArmIsMpCore()) {

-    // Signals the Cortex-A9 processor is taking part in coherency

-    ArmSetAuxCrBit (A9_FEATURE_SMP);

-

     ArmEnableScu ();

   }

 }

@@ -64,6 +61,8 @@ ArmCpuSetupSmpNonSecure (
 {

   INTN          ScuBase;

 

+  ArmSetAuxCrBit (A9_FEATURE_SMP);
+
   // Make the SCU accessible in Non Secure world

   if (ArmPlatformIsPrimaryCore (MpId)) {

     ScuBase = ArmGetScuBaseAddress();

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 42a5119e7..b9ebb9959 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -32,8 +32,11 @@
 !ifndef EDK2_ARMVE_STANDALONE

   DEFINE EDK2_ARMVE_STANDALONE=1

 !endif

-!if $(EDK2_ARMVE_STANDALONE) == 1

-  OUTPUT_DIRECTORY               = Build/ArmVExpress-CTA9x4-Standalone

+!ifndef $(EDK2_ARMVE_SINGLE_BINARY)

+  DEFINE EDK2_ARMVE_SINGLE_BINARY=1

+!endif

+!ifdef $(EDK2_OUT_DIR)

+  OUTPUT_DIRECTORY               = $(EDK2_OUT_DIR)

 !else

   OUTPUT_DIRECTORY               = Build/ArmVExpress-CTA9x4

 !endif

@@ -46,6 +49,14 @@
   ArmPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf

   ArmTrustZoneLib|ArmPlatformPkg/Drivers/ArmTrustZone/ArmTrustZone.inf

 

+#!ifdef $(EDK2_ARMVE_NETWORK)
+  # Networking Requirements
+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
+  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+#!endif
+
   # ARM PL310 L2 Cache Driver

   L2X0CacheLib|ArmPlatformPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf

   # ARM PL354 SMC Driver

@@ -177,10 +188,13 @@
   #

   # Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux: 

   gArmTokenSpaceGuid.PcdArmMachineType|2272

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"NorFlash"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)/MemoryMapped(0x0,0x46000000,0x46400000)"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|""

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootType|1

+  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linaro image on SD card"
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/uImage"
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath|L"VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/uInitrd"
+  gArmPlatformTokenSpaceGuid.PcdDefaultFdtLocalDevicePath|L"VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/v2p-ca9.dtb"
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait ro androidboot.console=ttyAMA0"
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootType|3
+  gArmPlatformTokenSpaceGuid.PcdFdtDevicePath|L"VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/v2p-ca9.dtb"
 

   # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)

   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"

@@ -191,6 +205,11 @@
   #

   gArmTokenSpaceGuid.PcdL2x0ControllerBase|0x1E00A000

 

+  #
+  # LAN9118 Ethernet Driver PCDs
+  #
+  gArmPlatformTokenSpaceGuid.PcdLan9118DxeBaseAddress|0x4E000000
+
 ################################################################################

 #

 # Components Section - list of all EDK II Modules needed by this Platform

@@ -294,7 +313,6 @@
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

 

-  #

   # Bds

   #

   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index 34b9d250a..117d8eca7 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/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|0x00200000
+gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
+FV = FVMAIN_COMPACT
+!else
 0x00000000|0x00200000

 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize

 FV = FVMAIN_COMPACT

-

+!endif
 

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

 #

@@ -196,6 +217,23 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf

   

   #

+  # Networking stack
+  #
+  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
+  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+  INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
+  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
+  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+  INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+  INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+  INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+  INF ArmPlatformPkg/Drivers/LAN9118Dxe/LAN9118Dxe.inf
+
+  #
   # UEFI application (Shell Embedded Boot Loader) 

   #  

   INF ShellBinPkg/UefiShell/UefiShell.inf