From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQX63-0003Nw-N0 for barebox@lists.infradead.org; Mon, 20 Apr 2020 14:08:29 +0000 Date: Mon, 20 Apr 2020 16:08:24 +0200 From: Sascha Hauer Message-ID: <20200420140824.GE1694@pengutronix.de> References: <20200415093600.1662643-1-ahmad@a3f.at> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200415093600.1662643-1-ahmad@a3f.at> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] startup: add $global.autoboot to make behavior configurable To: Ahmad Fatoum Cc: barebox@lists.infradead.org On Wed, Apr 15, 2020 at 11:36:00AM +0200, Ahmad Fatoum wrote: > We already have a autoboot_state variable that controls barebox init > behavior on startup: > > * ABORT: abort and fall into shell > * MENU: display boot menu > * BOOT: boot directly without delay > * UNKNOWN: default; count down and then boot > > Exporting this as a device parameter allows us to support some > different boot scenarios: > > * ABORT boot always while debugging > * display MENU by default (e.g. for graphical boots) > > Signed-off-by: Ahmad Fatoum > --- > common/startup.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/common/startup.c b/common/startup.c > index c417a4d0781a..ff890fa744ab 100644 > --- a/common/startup.c > +++ b/common/startup.c > @@ -163,6 +163,13 @@ static const char * const global_autoboot_abort_keys[] = { > }; > static int global_autoboot_timeout = 3; > > +static const char * const autoboot_states[] = { > + [AUTOBOOT_UNKNOWN] = "unknown", > + [AUTOBOOT_ABORT] = "abort", > + [AUTOBOOT_MENU] = "menu", > + [AUTOBOOT_BOOT] = "boot", > +}; > + > static bool test_abort(void) > { > bool do_abort = false; > @@ -194,7 +201,7 @@ static bool test_abort(void) > #define INITFILE "/env/bin/init" > #define MENUFILE "/env/menu/mainmenu" > > -static enum autoboot_state autoboot_state = AUTOBOOT_UNKNOWN; > +static int autoboot_state = AUTOBOOT_UNKNOWN; > > /** > * set_autoboot_state - set the autoboot state > @@ -285,6 +292,10 @@ static int run_init(void) > ARRAY_SIZE(global_autoboot_abort_keys)); > globalvar_add_simple_int("autoboot_timeout", > &global_autoboot_timeout, "%u"); > + globalvar_add_simple_enum("autoboot", > + &autoboot_state, > + autoboot_states, > + ARRAY_SIZE(autoboot_states)); Please add a MAGICVAR description for this. Setting it to AUTOBOOT_BOOT seems a bit dangerous, there's no way back if booting goes wrong. Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox