Forgot to realign after emitting auto-generated "name" properties. Oops.

1 files changed, 2 insertions, 1 deletions

diff --git a/flattree.c b/flattree.c
index 9d84b19..408f8c6 100644
--- a/flattree.c
+++ b/flattree.c
@@ -277,6 +277,7 @@ static void flatten_tree(struct node *tree, struct emitter *emit,
 			emit->align(etarget, 8);
 
 		emit->string(etarget, tree->name, tree->basenamelen);
+		emit->align(etarget, sizeof(cell_t));
 	}
 
 	for_each_child(tree, child) {
@@ -844,7 +845,7 @@ struct boot_info *dt_from_blob(FILE *f)
 	val = flat_read_word(&dtbuf);
 
 	if (val != OF_DT_BEGIN_NODE)
-		die("Device tree blob doesn't begin with OF_DT_BEGIN_NODE\n");
+		die("Device tree blob doesn't begin with OF_DT_BEGIN_NODE (begins with 0x%08x)\n", val);
 
 	tree = unflatten_tree(&dtbuf, &strbuf, "", flags);