Pushed.

Just one comment - the SERIAL_BASE is a very low-level detail. It could be more user-friendly to instead have a HIKEY_VER option (which can be passed as '-D HIKEY_VER=1' on the uefi-build.sh command line, and then based on this value set SERIAL_BASE in the .dsc.

/ Leif

On Sat, May 27, 2017 at 03:16:11PM +0800, Haojian Zhuang wrote:

Support both v1 and v2 hardware of hikey960 platform.

Signed-off-by: Haojian Zhuang haojian.zhuang@linaro.org

platforms.config | 11 +++++++++++ 1 file changed, 11 insertions(+)

diff --git a/platforms.config b/platforms.config index 5332e0f..0639583 100644 --- a/platforms.config +++ b/platforms.config @@ -210,6 +210,17 @@ SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin # Uncomment this to use UART0 as the OP-TEE Trusted OS console #TOS_BUILDFLAGS=CFG_CONSOLE_UART=0 +[hikey960] +LONGNAME=Hikey960 +DSC=OpenPlatformPkg/Platforms/Hisilicon/HiKey960/HiKey960.dsc +ARCH=AARCH64 +UEFI_BIN=BL33_AP_UEFI.fd +UEFI_IMAGE_DIR=HiKey960 +BUILD_ATF=yes +SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey960/Binary/lpm3.img +# Uncomment this to use UART5 as the EDK2 console for v1 hardware +#BUILDFLAGS=-DSERIAL_BASE=0xFDF05000

[xen64] LONGNAME=AArch64 Xen guest BUILDFLAGS= -- 2.7.4