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

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 24cc521..7c34939 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -9,6 +9,7 @@
 #include <sys/fcntl.h>
 #include <sys/stat.h>
 
+#include <file/file.h>
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
@@ -18,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;
@@ -35,6 +37,8 @@ static const char *known_params[] = {
 	"petitboot,network",
 	"petitboot,timeout",
 	"petitboot,bootdev",
+	"petitboot,language",
+	"petitboot,debug?",
 	NULL,
 };
 
@@ -420,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)
@@ -547,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);
@@ -678,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:
@@ -738,6 +749,33 @@ 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;
+
+	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);
+
+	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;
+}
+
 static bool probe(struct platform *p, void *ctx)
 {
 	struct platform_powerpc *platform;
@@ -759,12 +797,15 @@ static bool probe(struct platform *p, void *ctx)
 	return true;
 }
 
+
 static struct platform platform_powerpc = {
-	.name		= "powerpc",
-	.dhcp_arch_id	= 0x000e,
-	.probe		= probe,
-	.load_config	= load_config,
-	.save_config	= save_config,
+	.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);