[Linaro-uefi,v2] edk2-platforms.config: add hikey960 platform

Message ID 1517821144-21939-1-git-send-email-haojian.zhuang@linaro.org
State New
Headers show
Series
  • [Linaro-uefi,v2] edk2-platforms.config: add hikey960 platform
Related show

Commit Message

Haojian Zhuang Feb. 5, 2018, 8:59 a.m.
Add hikey960 platform with OPTEE and ATF.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
---
 edk2-platforms.config | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Comments

Victor Chong Feb. 5, 2018, 9:21 a.m. | #1
On Mon, Feb 5, 2018 at 5:59 PM, Haojian Zhuang
<haojian.zhuang@linaro.org> wrote:
> Add hikey960 platform with OPTEE and ATF.
>
> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
> ---
>  edk2-platforms.config | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>
> diff --git a/edk2-platforms.config b/edk2-platforms.config
> index 8ef82d1..48df98f 100644
> --- a/edk2-platforms.config
> +++ b/edk2-platforms.config
> @@ -121,6 +121,22 @@ BUILD_TOS=yes
>  # Uncomment this to use UART0 as the OP-TEE Trusted OS console
>  #TOS_BUILDFLAGS=CFG_CONSOLE_UART=0
>
> +[hikey960]
> +LONGNAME=Hikey960
> +DSC=Platform/Hisilicon/HiKey960/HiKey960.dsc
> +ARCH=AARCH64
> +UEFI_BIN=BL33_AP_UEFI.fd
> +UEFI_IMAGE_DIR=HiKey960
> +BUILD_ATF=yes
> +ATF_SPD=opteed
> +TOS_BIN=tee-pager.bin
> +TOS_PLATFORM=hikey
> +TOS_PLATFORM_FLAVOR=hikey960
> +BUILD_TOS=yes
> +SCP_BIN=Platform/Hisilicon/HiKey960/lpm3.img
> +# Uncomment this to use UART5 as the EDK2 console for v1 hardware
> +#BUILDFLAGS=-DSERIAL_BASE=0xFDF05000

Sorry, should have mentioned earlier. Can we add below please? Maybe
the arm-tf one isn't needed since you have runtime detection but
https://github.com/ARM-software/arm-trusted-firmware/blob/master/plat/hisilicon/hikey960/hikey960_pm.c#L266
is still hardcoded. Or maybe just that line needs to be changed to
`uart_base`?

# Uncomment this to use UART5 as the ARM Trusted Firmware console
#ATF_BUILDFLAGS=CONSOLE_BASE=PL011_UART5_BASE
CRASH_CONSOLE_BASE=PL011_UART5_BASE
# Uncomment this to use UART5 as the OP-TEE Trusted OS console
#TOS_BUILDFLAGS=CFG_CONSOLE_UART=5

Thanks!

> +
>  [d02]
>  LONGNAME=Hisilicon D02
>  DSC=Platform/Hisilicon/D02/Pv660D02.dsc
> --
> 2.7.4
>
> _______________________________________________
> Linaro-uefi mailing list
> Linaro-uefi@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/linaro-uefi
Haojian Zhuang Feb. 5, 2018, 9:33 a.m. | #2
On 02/05/2018 05:21 PM, Victor Chong wrote:
> On Mon, Feb 5, 2018 at 5:59 PM, Haojian Zhuang

> <haojian.zhuang@linaro.org> wrote:

>> Add hikey960 platform with OPTEE and ATF.

>>

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

>> ---

>>   edk2-platforms.config | 16 ++++++++++++++++

>>   1 file changed, 16 insertions(+)

>>

>> diff --git a/edk2-platforms.config b/edk2-platforms.config

>> index 8ef82d1..48df98f 100644

>> --- a/edk2-platforms.config

>> +++ b/edk2-platforms.config

>> @@ -121,6 +121,22 @@ BUILD_TOS=yes

>>   # Uncomment this to use UART0 as the OP-TEE Trusted OS console

>>   #TOS_BUILDFLAGS=CFG_CONSOLE_UART=0

>>

>> +[hikey960]

>> +LONGNAME=Hikey960

>> +DSC=Platform/Hisilicon/HiKey960/HiKey960.dsc

>> +ARCH=AARCH64

>> +UEFI_BIN=BL33_AP_UEFI.fd

>> +UEFI_IMAGE_DIR=HiKey960

>> +BUILD_ATF=yes

>> +ATF_SPD=opteed

>> +TOS_BIN=tee-pager.bin

>> +TOS_PLATFORM=hikey

>> +TOS_PLATFORM_FLAVOR=hikey960

>> +BUILD_TOS=yes

>> +SCP_BIN=Platform/Hisilicon/HiKey960/lpm3.img

>> +# Uncomment this to use UART5 as the EDK2 console for v1 hardware

>> +#BUILDFLAGS=-DSERIAL_BASE=0xFDF05000

> 

> Sorry, should have mentioned earlier. Can we add below please? Maybe

> the arm-tf one isn't needed since you have runtime detection but

> https://github.com/ARM-software/arm-trusted-firmware/blob/master/plat/hisilicon/hikey960/hikey960_pm.c#L266

> is still hardcoded. Or maybe just that line needs to be changed to

> `uart_base`?

> 


I think that we need to change it to uart_base in hikey960_pm.c.

Just create a static variable for uart_base and assign it in initial. 
Then update it for suspend finish.

Best Regards
Haojian
> # Uncomment this to use UART5 as the ARM Trusted Firmware console

> #ATF_BUILDFLAGS=CONSOLE_BASE=PL011_UART5_BASE

> CRASH_CONSOLE_BASE=PL011_UART5_BASE

> # Uncomment this to use UART5 as the OP-TEE Trusted OS console

> #TOS_BUILDFLAGS=CFG_CONSOLE_UART=5

> 

> Thanks!

> 

>> +

>>   [d02]

>>   LONGNAME=Hisilicon D02

>>   DSC=Platform/Hisilicon/D02/Pv660D02.dsc

>> --

>> 2.7.4

>>

>> _______________________________________________

>> Linaro-uefi mailing list

>> Linaro-uefi@lists.linaro.org

>> https://lists.linaro.org/mailman/listinfo/linaro-uefi
Haojian Zhuang Feb. 22, 2018, 12:57 a.m. | #3
On 02/05/2018 04:59 PM, Haojian Zhuang wrote:
> Add hikey960 platform with OPTEE and ATF.
> 
> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
> ---
>   edk2-platforms.config | 16 ++++++++++++++++
>   1 file changed, 16 insertions(+)
> 
> diff --git a/edk2-platforms.config b/edk2-platforms.config
> index 8ef82d1..48df98f 100644
> --- a/edk2-platforms.config
> +++ b/edk2-platforms.config
> @@ -121,6 +121,22 @@ BUILD_TOS=yes
>   # Uncomment this to use UART0 as the OP-TEE Trusted OS console
>   #TOS_BUILDFLAGS=CFG_CONSOLE_UART=0
>   
> +[hikey960]
> +LONGNAME=Hikey960
> +DSC=Platform/Hisilicon/HiKey960/HiKey960.dsc
> +ARCH=AARCH64
> +UEFI_BIN=BL33_AP_UEFI.fd
> +UEFI_IMAGE_DIR=HiKey960
> +BUILD_ATF=yes
> +ATF_SPD=opteed
> +TOS_BIN=tee-pager.bin
> +TOS_PLATFORM=hikey
> +TOS_PLATFORM_FLAVOR=hikey960
> +BUILD_TOS=yes
> +SCP_BIN=Platform/Hisilicon/HiKey960/lpm3.img
> +# Uncomment this to use UART5 as the EDK2 console for v1 hardware
> +#BUILDFLAGS=-DSERIAL_BASE=0xFDF05000
> +
>   [d02]
>   LONGNAME=Hisilicon D02
>   DSC=Platform/Hisilicon/D02/Pv660D02.dsc
> 

Hi Leif,

This patch is not merged yet. I can't build hikey960 without this patch in uefi-tools.

Best Regards
Haojian
Leif Lindholm Feb. 22, 2018, 10:46 a.m. | #4
On Thu, Feb 22, 2018 at 12:57:12AM +0000, Haojian Zhuang wrote:
> Hi Leif,
> 
> This patch is not merged yet. I can't build hikey960 without this patch in uefi-tools.

Apologies - I managed to mis-filter this patch.
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

Pushed as 7e9ec1e.

Patch

diff --git a/edk2-platforms.config b/edk2-platforms.config
index 8ef82d1..48df98f 100644
--- a/edk2-platforms.config
+++ b/edk2-platforms.config
@@ -121,6 +121,22 @@  BUILD_TOS=yes
 # Uncomment this to use UART0 as the OP-TEE Trusted OS console
 #TOS_BUILDFLAGS=CFG_CONSOLE_UART=0
 
+[hikey960]
+LONGNAME=Hikey960
+DSC=Platform/Hisilicon/HiKey960/HiKey960.dsc
+ARCH=AARCH64
+UEFI_BIN=BL33_AP_UEFI.fd
+UEFI_IMAGE_DIR=HiKey960
+BUILD_ATF=yes
+ATF_SPD=opteed
+TOS_BIN=tee-pager.bin
+TOS_PLATFORM=hikey
+TOS_PLATFORM_FLAVOR=hikey960
+BUILD_TOS=yes
+SCP_BIN=Platform/Hisilicon/HiKey960/lpm3.img
+# Uncomment this to use UART5 as the EDK2 console for v1 hardware
+#BUILDFLAGS=-DSERIAL_BASE=0xFDF05000
+
 [d02]
 LONGNAME=Hisilicon D02
 DSC=Platform/Hisilicon/D02/Pv660D02.dsc