From 3889e42b9e6845b04c513b04f753efae233452ed Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 14 Nov 2008 11:37:28 +0100 Subject: Default environments: Do not continue when tftp failed When we fail to download the kernel image (for example when the user pressed ctrl-c) do not try to boot the image Signed-off-by: Sascha Hauer --- board/imx27ads/env/bin/boot | 2 +- board/ipe337/env/bin/boot | 2 +- board/kp_ukd_r1_num/env/bin/boot | 2 +- board/pcm037/env/bin/boot | 2 +- board/pcm038/env/bin/boot | 2 +- board/phycore_mcf54xx/env/bin/boot | 2 +- board/pm9263/env/bin/boot | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'board') diff --git a/board/imx27ads/env/bin/boot b/board/imx27ads/env/bin/boot index 71d4391591..3859dc113b 100644 --- a/board/imx27ads/env/bin/boot +++ b/board/imx27ads/env/bin/boot @@ -30,7 +30,7 @@ if [ $kernel = net ]; then if [ x$ip = xdhcp ]; then dhcp fi - tftp $uimage uImage + tftp $uimage uImage || exit 1 bootm uImage else bootm /dev/nor0.kernel diff --git a/board/ipe337/env/bin/boot b/board/ipe337/env/bin/boot index 9a607f481e..62807d211f 100644 --- a/board/ipe337/env/bin/boot +++ b/board/ipe337/env/bin/boot @@ -47,7 +47,7 @@ if [ $kernel = net ]; then if [ x$ip = xdhcp ]; then dhcp fi - tftp $uimage uImage + tftp $uimage uImage || exit 1 bootm uImage else bootm $act_kernel diff --git a/board/kp_ukd_r1_num/env/bin/boot b/board/kp_ukd_r1_num/env/bin/boot index b8f868fe85..c9fcbac620 100644 --- a/board/kp_ukd_r1_num/env/bin/boot +++ b/board/kp_ukd_r1_num/env/bin/boot @@ -30,7 +30,7 @@ if [ $kernel = net ]; then if [ x$ip = xdhcp ]; then dhcp fi - tftp $uimage uImage + tftp $uimage uImage || exit 1 bootm uImage else bootm /dev/nor0.kernel diff --git a/board/pcm037/env/bin/boot b/board/pcm037/env/bin/boot index 2d0f7107ac..dfb59aa692 100644 --- a/board/pcm037/env/bin/boot +++ b/board/pcm037/env/bin/boot @@ -37,7 +37,7 @@ if [ $kernel = net ]; then if [ x$ip = xdhcp ]; then dhcp fi - tftp $uimage uImage + tftp $uimage uImage || exit 1 bootm uImage elif [ $kernel = nor ]; then bootm /dev/nor0.kernel diff --git a/board/pcm038/env/bin/boot b/board/pcm038/env/bin/boot index 2d0f7107ac..dfb59aa692 100644 --- a/board/pcm038/env/bin/boot +++ b/board/pcm038/env/bin/boot @@ -37,7 +37,7 @@ if [ $kernel = net ]; then if [ x$ip = xdhcp ]; then dhcp fi - tftp $uimage uImage + tftp $uimage uImage || exit 1 bootm uImage elif [ $kernel = nor ]; then bootm /dev/nor0.kernel diff --git a/board/phycore_mcf54xx/env/bin/boot b/board/phycore_mcf54xx/env/bin/boot index b8f868fe85..c9fcbac620 100644 --- a/board/phycore_mcf54xx/env/bin/boot +++ b/board/phycore_mcf54xx/env/bin/boot @@ -30,7 +30,7 @@ if [ $kernel = net ]; then if [ x$ip = xdhcp ]; then dhcp fi - tftp $uimage uImage + tftp $uimage uImage || exit 1 bootm uImage else bootm /dev/nor0.kernel diff --git a/board/pm9263/env/bin/boot b/board/pm9263/env/bin/boot index 05241d93c0..533dea7618 100644 --- a/board/pm9263/env/bin/boot +++ b/board/pm9263/env/bin/boot @@ -37,7 +37,7 @@ if [ $kernel = net ]; then if [ x$ip = xdhcp ]; then dhcp fi - tftp $uimage uImage + tftp $uimage uImage || exit 1 bootm uImage elif [ $kernel = nor ]; then bootm /dev/nor0.kernel -- cgit v1.2.3