9
0
Fork 0

Call boot_board from boot, not from init.

This ensures that any board-specific code that must be run at
boot time will be run both when autobooting and when manually
running the 'boot' command from the console.

Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
grodriguez 2016-08-22 15:45:34 +02:00 committed by Sascha Hauer
parent 6b40ff8c7e
commit 1dff49274b
2 changed files with 6 additions and 3 deletions

View File

@ -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

View File

@ -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