X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=7c34939f14197ae4dd84052b8f155f7ecf8829d1;hp=2ce69e76f892ace0f6b06bae728edb20d362f25f;hb=4d5a57a73cbfa29ad2c8672f157294f733726f90;hpb=6897abaa97a02e0ab8ac07209a5e4966bfe101c5

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 2ce69e7..7c34939 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -19,6 +19,7 @@
 
 static const char *partition = "common";
 static const char *sysparams_dir = "/sys/firmware/opal/sysparams/";
+static const char *devtree_dir = "/proc/device-tree/";
 
 struct param {
 	char			*name;
@@ -36,6 +37,8 @@ static const char *known_params[] = {
 	"petitboot,network",
 	"petitboot,timeout",
 	"petitboot,bootdev",
+	"petitboot,language",
+	"petitboot,debug?",
 	NULL,
 };
 
@@ -421,9 +424,17 @@ static void populate_config(struct platform_powerpc *platform,
 		}
 	}
 
+	val = get_param(platform, "petitboot,language");
+	config->lang = val ? talloc_strdup(config, val) : NULL;
+
 	populate_network_config(platform, config);
 
 	populate_bootdev_config(platform, config);
+
+	if (!config->debug) {
+		val = get_param(platform, "petitboot,debug?");
+		config->debug = val && !strcmp(val, "true");
+	}
 }
 
 static char *iface_config_str(void *ctx, struct interface_config *config)
@@ -548,6 +559,9 @@ static int update_config(struct platform_powerpc *platform,
 	if (tmp)
 		talloc_free(tmp);
 
+	val = config->lang ?: "";
+	update_string_config(platform, "petitboot,language", val);
+
 	update_network_config(platform, config);
 
 	update_bootdev_config(platform, config);
@@ -679,12 +693,8 @@ static void parse_opal_sysparams(struct config *config)
 	if (!next_valid && !default_valid)
 		return;
 
-	if (next_valid) {
-		/* invalidate next-boot-device setting */
-		write_bootdev_sysparam("next-boot-device", 0xff);
-	} else {
+	if (!next_valid)
 		next_bootdev = default_bootdev;
-	}
 
 	switch (next_bootdev) {
 	case IPMI_BOOTDEV_NONE:
@@ -739,19 +749,29 @@ static int save_config(struct platform *p, struct config *config)
 	return rc;
 }
 
+static void finalise_config(struct platform *platform __attribute__((unused)))
+{
+	/* invalidate next-boot-device setting */
+	write_bootdev_sysparam("next-boot-device", 0xff);
+}
+
 static int get_sysinfo(struct platform *p, struct system_info *sysinfo)
 {
 	struct platform_powerpc *platform = p->platform_data;
+	char *buf, *filename;
 	int len, rc;
-	char *buf;
 
-	rc = read_file(platform, "/proc/device_tree/model", &buf, &len);
+	filename = talloc_asprintf(platform, "%smodel", devtree_dir);
+	rc = read_file(platform, filename, &buf, &len);
 	if (rc == 0)
 		sysinfo->type = talloc_steal(sysinfo, buf);
+	talloc_free(filename);
 
-	rc = read_file(platform, "/proc/device_tree/system-id", &buf, &len);
+	filename = talloc_asprintf(platform, "%ssystem-id", devtree_dir);
+	rc = read_file(platform, filename, &buf, &len);
 	if (rc == 0)
 		sysinfo->identifier = talloc_steal(sysinfo, buf);
+	talloc_free(filename);
 
 	return 0;
 }
@@ -779,12 +799,13 @@ static bool probe(struct platform *p, void *ctx)
 
 
 static struct platform platform_powerpc = {
-	.name		= "powerpc",
-	.dhcp_arch_id	= 0x000e,
-	.probe		= probe,
-	.load_config	= load_config,
-	.save_config	= save_config,
-	.get_sysinfo	= get_sysinfo,
+	.name			= "powerpc",
+	.dhcp_arch_id		= 0x000e,
+	.probe			= probe,
+	.load_config		= load_config,
+	.save_config		= save_config,
+	.finalise_config	= finalise_config,
+	.get_sysinfo		= get_sysinfo,
 };
 
 register_platform(platform_powerpc);