From: Jeremy Kerr Date: Thu, 7 Aug 2014 11:16:21 +0000 (+1000) Subject: discover/platform-powerpc: Fix incorrect device tree directory X-Git-Tag: v1.0.0~121 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=061f07717d5e46f33fce481420298f5a6d5561f2;ds=sidebyside discover/platform-powerpc: Fix incorrect device tree directory It's /proc/device-tree, not /proc/device_tree. Use a variable to hold this prefix. Signed-off-by: Jeremy Kerr --- diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c index 98dc045..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; @@ -748,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; }