diff options
| author | Holger Brunck <holger.brunck@keymile.com> | 2015-11-13 16:15:21 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-18 15:28:50 -0500 |
| commit | 91b9db0be55d36948104e8fd4ef12ca3ef182b0e (patch) | |
| tree | 8af51a83a474d3d9a590bdfd2cb90937627a510f /board | |
| parent | c6d32dfd99f6e36c68c82d0d706158132a07e140 (diff) | |
| download | blackbird-obmc-uboot-91b9db0be55d36948104e8fd4ef12ca3ef182b0e.tar.gz blackbird-obmc-uboot-91b9db0be55d36948104e8fd4ef12ca3ef182b0e.zip | |
km/scripts: load fdt_bid_kwkey.dtb when working with tftp
When loading the dtb file via tftp we should load the one which matches
boardId and hwKey and not a common one for the boardname. We have boards
were different hwKeys are used and then we may load an incorrect dtb
file. If no fdt_bid_kwkey.dtb file is not a fallback to boardname.dtb is used.
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
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>
Diffstat (limited to 'board')
| -rw-r--r-- | board/keymile/scripts/develop-common.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/keymile/scripts/develop-common.txt b/board/keymile/scripts/develop-common.txt index a80812a5d0..99a0589d87 100644 --- a/board/keymile/scripts/develop-common.txt +++ b/board/keymile/scripts/develop-common.txt @@ -3,7 +3,7 @@ bootcmd=run ${subbootcmds} configure=run set_uimage; 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 tftpboot ${fdt_addr_r} ${hostname}/${hostname}.dtb; else true; fi +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} toolchain=/opt/eldk rootfssize=0 |
