mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Eric Bénard" <eric@eukrea.com>
To: barebox@lists.infradead.org
Subject: [PATCH 15/16] eukrea_cpuimx25&35: update init_board
Date: Thu, 17 May 2012 17:46:17 +0200	[thread overview]
Message-ID: <1337269578-20570-15-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <1337269578-20570-1-git-send-email-eric@eukrea.com>

we shouldn't exit this script in case the MAC address is not set.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 arch/arm/boards/eukrea_cpuimx25/env/bin/init_board |    4 ++--
 arch/arm/boards/eukrea_cpuimx35/env/bin/init_board |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boards/eukrea_cpuimx25/env/bin/init_board b/arch/arm/boards/eukrea_cpuimx25/env/bin/init_board
index 3c4b1ea..ff3365d 100644
--- a/arch/arm/boards/eukrea_cpuimx25/env/bin/init_board
+++ b/arch/arm/boards/eukrea_cpuimx25/env/bin/init_board
@@ -22,9 +22,9 @@ if [ $? -eq 0 ]; then
 		if [ $? -eq 0 ]; then
 			usbserial
 			autoboot_timeout=60
-			exit
+		else
+			reset
 		fi
-		reset
 	else
 		autoboot_timeout=28
 	fi
diff --git a/arch/arm/boards/eukrea_cpuimx35/env/bin/init_board b/arch/arm/boards/eukrea_cpuimx35/env/bin/init_board
index 7659cc4..89fd9a9 100644
--- a/arch/arm/boards/eukrea_cpuimx35/env/bin/init_board
+++ b/arch/arm/boards/eukrea_cpuimx35/env/bin/init_board
@@ -24,9 +24,9 @@ if [ $? -eq 0 ]; then
 		if [ $? -eq 0 ]; then
 			usbserial
 			autoboot_timeout=60
-			exit
+		else
+			reset
 		fi
-		reset
 	else
 		autoboot_timeout=28
 	fi
-- 
1.7.7.6


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2012-05-17 15:47 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-17 15:46 [PATCH 01/16] eukrea_cpuimx25: workaround ENGcm09152 Eric Bénard
2012-05-17 15:46 ` [PATCH 02/16] eukrea_cpuimx25: add display choice in environment Eric Bénard
2012-05-17 15:46 ` [PATCH 03/16] eukrea_cpuimx25: update defconfig Eric Bénard
2012-05-17 15:46 ` [PATCH 04/16] eukrea_cpuimx35: add display choice in environment Eric Bénard
2012-05-17 15:46 ` [PATCH 05/16] eukrea_cpuimx35: update defconfig Eric Bénard
2012-05-17 15:46 ` [PATCH 06/16] eukrea_cpuimx51: updated env Eric Bénard
2012-05-17 15:46 ` [PATCH 07/16] eukrea_cpuimx51: update defconfig Eric Bénard
2012-05-17 15:46 ` [PATCH 08/16] eukrea_cpuimx25: use switch action to launch usbserial or dfu Eric Bénard
2012-05-17 15:46 ` [PATCH 09/16] eukrea_cpuimx35: " Eric Bénard
2012-05-17 15:46 ` [PATCH 10/16] fs/tftp: depend on NET_TFTP Eric Bénard
2012-05-17 17:54   ` Sascha Hauer
2012-05-26  9:43   ` Jean-Christophe PLAGNIOL-VILLARD
2012-05-31 18:24     ` Sascha Hauer
2012-05-17 15:46 ` [PATCH 11/16] iim: don't try to set ethaddr when NET is not selected Eric Bénard
2012-05-17 17:40   ` Sascha Hauer
2012-05-17 15:46 ` [PATCH 12/16] fec_imx: restart aneg at open and not at init Eric Bénard
2012-05-17 17:36   ` Sascha Hauer
2012-05-17 19:32     ` Eric Bénard
2012-05-18  8:40       ` Sascha Hauer
2012-05-17 15:46 ` [PATCH 13/16] eukrea_cpuimx25: fix PHY address Eric Bénard
2012-05-17 15:46 ` [PATCH 14/16] eukrea_cpuimx35: " Eric Bénard
2012-05-17 17:42   ` Sascha Hauer
2012-05-17 19:33     ` Eric Bénard
2012-05-17 15:46 ` Eric Bénard [this message]
2012-05-17 15:46 ` [PATCH 16/16] eukrea_cpuimx25&35: update defconfig Eric Bénard
2012-05-17 17:45   ` Sascha Hauer
2012-05-17 19:34     ` Eric Bénard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1337269578-20570-15-git-send-email-eric@eukrea.com \
    --to=eric@eukrea.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox