From f9eb53d278cfded3d5da7789223ea0f64644717a Mon Sep 17 00:00:00 2001 From: Oliver O'Halloran Date: Mon, 4 Nov 2019 22:20:11 -0600 Subject: hdata: Add a generic compatible to ibm,secureboot 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: Eric Richter [oliver: removed extra whitespace] Signed-off-by: Oliver O'Halloran --- hdata/spira.c | 3 ++- hdata/test/op920.wsp.dts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hdata/spira.c b/hdata/spira.c index 5e73b7d..8b4e3cb 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"); assert(node); - 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 0a42e2e..057021f 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"; trusted-enabled; hw-key-hash = <0x40d487ff 0x7380ed6a 0xd54775d5 0x795fea0d 0xe2f541fe 0xa9db06b8 0x466a42a3 0x20e65f75 0xb4866546 0x17d907 0x515dc2a5 0xf9fc5095 0x4d6ee0c9 0xb67d219d 0xfb708535 0x1d01d6d1>; hw-key-hash-size = <0x40>; -- cgit v1.1