summaryrefslogtreecommitdiffstats
path: root/discover
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2015-01-27 14:38:55 +0800
committerJeremy Kerr <jk@ozlabs.org>2015-02-16 10:24:22 +0800
commit900412ec49f30fbb7872a5ff38538a19c17e20a2 (patch)
tree20ffbb839848c5002541f620633f7a22be6b19be /discover
parent2e05b1dd0490ce7ecdd15f522e6c700bc6522062 (diff)
downloadtalos-petitboot-900412ec49f30fbb7872a5ff38538a19c17e20a2.tar.gz
talos-petitboot-900412ec49f30fbb7872a5ff38538a19c17e20a2.zip
discover/platform: rename finalise_config hook
We want to expand the finalise_config hook to cover generic pre-boot functionality, so rename to pre_boot. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover')
-rw-r--r--discover/device-handler.c2
-rw-r--r--discover/platform-powerpc.c4
-rw-r--r--discover/platform.c6
-rw-r--r--discover/platform.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c
index fd6f1d3..5d9f988 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -843,7 +843,7 @@ void device_handler_boot(struct device_handler *handler,
if (handler->pending_boot)
boot_cancel(handler->pending_boot);
- platform_finalise_config();
+ platform_pre_boot();
handler->pending_boot = boot(handler, opt, cmd, handler->dry_run,
boot_status, handler);
diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 0440eb4..f6a78a9 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -832,7 +832,7 @@ static int save_config(struct platform *p, struct config *config)
return rc;
}
-static void finalise_config(struct platform *p, const struct config *config)
+static void pre_boot(struct platform *p, const struct config *config)
{
struct platform_powerpc *platform = to_platform_powerpc(p);
@@ -905,7 +905,7 @@ static struct platform platform_powerpc = {
.probe = probe,
.load_config = load_config,
.save_config = save_config,
- .finalise_config = finalise_config,
+ .pre_boot = pre_boot,
.get_sysinfo = get_sysinfo,
};
diff --git a/discover/platform.c b/discover/platform.c
index 7275a5f..04798ac 100644
--- a/discover/platform.c
+++ b/discover/platform.c
@@ -180,12 +180,12 @@ const struct platform *platform_get(void)
return platform;
}
-void platform_finalise_config(void)
+void platform_pre_boot(void)
{
const struct config *config = config_get();
- if (platform && config && platform->finalise_config)
- platform->finalise_config(platform, config);
+ if (platform && config && platform->pre_boot)
+ platform->pre_boot(platform, config);
}
int platform_get_sysinfo(struct system_info *info)
diff --git a/discover/platform.h b/discover/platform.h
index ab1bd88..5aa8e3f 100644
--- a/discover/platform.h
+++ b/discover/platform.h
@@ -8,7 +8,7 @@ struct platform {
bool (*probe)(struct platform *, void *);
int (*load_config)(struct platform *, struct config *);
int (*save_config)(struct platform *, struct config *);
- void (*finalise_config)(struct platform *,
+ void (*pre_boot)(struct platform *,
const struct config *);
int (*get_sysinfo)(struct platform *, struct system_info *);
uint16_t dhcp_arch_id;
@@ -19,7 +19,7 @@ int platform_init(void *ctx);
int platform_fini(void);
const struct platform *platform_get(void);
int platform_get_sysinfo(struct system_info *info);
-void platform_finalise_config(void);
+void platform_pre_boot(void);
/* configuration interface */
const struct config *config_get(void);
OpenPOWER on IntegriCloud