From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Fri, 2 Mar 2018 04:20:29 +0000 (+1100)
Subject: utils/hooks: Set stdout-path property
X-Git-Tag: v1.7.1~6
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=526d4b3d959d3d108f38f35dae0855a29692a069;hp=e6407ab0ae617fe415ff8d1c1c2116d6931a6131

utils/hooks: Set stdout-path property

The linux,stdout-path property was deprecated in favour of stdout-path
in the v3.14 kernel. 'stdout-path' takes priority in newer kernels but
older kernels won't be aware of it, so set both at boot time.

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
---

diff --git a/utils/hooks/30-dtb-updates.c b/utils/hooks/30-dtb-updates.c
index f7de976..b8413fd 100644
--- a/utils/hooks/30-dtb-updates.c
+++ b/utils/hooks/30-dtb-updates.c
@@ -502,9 +502,8 @@ static int set_stdout(struct offb_ctx *ctx)
 {
 	const char *boot_console, *ptr;
 	long unsigned int termno;
-	const fdt32_t *prop;
-	int node, prop_len;
 	char *stdout_path;
+	int node;
 
 	boot_console = getenv("boot_console");
 	if (!boot_console) {
@@ -554,12 +553,12 @@ static int set_stdout(struct offb_ctx *ctx)
 		return -1;
 	}
 
-	prop = fdt_getprop(ctx->dtb, node, "linux,stdout-path", &prop_len);
-	if (!prop) {
-		fprintf(stderr, "Failed to find linux,stdout-path\n");
-		return -1;
-	}
-
+	/*
+	 * linux,stdout-path is deprecated after v3.14 but we don't know
+	 * what the next kernel will be, so set both.
+	 */
+	fdt_set_check(ctx->dtb, node, fdt_setprop_string, "stdout-path",
+			stdout_path);
 	fdt_set_check(ctx->dtb, node, fdt_setprop_string, "linux,stdout-path",
 			stdout_path);