Merge branch 'linaro-platform-fvp' into integration

6 files changed, 73 insertions, 16 deletions

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
index 7cc4e2727..d565a76cf 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -21,7 +21,11 @@
   PLATFORM_GUID                  = 0de70077-9b3b-43bf-ba38-0ea37d77141b

   PLATFORM_VERSION               = 0.1

   DSC_SPECIFICATION              = 0x00010005

+!ifdef $(EDK2_OUT_DIR)
+  OUTPUT_DIRECTORY               = $(EDK2_OUT_DIR)
+!else
   OUTPUT_DIRECTORY               = Build/ArmVExpress-FVP-AArch64

+!endif
   SUPPORTED_ARCHITECTURES        = AARCH64

   BUILD_TARGETS                  = DEBUG|RELEASE

   SKUID_IDENTIFIER               = DEFAULT

@@ -164,12 +168,17 @@
   # ARM OS Loader

   #

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

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SemiHosting"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/filesystem.cpio.gz"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9"

-  gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2

-  gArmPlatformTokenSpaceGuid.PcdFdtDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/fdt.dtb"

+  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linaro disk image on virtio"
+!ifdef $(EDK2_USE_ANDROID_CONFIG)
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/kernel"
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/ramdisk.img"
+  gArmPlatformTokenSpaceGuid.PcdFdtDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/fvp-base-gicv2-psci.dtb"
+!else
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image"
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9 root=/dev/vda2"
+  gArmPlatformTokenSpaceGuid.PcdFdtDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/fdt.dtb"
+!endif
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2
 

   # 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)"

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
index a0316f73f..9ae69de77 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -186,6 +186,11 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf

   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

 

+!ifdef EDK2_ENABLE_SMSC_91X

+!include ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-networking.fdf.inc

+  INF EmbeddedPkg/Drivers/LAN91xDxe/LAN91xDxe.inf

+!endif

+

   #

   # UEFI application (Shell Embedded Boot Loader)

   #

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
index 5970eb0f4..cdef6fc41 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
@@ -161,6 +161,12 @@ READ_LOCK_STATUS   = TRUE
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

 

   #

+!ifdef EDK2_ENABLE_SMSC_91X

+!include ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-networking.fdf.inc

+  INF EmbeddedPkg/Drivers/LAN91xDxe/LAN91xDxe.inf

+!endif

+

+  #

   # UEFI application (Shell Embedded Boot Loader)

   #

   INF ShellBinPkg/UefiShell/UefiShell.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-networking.fdf.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-networking.fdf.inc
new file mode 100644
index 000000000..f88392a3e
--- /dev/null
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-networking.fdf.inc
@@ -0,0 +1,28 @@
+#

+#  Copyright (c) 2012-2014, ARM Limited. All rights reserved.

+#  

+#  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.

+#

+

+  #

+  # 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

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
index fb2efd5f5..57aa646bb 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -359,6 +359,11 @@
   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()"

   gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|10

 

+!ifdef EDK2_ENABLE_SMSC_91X

+  # Ethernet (SMSC 91C111)

+  gEmbeddedTokenSpaceGuid.PcdLan91xDxeBaseAddress|0x1A000000

+!endif

+

 [Components.common]

   # Versatile Express FileSystem

   ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf

@@ -378,6 +383,10 @@
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!ifdef EDK2_ENABLE_SMSC_91X

+  # SMSC LAN 91C111

+  EmbeddedPkg/Drivers/LAN91xDxe/LAN91xDxe.inf

+!endif

 

   # ISP1761 USB OTG Controller

   EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index f88f8605e..f854ab0de 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -6808,16 +6808,16 @@ RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM
 ######################

 # AARCH64 64bit ARM GNU/Linux GCC (ARM Architecture 64)

 

-*_ARMLINUXGCC_AARCH64_ASLCC_PATH      = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc

-*_ARMLINUXGCC_AARCH64_ASLDLINK_PATH   = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ld

-*_ARMLINUXGCC_AARCH64_ASLPP_PATH      = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc

-

-*_ARMLINUXGCC_AARCH64_CC_PATH         = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc

-*_ARMLINUXGCC_AARCH64_SLINK_PATH      = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ar

-*_ARMLINUXGCC_AARCH64_DLINK_PATH      = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ld

-*_ARMLINUXGCC_AARCH64_ASM_PATH        = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-as

-*_ARMLINUXGCC_AARCH64_PP_PATH         = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc

-*_ARMLINUXGCC_AARCH64_VFRPP_PATH      = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc

+*_ARMLINUXGCC_AARCH64_ASLCC_PATH      = ENV(CROSS_COMPILE)gcc
+*_ARMLINUXGCC_AARCH64_ASLDLINK_PATH   = ENV(CROSS_COMPILE)ld
+*_ARMLINUXGCC_AARCH64_ASLPP_PATH      = ENV(CROSS_COMPILE)gcc
+
+*_ARMLINUXGCC_AARCH64_CC_PATH         = ENV(CROSS_COMPILE)gcc
+*_ARMLINUXGCC_AARCH64_SLINK_PATH      = ENV(CROSS_COMPILE)ar
+*_ARMLINUXGCC_AARCH64_DLINK_PATH      = ENV(CROSS_COMPILE)ld
+*_ARMLINUXGCC_AARCH64_ASM_PATH        = ENV(CROSS_COMPILE)as
+*_ARMLINUXGCC_AARCH64_PP_PATH         = ENV(CROSS_COMPILE)gcc
+*_ARMLINUXGCC_AARCH64_VFRPP_PATH      = ENV(CROSS_COMPILE)gcc
 

 #

 # Use default values, or override in DSC file