diff options
| author | Oliver O'Halloran <oohall@gmail.com> | 2017-02-08 12:16:13 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-01-05 10:54:52 +1100 |
| commit | b071326d6a40b4abb065d857b11e5958c76c52c2 (patch) | |
| tree | efe7cbd0ee684feedf59136eb02914694f7cb3ce | |
| parent | 0562c4862d178caede13e27e6eb554ec4ae44888 (diff) | |
| download | skiboot-b071326d6a40b4abb065d857b11e5958c76c52c2.zip skiboot-b071326d6a40b4abb065d857b11e5958c76c52c2.tar.gz skiboot-b071326d6a40b4abb065d857b11e5958c76c52c2.tar.bz2 | |
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 <oohall@gmail.com>
Acked-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
(cherry picked from commit eeba2d64fb7ac929283ed4611ca04209278eb777)
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -rw-r--r-- | core/opal.c | 6 |
1 files changed, 1 insertions, 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); |