summaryrefslogtreecommitdiffstats
path: root/defaultenv/defaultenv-1/bin/boot
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/defaultenv-1/bin/boot
parentebe2e918c2f8d9afb309f941f516eee3d41e6c3d (diff)
parentfaf2ec64e7442fda2e2330c0df047bcd902c5927 (diff)
downloadbarebox-dd534571bdabeea50e32399b7661b3204275e724.tar.gz
barebox-dd534571bdabeea50e32399b7661b3204275e724.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'defaultenv/defaultenv-1/bin/boot')
-rw-r--r--defaultenv/defaultenv-1/bin/boot4
1 files changed, 4 insertions, 0 deletions
diff --git a/defaultenv/defaultenv-1/bin/boot b/defaultenv/defaultenv-1/bin/boot
index c17ccdb8f5..a5d6596d2d 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