Update platforms.configHEADmaster

Preparation for 17.04 release.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

1 files changed, 115 insertions, 12 deletions

diff --git a/platforms.config b/platforms.config
index 151f711..e91eaa3 100644
--- a/platforms.config
+++ b/platforms.config
@@ -9,29 +9,64 @@
 #
 # Mandatory options:
 # - LONGNAME		A more descriptive name of the platform.
-# - DSC			Pointer to the EDK2 build description file.
+# - DSC			Pointer to the EDK2 build description file. (The
+#			pandaboard is excused, all other ports must have this.)
 # - ARCH		String describing the architecture to build for.
 #			Currently supported are AARCH32 and AARCH64.
 # - UEFI_BIN		Name of executable image produced.
 # - UEFI_IMAGE_DIR	Build output directory name, relative to 'Build'.
 #
+# Options for Trusted OS
+# Note that OP-TEE (https://github.com/OP-TEE/optee_os) is the only currently
+# supported Trusted OS
+# - BUILD_TOS		Set to "yes" if the build should automatically build
+#   			Trusted OS, mainly for ARM Trusted Firmware.
+#			If this is set, you must also set ATF_SPD!
+#			Else we will not know which specific Trusted OS to
+#			build.
+#			Set to "debug" to create a debug build.
+# - TOS_PLATFORM	Platform name for Trusted OS build, if
+#   			different from ARM Trusted Firmware platform
+#			or UEFI platform name.
+# - TOS_PLATFORM_FLAVOR	If a core platform has multiple flavors, specify which
+#			flavor here.
+#
 # Options for ARM Trusted Firmware platforms
 # - BUILD_ATF		Set to "yes" if the build should automatically build
 #   			ARM Trusted Firmware and a fip containing UEFI image.
+#			Set to "debug" to create a debug build.
 # - ATF_PLATFORM	Platform name for ARM Trusted Firmware build, if
 #   			different from UEFI platform name.
+# - SCP_BIN		SCP image to pass to ARM Trusted Firmware.
+# - TOS_BIN		Trusted OS image to pass to ARM Trusted Firmware.
+#			The path is relative to
+#			$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/.
+#			To actually build the Trusted OS, you must also set
+#			ATF_SPD.
+# - ATF_SPD		Name of Secure Payload Dispatcher
+#			To actually build the Trusted OS, you must also set
+#			TOS_BIN.
 #
 # Optional options:
 # - BUILDFLAGS		Any special flags you want to pass to the build command.
+# - ATF_BUILDFLAGS	Any special flags you want to pass to the ARM Trusted
+#			Firmware build command.
+# - ATF_SFS_PAYLOAD	Any special secure firmware service payload you want
+#			to pass to the ARM trusted Firmware build command.
+# - TOS_BUILDFLAGS	Any special flags you want to pass to the Trusted OS
+#			build command.
 # - EXTRA_FILES		Any additional files to be copied to output dir.
 # - PREBUILD_CMDS	Any commands you want to execute before the build step.
 # - POSTBUILD_CMDS	Any commands you want to execute after the build step.
+# - PACKAGES_PATH	Additional directories to search for packages under.
+# - INF                 Point to a .inf (in addition to a .dsc) in order to
+#                       build a single component (standalone driver/app).
 #
 
 [juno]
 LONGNAME=aarch64 Juno
 DSC=OpenPlatformPkg/Platforms/ARM/Juno/ArmJuno.dsc
-BUILDFLAGS=-D USE_ARM_BDS=FALSE
+BUILDFLAGS=
 ARCH=AARCH64
 BUILD_ATF=yes
 UEFI_BIN=BL33_AP_UEFI.fd
@@ -39,17 +74,16 @@ UEFI_IMAGE_DIR=ArmJuno
 SCP_BIN=OpenPlatformPkg/Platforms/ARM/Juno/Binary/bl30.bin
 EXTRA_FILES=../../../../OpenPlatformPkg/Platforms/ARM/Juno/Binary/bl0.bin ../../../../OpenPlatformPkg/Platforms/ARM/Juno/Binary/Copying.txt
 
-[fvp-base-armbds]
-LONGNAME=aarch64 FVP Base RTSM
+[fvp]
+LONGNAME=aarch64 FVP RTSM
 DSC=OpenPlatformPkg/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc
-BUILDFLAGS=-D EDK2_ENABLE_SMSC_91X=1 -D EDK2_OUT_DIR=Build/FVP-Base-ArmBds -D DTB_DIR=OpenPlatformPkg/Platforms/ARM/VExpress/DeviceTree
+BUILDFLAGS=-D EDK2_ENABLE_SMSC_91X=1
 ARCH=AARCH64
 BUILD_ATF=yes
-ATF_PLATFORM=fvp
 UEFI_BIN=FVP_AARCH64_EFI.fd
-UEFI_IMAGE_DIR=FVP-Base-ArmBds
+UEFI_IMAGE_DIR=ArmVExpress-FVP-AArch64
 
-[tc2-armbds]
+[tc2]
 LONGNAME=Versatile Express TC2
 BUILDFLAGS=-D ARM_BIGLITTLE_TC2=1
 DSC=OpenPlatformPkg/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc
@@ -57,13 +91,11 @@ ARCH=ARM
 UEFI_BIN=ARM_VEXPRESS_CTA15A7_EFI.fd
 UEFI_IMAGE_DIR=ArmVExpress-CTA15-A7
 
-[beagle-armbds]
+[beagle]
 LONGNAME=BeagleBoard
 BUILDFLAGS=
-DSC=OpenPlatformPkg/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc
+DSC=BeagleBoardPkg/BeagleBoardPkg.dsc
 ARCH=ARM
-UEFI_BIN=BEAGLEBOARD_EFI.fd
-UEFI_IMAGE_DIR=BeagleBoard
 
 [qemu]
 LONGNAME=QEMU ARM Emulator
@@ -81,6 +113,51 @@ ARCH=AARCH64
 UEFI_BIN=QEMU_EFI.fd
 UEFI_IMAGE_DIR=ArmVirtQemu-AARCH64
 
+[overdrive]
+LONGNAME=AMD Overdrive
+BUILDFLAGS=-D INTEL_BDS
+DSC=OpenPlatformPkg/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
+ARCH=AARCH64
+PACKAGES_PATH=OpenPlatformPkg/Platforms/AMD/Styx/Binary
+UEFI_BIN=STYX_ROM.fd
+UEFI_IMAGE_DIR=Overdrive
+
+[overdrive1000]
+LONGNAME=SoftIron Overdrive 1000
+BUILDFLAGS=-D INTEL_BDS
+DSC=OpenPlatformPkg/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc
+ARCH=AARCH64
+PACKAGES_PATH=OpenPlatformPkg/Platforms/AMD/Styx/Binary
+UEFI_BIN=OVERDRIVE1000_ROM.fd
+UEFI_IMAGE_DIR=Overdrive1000Board
+
+[cello]
+LONGNAME=LeMaker Cello
+BUILDFLAGS=-D INTEL_BDS
+DSC=OpenPlatformPkg/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc
+ARCH=AARCH64
+PACKAGES_PATH=OpenPlatformPkg/Platforms/AMD/Styx/Binary
+UEFI_BIN=STYX_ROM.fd
+UEFI_IMAGE_DIR=Cello
+
+[hikey]
+LONGNAME=CircuitCo HiKey
+DSC=OpenPlatformPkg/Platforms/Hisilicon/HiKey/HiKey.dsc
+ARCH=AARCH64
+UEFI_BIN=BL33_AP_UEFI.fd
+UEFI_IMAGE_DIR=HiKey
+BUILD_ATF=yes
+ATF_SPD=opteed
+TOS_BIN=tee.bin
+BUILD_TOS=yes
+SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin
+# Uncomment this to use UART0 as the EDK2 console
+#BUILDFLAGS=-DSERIAL_BASE=0xF8015000
+# Uncomment this to use UART0 as the ARM Trusted Firmware console
+#ATF_BUILDFLAGS=CONSOLE_BASE=PL011_UART0_BASE CRASH_CONSOLE_BASE=PL011_UART0_BASE
+# Uncomment this to use UART0 as the OP-TEE Trusted OS console
+#TOS_BUILDFLAGS=CFG_CONSOLE_UART=0
+
 [xen64]
 LONGNAME=AArch64 Xen guest
 BUILDFLAGS=
@@ -88,3 +165,29 @@ DSC=ArmVirtPkg/ArmVirtXen.dsc
 ARCH=AARCH64
 UEFI_BIN=XEN_EFI.fd
 UEFI_IMAGE_DIR=ArmVirtXen-AARCH64
+
+[d02]
+LONGNAME=Hisilicon D02
+DSC=OpenPlatformPkg/Platforms/Hisilicon/D02/Pv660D02.dsc
+ARCH=AARCH64
+UEFI_BIN=PV660D02.fd
+UEFI_IMAGE_DIR=Pv660D02
+
+[d03]
+LONGNAME=Hisilicon D03
+DSC=OpenPlatformPkg/Platforms/Hisilicon/D03/D03.dsc
+ARCH=AARCH64
+UEFI_BIN=D03.fd
+UEFI_IMAGE_DIR=D03
+
+[d05]
+LONGNAME=HiSilicon D05
+DSC=OpenPlatformPkg/Platforms/Hisilicon/D05/D05.dsc
+ARCH=AARCH64
+UEFI_BIN=D05.fd
+UEFI_IMAGE_DIR=D05
+
+[armada70x0]
+LONGNAME=Marvell Armada 70x0
+DSC=OpenPlatformPkg/Platforms/Marvell/Armada/Armada70x0.dsc
+ARCH=AARCH64