Author: kevans
Date: Fri Feb 14 18:50:03 2020
New Revision: 357924
URL: https://svnweb.freebsd.org/changeset/base/357924
Log:
dtc: re-apply r353961, r354115
I missed in final review of r357923's diff that these ones hadn't yet been
sent upstream and inadvertently reverted them. =-( Re-apply now.
Modified:
head/usr.bin/dtc/dtb.cc
head/usr.bin/dtc/fdt.cc
Modified: head/usr.bin/dtc/dtb.cc
==============================================================================
--- head/usr.bin/dtc/dtb.cc Fri Feb 14 18:46:34 2020 (r357923)
+++ head/usr.bin/dtc/dtb.cc Fri Feb 14 18:50:03 2020 (r357924)
@@ -36,6 +36,7 @@
#include <sys/types.h>
#include <inttypes.h>
#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
Modified: head/usr.bin/dtc/fdt.cc
==============================================================================
--- head/usr.bin/dtc/fdt.cc Fri Feb 14 18:46:34 2020 (r357923)
+++ head/usr.bin/dtc/fdt.cc Fri Feb 14 18:50:03 2020 (r357924)
@@ -1563,11 +1563,11 @@ device_tree::parse_file(text_input_buffer &input,
{
input.next_token();
// Read the header
- if (input.consume("/dts-v1/;"))
+ while (input.consume("/dts-v1/;"))
{
read_header = true;
+ input.next_token();
}
- input.next_token();
if (input.consume("/plugin/;"))
{
is_plugin = true;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
