From b071326d6a40b4abb065d857b11e5958c76c52c2 Mon Sep 17 00:00:00 2001 From: Oliver O'Halloran Date: Wed, 8 Feb 2017 12:16:13 +1100 Subject: core/opal: check ibm,opal exists The ibm,opal node is normally created by Skiboot either in the HDAT parser or after the input FDT has been unflattened. However, in order to supply the /ibm,opal/power-mgt/enabled-stop-states property FDT we to tolerate /ibm,opal/ existing in the input tree. Signed-off-by: Oliver O'Halloran Acked-by: Michael Neuling Signed-off-by: Stewart Smith (cherry picked from commit eeba2d64fb7ac929283ed4611ca04209278eb777) Signed-off-by: Stewart Smith --- core/opal.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/opal.c b/core/opal.c index 14e78c0..9936dcc 100644 --- a/core/opal.c +++ b/core/opal.c @@ -161,11 +161,7 @@ void add_opal_node(void) size = (CPU_STACKS_BASE + (uint64_t)(cpu_max_pir + 1) * STACK_SIZE) - SKIBOOT_BASE; - if (!opal_node) { - opal_node = dt_new(dt_root, "ibm,opal"); - assert(opal_node); - } - + opal_node = dt_new_check(dt_root, "ibm,opal"); dt_add_property_cells(opal_node, "#address-cells", 0); dt_add_property_cells(opal_node, "#size-cells", 0); -- cgit v1.1