summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dtc.c3
-rw-r--r--dtc.h1
-rw-r--r--livetree.c1
-rw-r--r--treesource.c6
4 files changed, 4 insertions, 7 deletions
diff --git a/dtc.c b/dtc.c
index c641491..6d67c9a 100644
--- a/dtc.c
+++ b/dtc.c
@@ -201,9 +201,6 @@ int main(int argc, char *argv[])
if (inf && inf->file != stdin)
fclose(inf->file);
- if (! bi || ! bi->dt || bi->error)
- die("Couldn't read input tree\n");
-
fill_fullpaths(bi->dt, "");
process_checks(force, bi);
diff --git a/dtc.h b/dtc.h
index d5be1a5..d757242 100644
--- a/dtc.h
+++ b/dtc.h
@@ -232,7 +232,6 @@ struct reserve_info *add_reserve_entry(struct reserve_info *list,
struct boot_info {
struct reserve_info *reservelist;
struct node *dt; /* the device tree */
- int error;
};
struct boot_info *build_boot_info(struct reserve_info *reservelist,
diff --git a/livetree.c b/livetree.c
index 7610e78..6ba0846 100644
--- a/livetree.c
+++ b/livetree.c
@@ -172,7 +172,6 @@ struct boot_info *build_boot_info(struct reserve_info *reservelist,
bi = xmalloc(sizeof(*bi));
bi->reservelist = reservelist;
bi->dt = tree;
- bi->error = 0;
return bi;
}
diff --git a/treesource.c b/treesource.c
index 3c24e7f..468d6b1 100644
--- a/treesource.c
+++ b/treesource.c
@@ -36,9 +36,11 @@ struct boot_info *dt_from_source(const char *fname)
yyin = srcpos_file->file;
if (yyparse() != 0)
- return NULL;
+ die("Unable to parse input tree\n");
+
+ if (treesource_error)
+ die("Syntax error parsing input tree\n");
- the_boot_info->error = treesource_error;
return the_boot_info;
}