From e17f6c7e1bcf7a5f67d0f1a51c39af0d8ab104d4 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Wed, 18 Sep 2013 09:06:02 +0800 Subject: [PATCH] lib/pb-config/powerpc-nvram: Add petitboot,timeout nvram property Signed-off-by: Jeremy Kerr --- lib/pb-config/storage-powerpc-nvram.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/pb-config/storage-powerpc-nvram.c b/lib/pb-config/storage-powerpc-nvram.c index 7c8b9e1..fa2437c 100644 --- a/lib/pb-config/storage-powerpc-nvram.c +++ b/lib/pb-config/storage-powerpc-nvram.c @@ -1,6 +1,7 @@ #include #include +#include #include #include @@ -29,6 +30,7 @@ struct powerpc_nvram_storage { static const char *known_params[] = { "auto-boot?", "petitboot,network", + "petitboot,timeout", NULL, }; @@ -301,12 +303,24 @@ static void populate_config(struct powerpc_nvram_storage *nv, struct config *config) { const char *val; + char *end; + unsigned long timeout; /* if the "auto-boot?' property is present and "false", disable auto * boot */ val = get_param(nv, "auto-boot?"); config->autoboot_enabled = !val || strcmp(val, "false"); + val = get_param(nv, "petitboot,timeout"); + if (val) { + timeout = strtoul(val, &end, 10); + if (end != val) { + if (timeout >= INT_MAX) + timeout = INT_MAX; + config->autoboot_timeout_sec = (int)timeout; + } + } + populate_network_config(nv, config); } -- 2.39.2