From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Mon, 16 Nov 2015 12:09:50 +0100 Subject: [U-Boot] [PATCH 3/4] km/scripts: load fdt_bid_kwkey.dtb when working with tftp In-Reply-To: <1447427722-24450-4-git-send-email-valentin.longchamp@keymile.com> References: <1447427722-24450-1-git-send-email-valentin.longchamp@keymile.com> <1447427722-24450-4-git-send-email-valentin.longchamp@keymile.com> Message-ID: <5649B97E.8020007@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Valentin, Am 13.11.2015 um 16:15 schrieb Valentin Longchamp: > From: Holger Brunck > > 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 > Signed-off-by: Tobias M?ller > Signed-off-by: Valentin Longchamp > --- > > board/keymile/scripts/develop-common.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Heiko Schocher bye, Heiko > > diff --git a/board/keymile/scripts/develop-common.txt b/board/keymile/scripts/develop-common.txt > index a80812a..99a0589 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 > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany