lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[app][lkboot] allow building lkboot without server, sysparams control autoboot behavior

Browse Source 
add lkboot.autoboot and lkboot.autoboot_timeout sysparam overrides to the default.

Change-Id: I84640db94bc6ab0df906ad78e00462819150422c
This commit is contained in:
Travis Geiselbrecht
2015-04-27 16:30:33 -07:00
parent 9d1cadbd97
commit e3834e4601
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lkboot/dcc.c
View File

@@ -235,7 +235,7 @@ lkb_t *lkboot_check_dcc_open(void)
void lkboot_dcc_init(void)
{
paddr_t pa;
status_t err;
__UNUSED status_t err;
buffer_desc.version = PDCC_VERSION;

34
app/lkboot/lkboot.c
View File

@@ -34,6 +34,8 @@
#include <assert.h>
#include <trace.h>
#include <lib/sysparam.h>
#include <kernel/thread.h>
#include <kernel/mutex.h>
@@ -44,8 +46,12 @@
#include <lib/minip.h>
#endif
#ifndef LKBOOT_WITH_SERVER
#define LKBOOT_WITH_SERVER 1
#define LKBOOT_SERVER_TIMEOUT 5000
#endif
#ifndef LKBOOT_AUTOBOOT_TIMEOUT
#define LKBOOT_AUTOBOOT_TIMEOUT 5000
#endif
#define LOCAL_TRACE 0
@@ -55,6 +61,8 @@
#define STATE_DONE 3
#define STATE_ERROR 4
static lk_time_t autoboot_timeout = LKBOOT_AUTOBOOT_TIMEOUT;
typedef struct LKB {
lkb_read_hook *read;
lkb_write_hook *write;
@@ -221,6 +229,11 @@ fail:
static status_t lkboot_server(bool wait_forever)
{
/* if we're not going to autoboot, stay here forever */
if (autoboot_timeout == INFINITE_TIME) {
wait_forever = true;
}
lkboot_dcc_init();
#if WITH_LIB_MINIP
@@ -272,7 +285,7 @@ static status_t lkboot_server(bool wait_forever)
/* see if we need to drop out and try to direct boot */
if (!wait_forever) {
if (current_time() - t >= LKBOOT_SERVER_TIMEOUT) {
if (current_time() - t >= autoboot_timeout) {
break;
}
}
@@ -289,8 +302,25 @@ static status_t lkboot_server(bool wait_forever)
static void lkboot_task(const struct app_descriptor *app, void *args)
{
/* read a few sysparams to decide if we're going to autoboot */
uint8_t autoboot = 1;
sysparam_read("lkboot.autoboot", &autoboot, sizeof(autoboot));
if (!autoboot) {
autoboot_timeout = INFINITE_TIME;
} else {
sysparam_read("lkboot.autoboot_timeout", &autoboot_timeout, sizeof(autoboot_timeout));
}
TRACEF("autoboot %u autoboot_timeout %d\n", autoboot, autoboot_timeout);
#if LKBOOT_WITH_SERVER
lkboot_server(false);
#else
if (autoboot_timeout != INFINITE_TIME) {
TRACEF("waiting for %u milliseconds before autobooting\n", autoboot_timeout);
thread_sleep(autoboot_timeout);
}
#endif
TRACEF("trying to boot from flash...\n");