[Skiboot] [PATCH stable 04/14] Revive hdata_to_dt and make it work again

[Stewart Smith]

commit 27b49826e5f1d9c0008c0a5bf0953dd673a9b9e1 upstream

Some functions were stubbed out which meant we hit assert rather
than dumping out the device tree

Signed-off-by: Stewart Smith <stewart at linux.vnet.ibm.com>
---
 hdata/test/hdata_to_dt.c |  3 +++
 hdata/test/stubs.c       | 18 ------------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/hdata/test/hdata_to_dt.c b/hdata/test/hdata_to_dt.c
index 9e5abf8f0070..bdc9060123b4 100644
--- a/hdata/test/hdata_to_dt.c
+++ b/hdata/test/hdata_to_dt.c
@@ -27,6 +27,9 @@
 
 #include <valgrind/memcheck.h>
 
+#include "../../libfdt/fdt.c"
+#include "../../libfdt/fdt_ro.c"
+
 struct dt_node *opal_node;
 
 /* Our actual map. */
diff --git a/hdata/test/stubs.c b/hdata/test/stubs.c
index e6932bed7137..e72b6839b1e2 100644
--- a/hdata/test/stubs.c
+++ b/hdata/test/stubs.c
@@ -43,25 +43,7 @@ static void stub_function(void)
 #define STUB(fnname) \
 	void fnname(void) __attribute__((weak, alias ("stub_function")))
 
-STUB(fdt_begin_node);
-STUB(fdt_property);
-STUB(fdt_end_node);
-STUB(fdt_create);
-STUB(fdt_add_reservemap_entry);
-STUB(fdt_finish_reservemap);
-STUB(fdt_strerror);
-STUB(fdt_check_header);
-STUB(_fdt_check_node_offset);
-STUB(fdt_next_tag);
-STUB(fdt_string);
-STUB(fdt_get_name);
-STUB(dt_first);
-STUB(dt_next);
-STUB(dt_has_node_property);
-STUB(dt_get_address);
 STUB(op_display);
 STUB(fsp_preload_lid);
 STUB(fsp_wait_lid_loaded);
-STUB(get_ics_phandle);
-STUB(get_psi_interrupt);
 STUB(fsp_adjust_lid_side);
-- 
2.1.4