[PATCH] u-boot: add support for SPL UART variant

[PATCH] u-boot: add support for SPL UART variant

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

This is an adaptation of a patch by Carlos Hernandez

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Cc: Carlos Hernandez <ceh@ti.com>
---
 recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01.bb |  3 ++-
 recipes-bsp/u-boot/u-boot-ti.inc                   | 24 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01.bb
index 5fbd0c9..ea72e4d 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01.bb
@@ -2,7 +2,7 @@ require u-boot-ti.inc
 
 DESCRIPTION = "u-boot bootloader for TI devices"
 
-PR = "r4+gitr${SRCPV}"
+PR = "r5+gitr${SRCPV}"
 
 SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
 
@@ -12,3 +12,4 @@ BRANCH ?= "ti-u-boot-2013.01.01"
 SRCREV = "7552b4c906b0a50fbc5225dc43ed0192618e9d5d"
 
 SPL_BINARY = "MLO"
+SPL_UART_BINARY = "u-boot-spl.bin"
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index 968f3e4..c024e96 100644
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -15,3 +15,27 @@ PKG_${PN}-dbg = "u-boot-dbg"
 S = "${WORKDIR}/git"
 
 UBOOT_SUFFIX = "img"
+
+# SPL (Second Program Loader) to be loaded over UART
+SPL_UART_BINARY ?= ""
+SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
+SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
+
+do_install_append () {
+    if [ "x${SPL_UART_BINARY}" != "x" ]
+    then
+        install ${S}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}
+        ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY}
+    fi
+}
+
+do_deploy_append () {
+    cd ${DEPLOYDIR}
+    if [ "x${SPL_UART_BINARY}" != "x" ]
+    then
+        install ${S}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}
+        rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+        ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY}
+        ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+    fi
+}
-- 
1.8.2.1

Re: [PATCH] u-boot: add support for SPL UART variant

[Carlos Hernandez]

Acked-by: Carlos Hernandez <ceh@ti.com>

On 06/24/2013 09:52 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> This is an adaptation of a patch by Carlos Hernandez
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> Cc: Carlos Hernandez <ceh@ti.com>
> ---
>   recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01.bb |  3 ++-
>   recipes-bsp/u-boot/u-boot-ti.inc                   | 24 ++++++++++++++++++++++
>   2 files changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01.bb
> index 5fbd0c9..ea72e4d 100644
> --- a/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01.bb
> +++ b/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01.bb
> @@ -2,7 +2,7 @@ require u-boot-ti.inc
>   
>   DESCRIPTION = "u-boot bootloader for TI devices"
>   
> -PR = "r4+gitr${SRCPV}"
> +PR = "r5+gitr${SRCPV}"
>   
>   SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
>   
> @@ -12,3 +12,4 @@ BRANCH ?= "ti-u-boot-2013.01.01"
>   SRCREV = "7552b4c906b0a50fbc5225dc43ed0192618e9d5d"
>   
>   SPL_BINARY = "MLO"
> +SPL_UART_BINARY = "u-boot-spl.bin"
> diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
> index 968f3e4..c024e96 100644
> --- a/recipes-bsp/u-boot/u-boot-ti.inc
> +++ b/recipes-bsp/u-boot/u-boot-ti.inc
> @@ -15,3 +15,27 @@ PKG_${PN}-dbg = "u-boot-dbg"
>   S = "${WORKDIR}/git"
>   
>   UBOOT_SUFFIX = "img"
> +
> +# SPL (Second Program Loader) to be loaded over UART
> +SPL_UART_BINARY ?= ""
> +SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
> +SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
> +
> +do_install_append () {
> +    if [ "x${SPL_UART_BINARY}" != "x" ]
> +    then
> +        install ${S}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}
> +        ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY}
> +    fi
> +}
> +
> +do_deploy_append () {
> +    cd ${DEPLOYDIR}
> +    if [ "x${SPL_UART_BINARY}" != "x" ]
> +    then
> +        install ${S}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}
> +        rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
> +        ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY}
> +        ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
> +    fi
> +}