X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=642c93c1cdf453412959c415fa878bebdc17fad6;hb=e62af29111fe6a3085b0f659915fbee202d0a235;hp=2ce69e76f892ace0f6b06bae728edb20d362f25f;hpb=6897abaa97a02e0ab8ac07209a5e4966bfe101c5;p=petitboot

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 2ce69e7..642c93c 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,7 @@ static const char *known_params[] = {
 	"petitboot,network",
 	"petitboot,timeout",
 	"petitboot,bootdev",
+	"petitboot,debug?",
 	NULL,
 };
 
@@ -424,6 +426,11 @@ static void populate_config(struct platform_powerpc *platform,
 	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)
@@ -742,16 +749,20 @@ static int save_config(struct platform *p, struct config *config)
 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;
 }