summaryrefslogtreecommitdiffstats
path: root/defaultenv
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-04-07 05:14:58 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-11 08:46:53 +0200
commit675afd265b51aa0c3622787819e3555b7bcc9fd9 (patch)
tree934cf4026f40f6fa8238058a35e12fc101c8920e /defaultenv
parent05e58adca03d7ac4137342b6ec47a96708b90b95 (diff)
downloadbarebox-675afd265b51aa0c3622787819e3555b7bcc9fd9.tar.gz
defaultenv: add support for custom board boot
This will allow a board to have a custom boot choice with a boot menu as example. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'defaultenv')
-rw-r--r--defaultenv/bin/init18
1 files changed, 11 insertions, 7 deletions
diff --git a/defaultenv/bin/init b/defaultenv/bin/init
index b371c42..7452bb6 100644
--- a/defaultenv/bin/init
+++ b/defaultenv/bin/init
@@ -24,11 +24,15 @@ if [ -f /env/bin/init_board ]; then
. /env/bin/init_board
fi
-echo
-echo -n "Hit any key to stop autoboot: "
-timeout -a $autoboot_timeout
-if [ $? != 0 ]; then
- exit
+if [ -f /env/bin/boot_board ]; then
+ . /env/bin/boot_board
+else
+ echo
+ echo -n "Hit any key to stop autoboot: "
+ timeout -a $autoboot_timeout
+ if [ $? != 0 ]; then
+ exit
+ fi
+
+ boot
fi
-
-boot