[Linaro-uefi] platforms.config: hikey: Change default TOS_BIN

Message ID 20180131162614.27590-1-victor.chong@linaro.org
State New
Headers show
Series
  • [Linaro-uefi] platforms.config: hikey: Change default TOS_BIN
Related show

Commit Message

Victor Chong Jan. 31, 2018, 4:26 p.m.
Now that most, if not all, Linaro builds have reverted to using
upstream ATF instead of the 96boards-hikey fork, change the default
TOS_BIN value to match.

Signed-off-by: Victor Chong <victor.chong@linaro.org>
---
 platforms.config | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Victor Chong Feb. 26, 2018, 2:21 p.m. | #1
Ping?

On Thu, Feb 1, 2018 at 1:26 AM, Victor Chong <victor.chong@linaro.org> wrote:
> Now that most, if not all, Linaro builds have reverted to using
> upstream ATF instead of the 96boards-hikey fork, change the default
> TOS_BIN value to match.
>
> Signed-off-by: Victor Chong <victor.chong@linaro.org>
> ---
>  platforms.config | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/platforms.config b/platforms.config
> index deb02f4..e47ba3b 100644
> --- a/platforms.config
> +++ b/platforms.config
> @@ -194,9 +194,6 @@ PACKAGES_PATH=OpenPlatformPkg/Platforms/AMD/Styx/Binary
>  UEFI_BIN=STYX_ROM.fd
>  UEFI_IMAGE_DIR=Cello
>
> -# NOTE: If using upstream ATF, i.e.
> -# https://github.com/ARM-software/arm-trusted-firmware
> -# please set TOS_BIN=tee-pager.bin
>  [hikey]
>  LONGNAME=CircuitCo HiKey
>  DSC=OpenPlatformPkg/Platforms/Hisilicon/HiKey/HiKey.dsc
> @@ -205,7 +202,7 @@ UEFI_BIN=BL33_AP_UEFI.fd
>  UEFI_IMAGE_DIR=HiKey
>  BUILD_ATF=yes
>  ATF_SPD=opteed
> -TOS_BIN=tee.bin
> +TOS_BIN=tee-pager.bin
>  TOS_PLATFORM_FLAVOR=hikey
>  BUILD_TOS=yes
>  SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin
> --
> 2.15.1
>
Leif Lindholm Feb. 27, 2018, 11:17 a.m. | #2
On Wed, Jan 31, 2018 at 04:26:14PM +0000, Victor Chong wrote:
> Now that most, if not all, Linaro builds have reverted to using
> upstream ATF instead of the 96boards-hikey fork, change the default
> TOS_BIN value to match.
> 
> Signed-off-by: Victor Chong <victor.chong@linaro.org>

Sorry, I misfiltered this as well.

However, platforms.config is now outdated since it belongs to the old
OpenPlatformPkg build support rather than edk2-platforms, which is
where the most up to date (if still incomplete) upstream hikey support
exists.

edk2-build.sh, which is the script used for the edk2-platforms way of
building uses edk2-platforms.config instead.

uefi-build.sh/platforms.config will go away eventually, so would it be
an option to migrate away from them at this point?

/
    Leif

> ---
>  platforms.config | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/platforms.config b/platforms.config
> index deb02f4..e47ba3b 100644
> --- a/platforms.config
> +++ b/platforms.config
> @@ -194,9 +194,6 @@ PACKAGES_PATH=OpenPlatformPkg/Platforms/AMD/Styx/Binary
>  UEFI_BIN=STYX_ROM.fd
>  UEFI_IMAGE_DIR=Cello
>  
> -# NOTE: If using upstream ATF, i.e.
> -# https://github.com/ARM-software/arm-trusted-firmware
> -# please set TOS_BIN=tee-pager.bin
>  [hikey]
>  LONGNAME=CircuitCo HiKey
>  DSC=OpenPlatformPkg/Platforms/Hisilicon/HiKey/HiKey.dsc
> @@ -205,7 +202,7 @@ UEFI_BIN=BL33_AP_UEFI.fd
>  UEFI_IMAGE_DIR=HiKey
>  BUILD_ATF=yes
>  ATF_SPD=opteed
> -TOS_BIN=tee.bin
> +TOS_BIN=tee-pager.bin
>  TOS_PLATFORM_FLAVOR=hikey
>  BUILD_TOS=yes
>  SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin
> -- 
> 2.15.1
>
gary guo Feb. 27, 2018, 11:37 a.m. | #3
On Tue, Feb 27, 2018 at 11:17:47AM +0000, Leif Lindholm wrote:
> On Wed, Jan 31, 2018 at 04:26:14PM +0000, Victor Chong wrote:
> > Now that most, if not all, Linaro builds have reverted to using
> > upstream ATF instead of the 96boards-hikey fork, change the default
> > TOS_BIN value to match.
> > 
> > Signed-off-by: Victor Chong <victor.chong@linaro.org>
> 
> Sorry, I misfiltered this as well.
> 
> However, platforms.config is now outdated since it belongs to the old
> OpenPlatformPkg build support rather than edk2-platforms, which is
> where the most up to date (if still incomplete) upstream hikey support
> exists.
> 
> edk2-build.sh, which is the script used for the edk2-platforms way of
> building uses edk2-platforms.config instead.
> 
> uefi-build.sh/platforms.config will go away eventually, so would it be
> an option to migrate away from them at this point?

I still use uefi-build.sh for building qemu UEFI :)

Heyi

> 
> /
>     Leif
> 
> > ---
> >  platforms.config | 5 +----
> >  1 file changed, 1 insertion(+), 4 deletions(-)
> > 
> > diff --git a/platforms.config b/platforms.config
> > index deb02f4..e47ba3b 100644
> > --- a/platforms.config
> > +++ b/platforms.config
> > @@ -194,9 +194,6 @@ PACKAGES_PATH=OpenPlatformPkg/Platforms/AMD/Styx/Binary
> >  UEFI_BIN=STYX_ROM.fd
> >  UEFI_IMAGE_DIR=Cello
> >  
> > -# NOTE: If using upstream ATF, i.e.
> > -# https://github.com/ARM-software/arm-trusted-firmware
> > -# please set TOS_BIN=tee-pager.bin
> >  [hikey]
> >  LONGNAME=CircuitCo HiKey
> >  DSC=OpenPlatformPkg/Platforms/Hisilicon/HiKey/HiKey.dsc
> > @@ -205,7 +202,7 @@ UEFI_BIN=BL33_AP_UEFI.fd
> >  UEFI_IMAGE_DIR=HiKey
> >  BUILD_ATF=yes
> >  ATF_SPD=opteed
> > -TOS_BIN=tee.bin
> > +TOS_BIN=tee-pager.bin
> >  TOS_PLATFORM_FLAVOR=hikey
> >  BUILD_TOS=yes
> >  SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin
> > -- 
> > 2.15.1
> > 
> _______________________________________________
> Linaro-uefi mailing list
> Linaro-uefi@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/linaro-uefi
Leif Lindholm Feb. 27, 2018, 12:42 p.m. | #4
On Tue, Feb 27, 2018 at 07:37:14PM +0800, Guo Heyi wrote:
> On Tue, Feb 27, 2018 at 11:17:47AM +0000, Leif Lindholm wrote:
> > On Wed, Jan 31, 2018 at 04:26:14PM +0000, Victor Chong wrote:
> > > Now that most, if not all, Linaro builds have reverted to using
> > > upstream ATF instead of the 96boards-hikey fork, change the default
> > > TOS_BIN value to match.
> > > 
> > > Signed-off-by: Victor Chong <victor.chong@linaro.org>
> > 
> > Sorry, I misfiltered this as well.
> > 
> > However, platforms.config is now outdated since it belongs to the old
> > OpenPlatformPkg build support rather than edk2-platforms, which is
> > where the most up to date (if still incomplete) upstream hikey support
> > exists.
> > 
> > edk2-build.sh, which is the script used for the edk2-platforms way of
> > building uses edk2-platforms.config instead.
> > 
> > uefi-build.sh/platforms.config will go away eventually, so would it be
> > an option to migrate away from them at this point?
> 
> I still use uefi-build.sh for building qemu UEFI :)

It's still going away :)

(They're still supported by edk2-build.sh, I just renamed the
platforms armvirtqemu and armvirtqemu64 to match the actual EDK2 names
better.)

/
    Leif
Haojian Zhuang Feb. 28, 2018, 12:48 a.m. | #5
On 02/27/2018 08:42 PM, Leif Lindholm wrote:
> On Tue, Feb 27, 2018 at 07:37:14PM +0800, Guo Heyi wrote:
>> On Tue, Feb 27, 2018 at 11:17:47AM +0000, Leif Lindholm wrote:
>>> On Wed, Jan 31, 2018 at 04:26:14PM +0000, Victor Chong wrote:
>>>> Now that most, if not all, Linaro builds have reverted to using
>>>> upstream ATF instead of the 96boards-hikey fork, change the default
>>>> TOS_BIN value to match.
>>>>
>>>> Signed-off-by: Victor Chong <victor.chong@linaro.org>
>>>
>>> Sorry, I misfiltered this as well.
>>>
>>> However, platforms.config is now outdated since it belongs to the old
>>> OpenPlatformPkg build support rather than edk2-platforms, which is
>>> where the most up to date (if still incomplete) upstream hikey support
>>> exists.
>>>
>>> edk2-build.sh, which is the script used for the edk2-platforms way of
>>> building uses edk2-platforms.config instead.
>>>
>>> uefi-build.sh/platforms.config will go away eventually, so would it be
>>> an option to migrate away from them at this point?
>>
>> I still use uefi-build.sh for building qemu UEFI :)
> 
> It's still going away :)
> 
> (They're still supported by edk2-build.sh, I just renamed the
> platforms armvirtqemu and armvirtqemu64 to match the actual EDK2 names
> better.)
> 

Hi Leif,

Could we keep uef-build.sh & platform.config for 3 to 6 months? Since 
we're using it for both hikey and hikey960, and we are still in the process of
upstream them into EDKII. In the document 
(https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/plat/hikey.rst), 
we prefer user to use uefi-tools upstream directly.

If the uefi-build.sh & platform.config is removed now, user can't build 
hikey and hikey960 successfully.

And I'm fine on Victor's change in this patch.

Best Regards
Haojian
gary guo Feb. 28, 2018, 1:08 a.m. | #6
On Tue, Feb 27, 2018 at 12:42:50PM +0000, Leif Lindholm wrote:
> On Tue, Feb 27, 2018 at 07:37:14PM +0800, Guo Heyi wrote:
> > On Tue, Feb 27, 2018 at 11:17:47AM +0000, Leif Lindholm wrote:
> > > On Wed, Jan 31, 2018 at 04:26:14PM +0000, Victor Chong wrote:
> > > > Now that most, if not all, Linaro builds have reverted to using
> > > > upstream ATF instead of the 96boards-hikey fork, change the default
> > > > TOS_BIN value to match.
> > > > 
> > > > Signed-off-by: Victor Chong <victor.chong@linaro.org>
> > > 
> > > Sorry, I misfiltered this as well.
> > > 
> > > However, platforms.config is now outdated since it belongs to the old
> > > OpenPlatformPkg build support rather than edk2-platforms, which is
> > > where the most up to date (if still incomplete) upstream hikey support
> > > exists.
> > > 
> > > edk2-build.sh, which is the script used for the edk2-platforms way of
> > > building uses edk2-platforms.config instead.
> > > 
> > > uefi-build.sh/platforms.config will go away eventually, so would it be
> > > an option to migrate away from them at this point?
> > 
> > I still use uefi-build.sh for building qemu UEFI :)
> 
> It's still going away :)
> 
> (They're still supported by edk2-build.sh, I just renamed the
> platforms armvirtqemu and armvirtqemu64 to match the actual EDK2 names
> better.)
Thanks, will switch to edk2-build.sh :)

Heyi

> 
> /
>     Leif
Leif Lindholm Feb. 28, 2018, 3:45 p.m. | #7
(You left me off cc on this one, so I nearly missed it.)

On Wed, Feb 28, 2018 at 12:48:40AM +0000, Haojian Zhuang wrote:
> >>> However, platforms.config is now outdated since it belongs to the old
> >>> OpenPlatformPkg build support rather than edk2-platforms, which is
> >>> where the most up to date (if still incomplete) upstream hikey support
> >>> exists.
> >>>
> >>> edk2-build.sh, which is the script used for the edk2-platforms way of
> >>> building uses edk2-platforms.config instead.
> >>>
> >>> uefi-build.sh/platforms.config will go away eventually, so would it be
> >>> an option to migrate away from them at this point?
> >>
> >> I still use uefi-build.sh for building qemu UEFI :)
> > 
> > It's still going away :)
> > 
> > (They're still supported by edk2-build.sh, I just renamed the
> > platforms armvirtqemu and armvirtqemu64 to match the actual EDK2 names
> > better.)
> 
> Hi Leif,
> 
> Could we keep uef-build.sh & platform.config for 3 to 6 months? Since 
> we're using it for both hikey and hikey960, and we are still in the process of
> upstream them into EDKII. In the document 
> (https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/plat/hikey.rst), 
> we prefer user to use uefi-tools upstream directly.
> 
> If the uefi-build.sh & platform.config is removed now, user can't build 
> hikey and hikey960 successfully.

I have no issue keeping it around for that long. It would make sense
to keep them until the autumn Linaro Connect, a year after I gave the
presentation including the new tools.
I am more cautious about updating them, because things that are
actually being developed should be moving to edk2-*.

> And I'm fine on Victor's change in this patch.

OK, thanks.

/
    Leif
Victor Chong March 2, 2018, 3:08 a.m. | #8
Hi Leif,

On Thu, Mar 1, 2018 at 12:45 AM, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> (You left me off cc on this one, so I nearly missed it.)
>
> On Wed, Feb 28, 2018 at 12:48:40AM +0000, Haojian Zhuang wrote:
>> >>> However, platforms.config is now outdated since it belongs to the old
>> >>> OpenPlatformPkg build support rather than edk2-platforms, which is
>> >>> where the most up to date (if still incomplete) upstream hikey support
>> >>> exists.
>> >>>
>> >>> edk2-build.sh, which is the script used for the edk2-platforms way of
>> >>> building uses edk2-platforms.config instead.
>> >>>
>> >>> uefi-build.sh/platforms.config will go away eventually, so would it be
>> >>> an option to migrate away from them at this point?
>> >>
>> >> I still use uefi-build.sh for building qemu UEFI :)
>> >
>> > It's still going away :)
>> >
>> > (They're still supported by edk2-build.sh, I just renamed the
>> > platforms armvirtqemu and armvirtqemu64 to match the actual EDK2 names
>> > better.)
>>
>> Hi Leif,
>>
>> Could we keep uef-build.sh & platform.config for 3 to 6 months? Since
>> we're using it for both hikey and hikey960, and we are still in the process of
>> upstream them into EDKII. In the document
>> (https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/plat/hikey.rst),
>> we prefer user to use uefi-tools upstream directly.
>>
>> If the uefi-build.sh & platform.config is removed now, user can't build
>> hikey and hikey960 successfully.
>
> I have no issue keeping it around for that long. It would make sense
> to keep them until the autumn Linaro Connect, a year after I gave the
> presentation including the new tools.
> I am more cautious about updating them, because things that are
> actually being developed should be moving to edk2-*.
>
>> And I'm fine on Victor's change in this patch.
>
> OK, thanks.

Wrt this patch, edk2-platforms.config already has the proper default
setting for TOS_BIN, so please merge this too if ok since it looks
like platforms.config will still be used for at least 3-6 months
according to the comments above.

Thanks!

>
> /
>     Leif
> _______________________________________________
> Linaro-uefi mailing list
> Linaro-uefi@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/linaro-uefi
Victor Chong March 9, 2018, 6:52 a.m. | #9
Ping Leif's possibly overactive spam filter!

On Fri, Mar 2, 2018 at 12:08 PM, Victor Chong <victor.chong@linaro.org> wrote:
> Hi Leif,
>
> On Thu, Mar 1, 2018 at 12:45 AM, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>> (You left me off cc on this one, so I nearly missed it.)
>>
>> On Wed, Feb 28, 2018 at 12:48:40AM +0000, Haojian Zhuang wrote:
>>> >>> However, platforms.config is now outdated since it belongs to the old
>>> >>> OpenPlatformPkg build support rather than edk2-platforms, which is
>>> >>> where the most up to date (if still incomplete) upstream hikey support
>>> >>> exists.
>>> >>>
>>> >>> edk2-build.sh, which is the script used for the edk2-platforms way of
>>> >>> building uses edk2-platforms.config instead.
>>> >>>
>>> >>> uefi-build.sh/platforms.config will go away eventually, so would it be
>>> >>> an option to migrate away from them at this point?
>>> >>
>>> >> I still use uefi-build.sh for building qemu UEFI :)
>>> >
>>> > It's still going away :)
>>> >
>>> > (They're still supported by edk2-build.sh, I just renamed the
>>> > platforms armvirtqemu and armvirtqemu64 to match the actual EDK2 names
>>> > better.)
>>>
>>> Hi Leif,
>>>
>>> Could we keep uef-build.sh & platform.config for 3 to 6 months? Since
>>> we're using it for both hikey and hikey960, and we are still in the process of
>>> upstream them into EDKII. In the document
>>> (https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/plat/hikey.rst),
>>> we prefer user to use uefi-tools upstream directly.
>>>
>>> If the uefi-build.sh & platform.config is removed now, user can't build
>>> hikey and hikey960 successfully.
>>
>> I have no issue keeping it around for that long. It would make sense
>> to keep them until the autumn Linaro Connect, a year after I gave the
>> presentation including the new tools.
>> I am more cautious about updating them, because things that are
>> actually being developed should be moving to edk2-*.
>>
>>> And I'm fine on Victor's change in this patch.
>>
>> OK, thanks.
>
> Wrt this patch, edk2-platforms.config already has the proper default
> setting for TOS_BIN, so please merge this too if ok since it looks
> like platforms.config will still be used for at least 3-6 months
> according to the comments above.
>
> Thanks!
>
>>
>> /
>>     Leif
>> _______________________________________________
>> Linaro-uefi mailing list
>> Linaro-uefi@lists.linaro.org
>> https://lists.linaro.org/mailman/listinfo/linaro-uefi
Leif Lindholm March 15, 2018, 12:58 p.m. | #10
Nope, just out on holiday :)
Got back yesterday and am catching up on backlog.

On Fri, Mar 09, 2018 at 03:52:40PM +0900, Victor Chong wrote:
> Ping Leif's possibly overactive spam filter!
> 
> On Fri, Mar 2, 2018 at 12:08 PM, Victor Chong <victor.chong@linaro.org> wrote:
> > Hi Leif,
> >
> > On Thu, Mar 1, 2018 at 12:45 AM, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> >> (You left me off cc on this one, so I nearly missed it.)
> >>
> >> On Wed, Feb 28, 2018 at 12:48:40AM +0000, Haojian Zhuang wrote:
> >>> >>> However, platforms.config is now outdated since it belongs to the old
> >>> >>> OpenPlatformPkg build support rather than edk2-platforms, which is
> >>> >>> where the most up to date (if still incomplete) upstream hikey support
> >>> >>> exists.
> >>> >>>
> >>> >>> edk2-build.sh, which is the script used for the edk2-platforms way of
> >>> >>> building uses edk2-platforms.config instead.
> >>> >>>
> >>> >>> uefi-build.sh/platforms.config will go away eventually, so would it be
> >>> >>> an option to migrate away from them at this point?
> >>> >>
> >>> >> I still use uefi-build.sh for building qemu UEFI :)
> >>> >
> >>> > It's still going away :)
> >>> >
> >>> > (They're still supported by edk2-build.sh, I just renamed the
> >>> > platforms armvirtqemu and armvirtqemu64 to match the actual EDK2 names
> >>> > better.)
> >>>
> >>> Hi Leif,
> >>>
> >>> Could we keep uef-build.sh & platform.config for 3 to 6 months? Since
> >>> we're using it for both hikey and hikey960, and we are still in the process of
> >>> upstream them into EDKII. In the document
> >>> (https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/plat/hikey.rst),
> >>> we prefer user to use uefi-tools upstream directly.
> >>>
> >>> If the uefi-build.sh & platform.config is removed now, user can't build
> >>> hikey and hikey960 successfully.
> >>
> >> I have no issue keeping it around for that long. It would make sense
> >> to keep them until the autumn Linaro Connect, a year after I gave the
> >> presentation including the new tools.
> >> I am more cautious about updating them, because things that are
> >> actually being developed should be moving to edk2-*.
> >>
> >>> And I'm fine on Victor's change in this patch.
> >>
> >> OK, thanks.
> >
> > Wrt this patch, edk2-platforms.config already has the proper default
> > setting for TOS_BIN, so please merge this too if ok since it looks
> > like platforms.config will still be used for at least 3-6 months
> > according to the comments above.
> >
> > Thanks!
> >
> >>
> >> /
> >>     Leif
> >> _______________________________________________
> >> Linaro-uefi mailing list
> >> Linaro-uefi@lists.linaro.org
> >> https://lists.linaro.org/mailman/listinfo/linaro-uefi
Victor Chong March 19, 2018, 5:03 a.m. | #11
Hi Leif,

Please ignore this patch. I'll include this as part of v3 for the
TOS_BIN_EXTRA* patch series so that we have everything 'together' in a
single series and make things easier to manage.

Thanks!

On Thu, Mar 15, 2018 at 8:58 PM, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> Nope, just out on holiday :)
> Got back yesterday and am catching up on backlog.
>
> On Fri, Mar 09, 2018 at 03:52:40PM +0900, Victor Chong wrote:
>> Ping Leif's possibly overactive spam filter!
>>
>> On Fri, Mar 2, 2018 at 12:08 PM, Victor Chong <victor.chong@linaro.org> wrote:
>> > Hi Leif,
>> >
>> > On Thu, Mar 1, 2018 at 12:45 AM, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>> >> (You left me off cc on this one, so I nearly missed it.)
>> >>
>> >> On Wed, Feb 28, 2018 at 12:48:40AM +0000, Haojian Zhuang wrote:
>> >>> >>> However, platforms.config is now outdated since it belongs to the old
>> >>> >>> OpenPlatformPkg build support rather than edk2-platforms, which is
>> >>> >>> where the most up to date (if still incomplete) upstream hikey support
>> >>> >>> exists.
>> >>> >>>
>> >>> >>> edk2-build.sh, which is the script used for the edk2-platforms way of
>> >>> >>> building uses edk2-platforms.config instead.
>> >>> >>>
>> >>> >>> uefi-build.sh/platforms.config will go away eventually, so would it be
>> >>> >>> an option to migrate away from them at this point?
>> >>> >>
>> >>> >> I still use uefi-build.sh for building qemu UEFI :)
>> >>> >
>> >>> > It's still going away :)
>> >>> >
>> >>> > (They're still supported by edk2-build.sh, I just renamed the
>> >>> > platforms armvirtqemu and armvirtqemu64 to match the actual EDK2 names
>> >>> > better.)
>> >>>
>> >>> Hi Leif,
>> >>>
>> >>> Could we keep uef-build.sh & platform.config for 3 to 6 months? Since
>> >>> we're using it for both hikey and hikey960, and we are still in the process of
>> >>> upstream them into EDKII. In the document
>> >>> (https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/plat/hikey.rst),
>> >>> we prefer user to use uefi-tools upstream directly.
>> >>>
>> >>> If the uefi-build.sh & platform.config is removed now, user can't build
>> >>> hikey and hikey960 successfully.
>> >>
>> >> I have no issue keeping it around for that long. It would make sense
>> >> to keep them until the autumn Linaro Connect, a year after I gave the
>> >> presentation including the new tools.
>> >> I am more cautious about updating them, because things that are
>> >> actually being developed should be moving to edk2-*.
>> >>
>> >>> And I'm fine on Victor's change in this patch.
>> >>
>> >> OK, thanks.
>> >
>> > Wrt this patch, edk2-platforms.config already has the proper default
>> > setting for TOS_BIN, so please merge this too if ok since it looks
>> > like platforms.config will still be used for at least 3-6 months
>> > according to the comments above.
>> >
>> > Thanks!
>> >
>> >>
>> >> /
>> >>     Leif
>> >> _______________________________________________
>> >> Linaro-uefi mailing list
>> >> Linaro-uefi@lists.linaro.org
>> >> https://lists.linaro.org/mailman/listinfo/linaro-uefi

Patch

diff --git a/platforms.config b/platforms.config
index deb02f4..e47ba3b 100644
--- a/platforms.config
+++ b/platforms.config
@@ -194,9 +194,6 @@  PACKAGES_PATH=OpenPlatformPkg/Platforms/AMD/Styx/Binary
 UEFI_BIN=STYX_ROM.fd
 UEFI_IMAGE_DIR=Cello
 
-# NOTE: If using upstream ATF, i.e.
-# https://github.com/ARM-software/arm-trusted-firmware
-# please set TOS_BIN=tee-pager.bin
 [hikey]
 LONGNAME=CircuitCo HiKey
 DSC=OpenPlatformPkg/Platforms/Hisilicon/HiKey/HiKey.dsc
@@ -205,7 +202,7 @@  UEFI_BIN=BL33_AP_UEFI.fd
 UEFI_IMAGE_DIR=HiKey
 BUILD_ATF=yes
 ATF_SPD=opteed
-TOS_BIN=tee.bin
+TOS_BIN=tee-pager.bin
 TOS_PLATFORM_FLAVOR=hikey
 BUILD_TOS=yes
 SCP_BIN=OpenPlatformPkg/Platforms/Hisilicon/HiKey/Binary/mcuimage.bin