[meta-arago,dunfell/master] tisdk-bundle: fix prebuilt-images U-Boot binary name for HS

HS builds do not generate a -${MACHINE} version of the u-boot.img binary.
Not sure why we deploy these named this way to begin with, maybe a left-
over from when we had multiple machines per SDK.. To fix the HS builds
lets ship the binary named as-is for all platforms.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 meta-arago-distro/classes/tisdk-bundle.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

On Tue, Jun 21, 2022 at 10:39:00AM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> HS builds do not generate a -${MACHINE} version of the u-boot.img binary.
> Not sure why we deploy these named this way to begin with, maybe a left-
> over from when we had multiple machines per SDK.. To fix the HS builds
> lets ship the binary named as-is for all platforms.

This could potentially mess up with the way Processor SDK (installer, setup 
scripts, etc.) expects U-boot binary to be called. I.e. the stuff outside of 
CoreSDK and the Yocto build... But I'm not sure, just speculating here.


> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  meta-arago-distro/classes/tisdk-bundle.bbclass | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass
> index 7e3f4c26..9e961e1b 100644
> --- a/meta-arago-distro/classes/tisdk-bundle.bbclass
> +++ b/meta-arago-distro/classes/tisdk-bundle.bbclass
> @@ -777,9 +777,9 @@ tisdk_image_build () {
>      fi
>  
>      # Copy the U-Boot image if it exists
> -    if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ]
> +    if [ -e ${DEPLOY_DIR_IMAGE}/u-boot.img ]
>      then
> -        cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ${prebuilt_dir}/
> +        cp ${DEPLOY_DIR_IMAGE}/u-boot.img ${prebuilt_dir}/
>      elif [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ]
>      then
>          cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ${prebuilt_dir}/
> -- 
> 2.36.1

On 6/21/22 10:50 AM, Denys Dmytriyenko wrote:
> On Tue, Jun 21, 2022 at 10:39:00AM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> HS builds do not generate a -${MACHINE} version of the u-boot.img binary.
>> Not sure why we deploy these named this way to begin with, maybe a left-
>> over from when we had multiple machines per SDK.. To fix the HS builds
>> lets ship the binary named as-is for all platforms.
> 
> This could potentially mess up with the way Processor SDK (installer, setup
> scripts, etc.) expects U-boot binary to be called. I.e. the stuff outside of
> CoreSDK and the Yocto build... But I'm not sure, just speculating here.
> 
What the installers expect U-Boot to be called doesn't change what it should
be called. To boot from filesystem it should be called 'u-boot.img`, this
is the name made by U-Boot build, this is how it is called in the public
u-boot docs, and the name we should use.

I cannot check every workflow, if it is different outside of Yocto build,
then it is wrong there and should be fixed at that level.

Andrew

> 
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>>   meta-arago-distro/classes/tisdk-bundle.bbclass | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass
>> index 7e3f4c26..9e961e1b 100644
>> --- a/meta-arago-distro/classes/tisdk-bundle.bbclass
>> +++ b/meta-arago-distro/classes/tisdk-bundle.bbclass
>> @@ -777,9 +777,9 @@ tisdk_image_build () {
>>       fi
>>   
>>       # Copy the U-Boot image if it exists
>> -    if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ]
>> +    if [ -e ${DEPLOY_DIR_IMAGE}/u-boot.img ]
>>       then
>> -        cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ${prebuilt_dir}/
>> +        cp ${DEPLOY_DIR_IMAGE}/u-boot.img ${prebuilt_dir}/
>>       elif [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ]
>>       then
>>           cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ${prebuilt_dir}/
>> -- 
>> 2.36.1