summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Huber <andreas.huber@keymile.com>2013-01-21 03:55:21 +0000
committerKim Phillips <kim.phillips@freescale.com>2013-02-15 17:47:20 -0600
commitd42a3b74980e65e72185a07f9f556e00587e7349 (patch)
tree7a1d4ebd1231c3e0289976ee4388e874dfd0658d
parentdacc109c41f82fcce68bd77e531663b485708f7a (diff)
downloadu-boot-imx-d42a3b74980e65e72185a07f9f556e00587e7349.zip
u-boot-imx-d42a3b74980e65e72185a07f9f556e00587e7349.tar.gz
u-boot-imx-d42a3b74980e65e72185a07f9f556e00587e7349.tar.bz2
km/scripts: replace hardcoded uImage
Replace uImage with ${uimage}. If uimage is not set, default it to uImage. Signed-off-by: Andreas Huber <andreas.huber@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
-rw-r--r--board/keymile/scripts/develop-common.txt5
-rw-r--r--board/keymile/scripts/ramfs-common.txt5
2 files changed, 6 insertions, 4 deletions
diff --git a/board/keymile/scripts/develop-common.txt b/board/keymile/scripts/develop-common.txt
index aa3d659..a6bb1b1 100644
--- a/board/keymile/scripts/develop-common.txt
+++ b/board/keymile/scripts/develop-common.txt
@@ -1,8 +1,9 @@
altbootcmd=run ${subbootcmds}
bootcmd=run ${subbootcmds}
-configure=km_setboardid && saveenv && reset
+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}
-tftpkernel=tftpboot ${load_addr_r} ${hostname}/uImage
+tftpkernel=tftpboot ${load_addr_r} ${hostname}/${uimage}
toolchain=/opt/eldk
rootfssize=0
+set_uimage=printenv uimage || setenv uimage uImage
diff --git a/board/keymile/scripts/ramfs-common.txt b/board/keymile/scripts/ramfs-common.txt
index c1b45ab..8a8d287 100644
--- a/board/keymile/scripts/ramfs-common.txt
+++ b/board/keymile/scripts/ramfs-common.txt
@@ -4,8 +4,9 @@ altbootcmd=run ${subbootcmds}
bootcmd=run ${subbootcmds}
subbootcmds=tftpfdt tftpkernel setrootfsaddr tftpramfs flashargs add_default addpanic addramfs boot
nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath}
-configure=km_setboardid && saveenv && reset
+configure=run set_uimage; km_setboardid && saveenv && reset
rootfsfile=${hostname}/rootfsImage
setrootfsaddr=setexpr value ${pnvramaddr} - ${rootfssize} && setenv rootfsaddr 0x${value}
-tftpkernel=tftpboot ${load_addr_r} ${hostname}/uImage
+tftpkernel=tftpboot ${load_addr_r} ${hostname}/${uimage}
tftpramfs=tftpboot ${rootfsaddr} ${hostname}/rootfsImage
+set_uimage=printenv uimage || setenv uimage uImage