summaryrefslogtreecommitdiffstats
path: root/defaultenv
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-09-13 14:56:05 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-09-13 14:56:05 +0200
commitdd534571bdabeea50e32399b7661b3204275e724 (patch)
treed1cb34ffde79a411c5054630b505afb4bd4906d4 /defaultenv
parentebe2e918c2f8d9afb309f941f516eee3d41e6c3d (diff)
parentfaf2ec64e7442fda2e2330c0df047bcd902c5927 (diff)
downloadbarebox-dd534571bdabeea50e32399b7661b3204275e724.tar.gz
Merge branch 'for-next/misc'
Diffstat (limited to 'defaultenv')
-rw-r--r--defaultenv/defaultenv-1/bin/boot4
-rw-r--r--defaultenv/defaultenv-1/bin/init5
2 files changed, 6 insertions, 3 deletions
diff --git a/defaultenv/defaultenv-1/bin/boot b/defaultenv/defaultenv-1/bin/boot
index c17ccdb..a5d6596 100644
--- a/defaultenv/defaultenv-1/bin/boot
+++ b/defaultenv/defaultenv-1/bin/boot
@@ -2,6 +2,10 @@
. /env/config
+if [ -f /env/bin/boot_board ]; then
+ . /env/bin/boot_board
+fi
+
if [ x$kernel_loc = xnet ]; then
kernel_loc=tftp
fi
diff --git a/defaultenv/defaultenv-1/bin/init b/defaultenv/defaultenv-1/bin/init
index a55d293..2dcddbe 100644
--- a/defaultenv/defaultenv-1/bin/init
+++ b/defaultenv/defaultenv-1/bin/init
@@ -23,9 +23,8 @@ if [ -f /env/bin/init_board ]; then
fi
echo -e "\e[?25h"
-if [ -f /env/bin/boot_board ]; then
- . /env/bin/boot_board
-elif [ -n $autoboot_timeout ]; then
+
+if [ -n $autoboot_timeout ]; then
echo -n "Hit any key to stop autoboot: "
timeout -a $autoboot_timeout
if [ $? != 0 ]; then