[Linaro-uefi,2/2] platforms.config: hikey*: Set TOS_BIN_EXTRA{1, 2}

Message ID 20180131172743.15875-3-victor.chong@linaro.org
State New
Headers show
Series
  • Add support for ATF BL32_EXTRA1 and BL32_EXTRA2
Related show

Commit Message

Victor Chong Jan. 31, 2018, 5:27 p.m.
Signed-off-by: Victor Chong <victor.chong@linaro.org>
---
 platforms.config | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Comments

Leif Lindholm Feb. 27, 2018, 11:21 a.m. | #1
1: If possible, plese update edk2-platforms.config instead.
2: You and Haojian need to agree on this change.
3: We still need a commit message - 0/2 never reaches git.

On Wed, Jan 31, 2018 at 05:27:43PM +0000, Victor Chong wrote:
> Signed-off-by: Victor Chong <victor.chong@linaro.org>
> ---
>  platforms.config | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/platforms.config b/platforms.config
> index e47ba3b..0db2047 100644
> --- a/platforms.config
> +++ b/platforms.config
> @@ -43,6 +43,8 @@
>  #			$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/.
>  #			To actually build the Trusted OS, you must also set
>  #			ATF_SPD.
> +# - TOS_BIN_EXTRA1	First extra Trusted OS image
> +# - TOS_BIN_EXTRA2	Second extra Trusted OS image
>  # - ATF_SPD		Name of Secure Payload Dispatcher
>  #			To actually build the Trusted OS, you must also set
>  #			TOS_BIN.
> @@ -202,7 +204,9 @@ UEFI_BIN=BL33_AP_UEFI.fd
>  UEFI_IMAGE_DIR=HiKey
>  BUILD_ATF=yes
>  ATF_SPD=opteed
> -TOS_BIN=tee-pager.bin
> +TOS_BIN=tee-header_v2.bin
> +TOS_BIN_EXTRA1=tee-pager_v2.bin
> +TOS_BIN_EXTRA2=tee-pageable_v2.bin
>  TOS_PLATFORM_FLAVOR=hikey
>  BUILD_TOS=yes
>  SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin
> @@ -221,7 +225,9 @@ UEFI_BIN=BL33_AP_UEFI.fd
>  UEFI_IMAGE_DIR=HiKey960
>  BUILD_ATF=yes
>  ATF_SPD=opteed
> -TOS_BIN=tee-pager.bin
> +TOS_BIN=tee-header_v2.bin
> +TOS_BIN_EXTRA1=tee-pager_v2.bin
> +TOS_BIN_EXTRA2=tee-pageable_v2.bin
>  TOS_PLATFORM=hikey
>  TOS_PLATFORM_FLAVOR=hikey960
>  BUILD_TOS=yes
> -- 
> 2.15.1
>
Haojian Zhuang Feb. 28, 2018, 1:44 a.m. | #2
On 02/27/2018 07:21 PM, Leif Lindholm wrote:
> 1: If possible, plese update edk2-platforms.config instead.
> 2: You and Haojian need to agree on this change.
> 3: We still need a commit message - 0/2 never reaches git.
> 
> On Wed, Jan 31, 2018 at 05:27:43PM +0000, Victor Chong wrote:
>> Signed-off-by: Victor Chong <victor.chong@linaro.org>
>> ---
>>   platforms.config | 10 ++++++++--
>>   1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/platforms.config b/platforms.config
>> index e47ba3b..0db2047 100644
>> --- a/platforms.config
>> +++ b/platforms.config
>> @@ -43,6 +43,8 @@
>>   #			$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/.
>>   #			To actually build the Trusted OS, you must also set
>>   #			ATF_SPD.
>> +# - TOS_BIN_EXTRA1	First extra Trusted OS image
>> +# - TOS_BIN_EXTRA2	Second extra Trusted OS image
>>   # - ATF_SPD		Name of Secure Payload Dispatcher
>>   #			To actually build the Trusted OS, you must also set
>>   #			TOS_BIN.
>> @@ -202,7 +204,9 @@ UEFI_BIN=BL33_AP_UEFI.fd
>>   UEFI_IMAGE_DIR=HiKey
>>   BUILD_ATF=yes
>>   ATF_SPD=opteed
>> -TOS_BIN=tee-pager.bin
>> +TOS_BIN=tee-header_v2.bin
>> +TOS_BIN_EXTRA1=tee-pager_v2.bin
>> +TOS_BIN_EXTRA2=tee-pageable_v2.bin
>>   TOS_PLATFORM_FLAVOR=hikey
>>   BUILD_TOS=yes
>>   SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin
>> @@ -221,7 +225,9 @@ UEFI_BIN=BL33_AP_UEFI.fd
>>   UEFI_IMAGE_DIR=HiKey960
>>   BUILD_ATF=yes
>>   ATF_SPD=opteed
>> -TOS_BIN=tee-pager.bin
>> +TOS_BIN=tee-header_v2.bin
>> +TOS_BIN_EXTRA1=tee-pager_v2.bin
>> +TOS_BIN_EXTRA2=tee-pageable_v2.bin
>>   TOS_PLATFORM=hikey
>>   TOS_PLATFORM_FLAVOR=hikey960
>>   BUILD_TOS=yes
>> -- 
>> 2.15.1
>>

Acked. It's better enable the same one in edk2-platforms.config. I'll 
upload my build script file into l-loader.git. You could refer it to do 
the build.

Best Regards
Haojian
Victor Chong March 2, 2018, 3:22 a.m. | #3
Hi,

On Wed, Feb 28, 2018 at 10:44 AM, Haojian Zhuang
<haojian.zhuang@linaro.org> wrote:
> On 02/27/2018 07:21 PM, Leif Lindholm wrote:
>> 1: If possible, plese update edk2-platforms.config instead.
>> 2: You and Haojian need to agree on this change.
>> 3: We still need a commit message - 0/2 never reaches git.

Ok. Will change and submit v2.

>>
>> On Wed, Jan 31, 2018 at 05:27:43PM +0000, Victor Chong wrote:
>>> Signed-off-by: Victor Chong <victor.chong@linaro.org>
>>> ---
>>>   platforms.config | 10 ++++++++--
>>>   1 file changed, 8 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/platforms.config b/platforms.config
>>> index e47ba3b..0db2047 100644
>>> --- a/platforms.config
>>> +++ b/platforms.config
>>> @@ -43,6 +43,8 @@
>>>   #                  $EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/.
>>>   #                  To actually build the Trusted OS, you must also set
>>>   #                  ATF_SPD.
>>> +# - TOS_BIN_EXTRA1  First extra Trusted OS image
>>> +# - TOS_BIN_EXTRA2  Second extra Trusted OS image
>>>   # - ATF_SPD                Name of Secure Payload Dispatcher
>>>   #                  To actually build the Trusted OS, you must also set
>>>   #                  TOS_BIN.
>>> @@ -202,7 +204,9 @@ UEFI_BIN=BL33_AP_UEFI.fd
>>>   UEFI_IMAGE_DIR=HiKey
>>>   BUILD_ATF=yes
>>>   ATF_SPD=opteed
>>> -TOS_BIN=tee-pager.bin
>>> +TOS_BIN=tee-header_v2.bin
>>> +TOS_BIN_EXTRA1=tee-pager_v2.bin
>>> +TOS_BIN_EXTRA2=tee-pageable_v2.bin
>>>   TOS_PLATFORM_FLAVOR=hikey
>>>   BUILD_TOS=yes
>>>   SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin
>>> @@ -221,7 +225,9 @@ UEFI_BIN=BL33_AP_UEFI.fd
>>>   UEFI_IMAGE_DIR=HiKey960
>>>   BUILD_ATF=yes
>>>   ATF_SPD=opteed
>>> -TOS_BIN=tee-pager.bin
>>> +TOS_BIN=tee-header_v2.bin
>>> +TOS_BIN_EXTRA1=tee-pager_v2.bin
>>> +TOS_BIN_EXTRA2=tee-pageable_v2.bin
>>>   TOS_PLATFORM=hikey
>>>   TOS_PLATFORM_FLAVOR=hikey960
>>>   BUILD_TOS=yes
>>> --
>>> 2.15.1
>>>
>
> Acked. It's better enable the same one in edk2-platforms.config. I'll
> upload my build script file into l-loader.git. You could refer it to do
> the build.

HJ, please note that I'll only update edk2-platforms.config in v2 and
keep platforms.config unchanged, just for the differentiation.

Thanks!

>
> Best Regards
> Haojian

Patch

diff --git a/platforms.config b/platforms.config
index e47ba3b..0db2047 100644
--- a/platforms.config
+++ b/platforms.config
@@ -43,6 +43,8 @@ 
 #			$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/.
 #			To actually build the Trusted OS, you must also set
 #			ATF_SPD.
+# - TOS_BIN_EXTRA1	First extra Trusted OS image
+# - TOS_BIN_EXTRA2	Second extra Trusted OS image
 # - ATF_SPD		Name of Secure Payload Dispatcher
 #			To actually build the Trusted OS, you must also set
 #			TOS_BIN.
@@ -202,7 +204,9 @@  UEFI_BIN=BL33_AP_UEFI.fd
 UEFI_IMAGE_DIR=HiKey
 BUILD_ATF=yes
 ATF_SPD=opteed
-TOS_BIN=tee-pager.bin
+TOS_BIN=tee-header_v2.bin
+TOS_BIN_EXTRA1=tee-pager_v2.bin
+TOS_BIN_EXTRA2=tee-pageable_v2.bin
 TOS_PLATFORM_FLAVOR=hikey
 BUILD_TOS=yes
 SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin
@@ -221,7 +225,9 @@  UEFI_BIN=BL33_AP_UEFI.fd
 UEFI_IMAGE_DIR=HiKey960
 BUILD_ATF=yes
 ATF_SPD=opteed
-TOS_BIN=tee-pager.bin
+TOS_BIN=tee-header_v2.bin
+TOS_BIN_EXTRA1=tee-pager_v2.bin
+TOS_BIN_EXTRA2=tee-pageable_v2.bin
 TOS_PLATFORM=hikey
 TOS_PLATFORM_FLAVOR=hikey960
 BUILD_TOS=yes