On Mon, Aug 22, 2016 at 03:45:34PM +0200, Guillermo Rodriguez wrote: > From: grodriguez <guille.rodriguez@xxxxxxxxx> > > 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@xxxxxxxxx> > --- > defaultenv/defaultenv-1/bin/boot | 4 ++++ > defaultenv/defaultenv-1/bin/init | 5 ++--- > 2 files changed, 6 insertions(+), 3 deletions(-) Applied, thanks Sascha > > 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 > -- > 1.7.9.5 > > > _______________________________________________ > barebox mailing list > barebox@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
