diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-07 10:01:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-07 10:02:38 +0200 |
| commit | 764941b17e53e40dd1df1ac3137ebc825d5d6480 (patch) | |
| tree | 845a9c567691ddfac0c46493f2f50fe61e1e728e /common/startup.c | |
| parent | bc4ac257257c340b108499e65ed7ac383306b2b8 (diff) | |
| parent | 8a7822a8d6659a1132f668dcc20328a1e646f00e (diff) | |
| download | barebox-764941b17e53e40dd1df1ac3137ebc825d5d6480.tar.gz | |
Merge branch 'for-next/magicvar-unique-id' into for-next/reboot-mode
Diffstat (limited to 'common/startup.c')
| -rw-r--r-- | common/startup.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/common/startup.c b/common/startup.c index f3e5765d5d..2c20276011 100644 --- a/common/startup.c +++ b/common/startup.c @@ -454,12 +454,9 @@ void shutdown_barebox(void) } } -BAREBOX_MAGICVAR_NAMED(autoboot_state, - global.autoboot, - "Autoboot state. Possible values: countdown (default), abort, menu, boot"); -BAREBOX_MAGICVAR_NAMED(global_autoboot_abort_key, - global.autoboot_abort_key, - "Which key allows to interrupt autoboot. Possible values: any, ctrl-c"); -BAREBOX_MAGICVAR_NAMED(global_autoboot_timeout, - global.autoboot_timeout, - "Timeout before autoboot starts in seconds"); +BAREBOX_MAGICVAR(global.autoboot, + "Autoboot state. Possible values: countdown (default), abort, menu, boot"); +BAREBOX_MAGICVAR(global.autoboot_abort_key, + "Which key allows to interrupt autoboot. Possible values: any, ctrl-c"); +BAREBOX_MAGICVAR(global.autoboot_timeout, + "Timeout before autoboot starts in seconds"); |