[meta-ti] [PATCH] u-boot-ti.inc: k2e-hs-evm doesn't provide the same binaries as other KS2 devices

[Dan Murphy]

Denys

On 02/18/2017 08:46 PM, Denys Dmytriyenko wrote:
> Signed-off-by: Denys Dmytriyenko <denys at ti.com>
> ---
>  recipes-bsp/u-boot/u-boot-ti.inc | 35 ++++++++++++++++++++++-------------
>  1 file changed, 22 insertions(+), 13 deletions(-)
>
> diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
> index 0c0b6e8..57f7fe6 100644
> --- a/recipes-bsp/u-boot/u-boot-ti.inc
> +++ b/recipes-bsp/u-boot/u-boot-ti.inc
> @@ -49,7 +49,6 @@ SPL_BINARY_omapl138 = ""
>  
>  # SPL (Second Program Loader) to be loaded over UART
>  SPL_UART_BINARY = "u-boot-spl.bin"
> -SPL_UART_BINARY_k2e-hs-evm = ""
>  SPL_UART_BINARY_keystone = ""
>  
>  SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
> @@ -60,8 +59,10 @@ UBOOT_SUFFIX_keystone = "bin"
>  
>  # SPI NOR Flash binaries
>  UBOOT_SPI_SPL_BINARY = "u-boot-spl.bin"
> +UBOOT_SPI_SPL_BINARY_k2e-hs-evm = ""
>  UBOOT_SPI_BINARY = "u-boot.img"
>  UBOOT_SPI_GPH_BINARY = "u-boot-spi.gph"
> +UBOOT_SPI_GPH_BINARY_k2e-hs-evm = ""
>  
>  # SPI NOR Flash deployed images
>  UBOOT_SPI_SPL_IMAGE = "u-boot-spl-${MACHINE}-${PV}-${PR}.bin"
> @@ -126,29 +127,37 @@ do_deploy_append () {
>  }
>  
>  do_install_append_keystone () {
> -	install ${B}/spl/${UBOOT_SPI_SPL_BINARY} ${D}/boot/${UBOOT_SPI_SPL_IMAGE}
> -	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${D}/boot/${UBOOT_SPI_SPL_BINARY}
> +	if [ "x${UBOOT_SPI_SPL_BINARY}" != "x" ]; then

This won't work.  You are checking for the SPI SPL binary in the build directory then
try to install the binary from the spl directory.

Also why don't we use the -d and -f directory and file tests?  They are shell compliant

I used
"if [ -d ${B}/spl ]; then
    if [ -f ${B}/spl/${UBOOT_SPI_SPL_BINARY} ]; then"

Then we can just define all the uboot images and then if they are there copy otherwise
log a message and move on.

> +		install ${B}/spl/${UBOOT_SPI_SPL_BINARY} ${D}/boot/${UBOOT_SPI_SPL_IMAGE}
> +		ln -sf ${UBOOT_SPI_SPL_IMAGE} ${D}/boot/${UBOOT_SPI_SPL_BINARY}
> +	fi
>  
>  	install ${B}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE}
>  	ln -sf ${UBOOT_SPI_IMAGE} ${D}/boot/${UBOOT_SPI_BINARY}
>  
> -	install ${B}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE}
> -	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${D}/boot/${UBOOT_SPI_GPH_BINARY}
> +	if [ "x${UBOOT_SPI_GPH_BINARY}" != "x" ]; then
> +		install ${B}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE}
> +		ln -sf ${UBOOT_SPI_GPH_IMAGE} ${D}/boot/${UBOOT_SPI_GPH_BINARY}
> +	fi
>  }
>  
>  do_deploy_append_keystone () {
> -	install ${B}/spl/${UBOOT_SPI_SPL_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}
> -	rm -f ${UBOOT_SPI_SPL_BINARY} ${UBOOT_SPI_SPL_SYMLINK}
> -	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_SYMLINK}
> -	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_BINARY}
> +	if [ "x${UBOOT_SPI_SPL_BINARY}" != "x" ]; then

Same as above

> +		install ${B}/spl/${UBOOT_SPI_SPL_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}
> +		rm -f ${UBOOT_SPI_SPL_BINARY} ${UBOOT_SPI_SPL_SYMLINK}
> +		ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_SYMLINK}
> +		ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_BINARY}
> +	fi
>  
>  	install ${B}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE}

Can we add the existence check here as well?

>  	rm -f ${UBOOT_SPI_BINARY} ${UBOOT_SPI_SYMLINK}
>  	ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_SYMLINK}
>  	ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_BINARY}
>  
> -	install ${B}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}
> -	rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK}
> -	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK}
> -	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY}
> +	if [ "x${UBOOT_SPI_GPH_BINARY}" != "x" ]; then
> +		install ${B}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}
> +		rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK}
> +		ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK}
> +		ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY}
> +	fi
>  }


-- 
------------------
Dan Murphy