From owner-svn-src-head@FreeBSD.ORG Thu Sep 6 04:07:33 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 87F071065674 for ; Thu, 6 Sep 2012 04:07:33 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-ie0-f182.google.com (mail-ie0-f182.google.com [209.85.223.182]) by mx1.freebsd.org (Postfix) with ESMTP id CF43E8FC14 for ; Thu, 6 Sep 2012 04:07:32 +0000 (UTC) Received: by iebc12 with SMTP id c12so2962787ieb.13 for ; Wed, 05 Sep 2012 21:07:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer :x-gm-message-state; bh=HCO5VcmQTOCVHFp9iw5Prc335wyf8eCvBxnd38gnDDg=; b=BVIlhqfMUQFI4GpbV3nyG7Ws3kxjJPGrdW8al1nMA/PX2JZnfXiV1oHeaWEk3K0q6m xfseGiLuceYvnfzibZlLqwEM+ZoPiyUv7LevZPXMVnW+k1dvfYsr5yNORMn16JxreFiz nqlPvsRt3WnLqLoPYidD79WnRWIXAltiuqBVzNY8iVjvhsuz5dFMlg1flPOF7G+Riq6E R1az8kOud/OOtssZxClqc75lxxClI/Zp9aiT1b8/cmKyMZSYgX4xAynUs9H15dUFKFTm i874PbTpZ+JgXrGkZuI9gZ7l6P6LtddcHBqEJjPRd2o/F86Jy6r/ZDdcNK9Iu+ao3tRO g0Tg== Received: by 10.50.236.72 with SMTP id us8mr627716igc.70.1346904452017; Wed, 05 Sep 2012 21:07:32 -0700 (PDT) Received: from 63.imp.bsdimp.com (50-78-194-198-static.hfc.comcastbusiness.net. [50.78.194.198]) by mx.google.com with ESMTPS id a10sm2496592igd.1.2012.09.05.21.07.30 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Sep 2012 21:07:30 -0700 (PDT) Sender: Warner Losh Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: Warner Losh In-Reply-To: <20120902232204.4de5f3a3.ray@ddteam.net> Date: Wed, 5 Sep 2012 22:07:29 -0600 Content-Transfer-Encoding: quoted-printable Message-Id: <1BB2880C-88BA-4918-8C65-6F5E8B0C3058@bsdimp.com> References: <201209020148.q821ml0M018010@svn.freebsd.org> <20120902232204.4de5f3a3.ray@ddteam.net> To: Aleksandr Rybalko X-Mailer: Apple Mail (2.1084) X-Gm-Message-State: ALoCoQkGl4Rkvux+9T9wTYbhfmbzGZMfTmJ5xzAA8zuT9bwZwjLjXupC7c03jmt6S7h+J7vzWbs8 Cc: Andrew Turner , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r239998 - head/contrib/dtc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Sep 2012 04:07:33 -0000 On Sep 2, 2012, at 2:22 PM, Aleksandr Rybalko wrote: > On Sun, 2 Sep 2012 01:48:47 +0000 (UTC) > Andrew Turner wrote: >=20 >> Author: andrew >> Date: Sun Sep 2 01:48:47 2012 >> New Revision: 239998 >> URL: http://svn.freebsd.org/changeset/base/239998 >>=20 >> Log: >> Fix a logic inversion in an assert to allow us to use dts files that >> include other files. >=20 > Big Thanks for that!!! >=20 > It's hard to add overlapping support also? So second instance of same > node will be able to change attributes of previous one, such a = "status". > Or add new attributes, like GPIO lines usage. >=20 > Then we will be able to have per-SoC dts and per-board. =20 Should already be fixed. This is the latest dtc from upstream. Warner >>=20 >> Modified: >> head/contrib/dtc/dtc-lexer.l >>=20 >> Modified: head/contrib/dtc/dtc-lexer.l >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/contrib/dtc/dtc-lexer.l Sat Sep 1 23:33:49 >> 2012 (r239997) +++ head/contrib/dtc/dtc-lexer.l Sun >> Sep 2 01:48:47 2012 (r239998) @@ -198,7 +198,7 @@ static void >> push_input_file(const char * { >> assert(filename); >>=20 >> - assert(include_stack_pointer >=3D MAX_INCLUDE_NESTING); >> + assert(include_stack_pointer < MAX_INCLUDE_NESTING); >>=20 >> srcfile_push(filename); >>=20 >=20 > Thanks. >=20 > WBW > --=20 > Aleksandr Rybalko