diff mbox

[U-Boot,4/4] km/scripts: search for kernel/DTBs at serverip:/PRODUCTNAME via TFTP in develop mode

Message ID 1447427722-24450-5-git-send-email-valentin.longchamp@keymile.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Valentin Longchamp Nov. 13, 2015, 3:15 p.m. UTC
From: Tobias Müller <Tobias.Mueller@keymile.com>

Search for the kernel and DTBs in a folder named PRODUCTNAME (found in the IVM)
at the TFTP server instead of the u-boot boardname.

Signed-off-by: Tobias Müller <Tobias.Mueller@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---

 board/keymile/scripts/develop-common.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Heiko Schocher Nov. 16, 2015, 11:10 a.m. UTC | #1
Hello Valentin,

Am 13.11.2015 um 16:15 schrieb Valentin Longchamp:
> From: Tobias Müller <Tobias.Mueller@keymile.com>
>
> Search for the kernel and DTBs in a folder named PRODUCTNAME (found in the IVM)
> at the TFTP server instead of the u-boot boardname.
>
> Signed-off-by: Tobias Müller <Tobias.Mueller@keymile.com>
> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
> ---
>
>   board/keymile/scripts/develop-common.txt | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)


Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
>
> diff --git a/board/keymile/scripts/develop-common.txt b/board/keymile/scripts/develop-common.txt
> index 99a0589..265f02f 100644
> --- a/board/keymile/scripts/develop-common.txt
> +++ b/board/keymile/scripts/develop-common.txt
> @@ -1,10 +1,10 @@
>   altbootcmd=run ${subbootcmds}
>   bootcmd=run ${subbootcmds}
> -configure=run set_uimage; km_setboardid && saveenv && reset
> +configure=run set_uimage; setenv tftppath ${IVM_Symbol} ; km_setboardid && saveenv && reset
>   subbootcmds=tftpfdt tftpkernel nfsargs add_default boot
>   nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${toolchain}/${arch}
> -tftpfdt=if run set_fdthigh || test ${arch} != arm; then if tftpboot ${fdt_addr_r} ${hostname}/fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb; then; else tftpboot ${fdt_addr_r} ${hostname}/${hostname}.dtb; fi; else true; fi
> -tftpkernel=tftpboot ${load_addr_r} ${hostname}/${uimage}
> +tftpfdt=if run set_fdthigh || test ${arch} != arm; then if tftpboot ${fdt_addr_r} ${tftppath}/fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb; then; else tftpboot ${fdt_addr_r} ${tftppath}/${hostname}.dtb; fi; else true; fi
> +tftpkernel=tftpboot ${load_addr_r} ${tftppath}/${uimage}
>   toolchain=/opt/eldk
>   rootfssize=0
>   set_uimage=printenv uimage || setenv uimage uImage
>
Tom Rini Nov. 18, 2015, 10:36 p.m. UTC | #2
On Fri, Nov 13, 2015 at 04:15:22PM +0100, Valentin Longchamp wrote:

> From: Tobias Müller <Tobias.Mueller@keymile.com>
> 
> Search for the kernel and DTBs in a folder named PRODUCTNAME (found in the IVM)
> at the TFTP server instead of the u-boot boardname.
> 
> Signed-off-by: Tobias Müller <Tobias.Mueller@keymile.com>
> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
> Reviewed-by: Heiko Schocher <hs@denx.de>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/board/keymile/scripts/develop-common.txt b/board/keymile/scripts/develop-common.txt
index 99a0589..265f02f 100644
--- a/board/keymile/scripts/develop-common.txt
+++ b/board/keymile/scripts/develop-common.txt
@@ -1,10 +1,10 @@ 
 altbootcmd=run ${subbootcmds}
 bootcmd=run ${subbootcmds}
-configure=run set_uimage; km_setboardid && saveenv && reset
+configure=run set_uimage; setenv tftppath ${IVM_Symbol} ; km_setboardid && saveenv && reset
 subbootcmds=tftpfdt tftpkernel nfsargs add_default boot
 nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${toolchain}/${arch}
-tftpfdt=if run set_fdthigh || test ${arch} != arm; then if tftpboot ${fdt_addr_r} ${hostname}/fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb; then; else tftpboot ${fdt_addr_r} ${hostname}/${hostname}.dtb; fi; else true; fi
-tftpkernel=tftpboot ${load_addr_r} ${hostname}/${uimage}
+tftpfdt=if run set_fdthigh || test ${arch} != arm; then if tftpboot ${fdt_addr_r} ${tftppath}/fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb; then; else tftpboot ${fdt_addr_r} ${tftppath}/${hostname}.dtb; fi; else true; fi
+tftpkernel=tftpboot ${load_addr_r} ${tftppath}/${uimage}
 toolchain=/opt/eldk
 rootfssize=0
 set_uimage=printenv uimage || setenv uimage uImage