diff mbox series

[v6,5/5] hdata: Add a generic compatible to ibm, secureboot

Message ID 20191105042011.7357-6-erichte@linux.ibm.com
State Accepted
Headers show
Series Add Secure Variable Support | expand


Context Check Description
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco success Signed-off-by present
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot success Test snowpatch/job/snowpatch-skiboot on branch master
snowpatch_ozlabs/apply_patch success Successfully applied on branch master (d75e82dbfbb9443efeb3f9a5921ac23605aab469)

Commit Message

Eric Richter Nov. 5, 2019, 4:20 a.m. UTC
From: Oliver O'Halloran <oohall@gmail.com>

Add a way to locate the secureboot node without needing to hardcode a
specific version string. The ibm,secureboot node has historically only
been used by firmware.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Eric Richter <erichte@linux.ibm.com>
 hdata/spira.c            | 3 ++-
 hdata/test/op920.wsp.dts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
diff mbox series


diff --git a/hdata/spira.c b/hdata/spira.c
index 5e73b7d4..8b4e3cb0 100644
--- a/hdata/spira.c
+++ b/hdata/spira.c
@@ -908,7 +908,8 @@  static void dt_init_secureboot_node(const struct iplparams_sysparams *sysparams)
 	node = dt_new(dt_root, "ibm,secureboot");
-	dt_add_property_string(node, "compatible", "ibm,secureboot-v2");
+	dt_add_property_strings(node, "compatible",
+				"ibm,secureboot", "ibm,secureboot-v2");
 	sys_sec_setting = be16_to_cpu(sysparams->sys_sec_setting);
 	if (sys_sec_setting & SEC_CONTAINER_SIG_CHECKING)
diff --git a/hdata/test/op920.wsp.dts b/hdata/test/op920.wsp.dts
index 0a42e2e4..057021f4 100644
--- a/hdata/test/op920.wsp.dts
+++ b/hdata/test/op920.wsp.dts
@@ -3170,7 +3170,7 @@ 
 	ibm,secureboot {
 		phandle = <0xb3>;
-		compatible = "ibm,secureboot-v2";
+		compatible = "ibm,secureboot", "ibm,secureboot-v2";
 		hw-key-hash = <0x40d487ff 0x7380ed6a 0xd54775d5 0x795fea0d 0xe2f541fe 0xa9db06b8 0x466a42a3 0x20e65f75 0xb4866546 0x17d907 0x515dc2a5 0xf9fc5095 0x4d6ee0c9 0xb67d219d 0xfb708535 0x1d01d6d1>;
 		hw-key-hash-size = <0x40>;