Date: Sat, 26 Oct 2019 17:10:27 +0000 (UTC) From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354115 - head/usr.bin/dtc Message-ID: <201910261710.x9QHARnn039594@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: manu Date: Sat Oct 26 17:10:27 2019 New Revision: 354115 URL: https://svnweb.freebsd.org/changeset/base/354115 Log: dtc: Allow multiple dts-v1 tag Some dts are including dtsi that also contain a /dts-v1/ tag at the top. GNU DTC doesn't seems to have a problem with that so fix our dtc to behave the same. Reviewed by: kevans MFC after: 1 week Modified: head/usr.bin/dtc/fdt.cc Modified: head/usr.bin/dtc/fdt.cc ============================================================================== --- head/usr.bin/dtc/fdt.cc Sat Oct 26 10:33:21 2019 (r354114) +++ head/usr.bin/dtc/fdt.cc Sat Oct 26 17:10:27 2019 (r354115) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910261710.x9QHARnn039594>