2005-06-08 09:18:34 +02:00
|
|
|
/*
|
|
|
|
* (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation. 2005.
|
|
|
|
*
|
2007-09-18 03:44:04 +02:00
|
|
|
*
|
2005-06-08 09:18:34 +02:00
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License as
|
|
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
|
|
* License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
2007-09-18 03:44:04 +02:00
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
|
|
* USA
|
2005-06-08 09:18:34 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
%{
|
dtc: Add support for binary includes.
On Wed, Jun 04, 2008 at 09:26:23AM -0500, Jon Loeliger wrote:
> David Gibson wrote:
>
>> But as I said that can be dealt with in the future without breaking
>> compatibility. Objection withdrawn.
>>
>
> And on that note, I officially implore Scott to
> re-submit his binary include patch!
Scott's original patch does still have some implementation details I
didn't like. So in the interests of saving time, I've addressed some
of those, added a testcase, and and now resubmitting my revised
version of Scott's patch.
dtc: Add support for binary includes.
A property's data can be populated with a file's contents
as follows:
node {
prop = /incbin/("path/to/data");
};
A subset of a file can be included by passing start and size parameters.
For example, to include bytes 8 through 23:
node {
prop = /incbin/("path/to/data", 8, 16);
};
As with /include/, non-absolute paths are looked for in the directory
of the source file that includes them.
Implementation revised, and a testcase added by David Gibson
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Scott Wood <scottwood@freescale.com>
2008-06-11 03:58:39 +02:00
|
|
|
#include <stdio.h>
|
|
|
|
|
2005-06-08 09:18:34 +02:00
|
|
|
#include "dtc.h"
|
2007-03-23 21:18:41 +01:00
|
|
|
#include "srcpos.h"
|
2005-06-08 09:18:34 +02:00
|
|
|
|
2010-01-29 17:31:51 +01:00
|
|
|
YYLTYPE yylloc;
|
|
|
|
|
2008-03-05 01:47:54 +01:00
|
|
|
extern int yylex(void);
|
2010-10-20 23:44:58 +02:00
|
|
|
extern void print_error(char const *fmt, ...);
|
2008-09-12 20:39:49 +02:00
|
|
|
extern void yyerror(char const *s);
|
2005-06-08 09:18:34 +02:00
|
|
|
|
2005-07-15 09:14:24 +02:00
|
|
|
extern struct boot_info *the_boot_info;
|
2008-01-04 00:43:33 +01:00
|
|
|
extern int treesource_error;
|
2005-06-08 09:18:34 +02:00
|
|
|
|
2008-03-05 01:47:54 +01:00
|
|
|
static unsigned long long eval_literal(const char *s, int base, int bits);
|
2005-06-08 09:18:34 +02:00
|
|
|
%}
|
|
|
|
|
|
|
|
%union {
|
2007-11-07 01:16:19 +01:00
|
|
|
char *propnodename;
|
|
|
|
char *literal;
|
|
|
|
char *labelref;
|
2007-02-15 17:59:27 +01:00
|
|
|
unsigned int cbase;
|
2008-06-25 05:53:07 +02:00
|
|
|
uint8_t byte;
|
2005-06-08 09:18:34 +02:00
|
|
|
struct data data;
|
2007-11-07 01:16:19 +01:00
|
|
|
|
2008-06-25 05:53:07 +02:00
|
|
|
uint64_t addr;
|
2007-11-07 01:16:19 +01:00
|
|
|
cell_t cell;
|
2005-06-08 09:18:34 +02:00
|
|
|
struct property *prop;
|
|
|
|
struct property *proplist;
|
|
|
|
struct node *node;
|
|
|
|
struct node *nodelist;
|
2005-10-24 10:18:38 +02:00
|
|
|
struct reserve_info *re;
|
2005-06-08 09:18:34 +02:00
|
|
|
}
|
|
|
|
|
2007-11-07 01:17:17 +01:00
|
|
|
%token DT_V1
|
2005-07-15 09:14:24 +02:00
|
|
|
%token DT_MEMRESERVE
|
2007-11-07 01:16:19 +01:00
|
|
|
%token <propnodename> DT_PROPNODENAME
|
|
|
|
%token <literal> DT_LITERAL
|
2007-02-15 17:59:27 +01:00
|
|
|
%token <cbase> DT_BASE
|
2005-06-08 09:18:34 +02:00
|
|
|
%token <byte> DT_BYTE
|
|
|
|
%token <data> DT_STRING
|
2007-11-07 01:16:19 +01:00
|
|
|
%token <labelref> DT_LABEL
|
|
|
|
%token <labelref> DT_REF
|
dtc: Add support for binary includes.
On Wed, Jun 04, 2008 at 09:26:23AM -0500, Jon Loeliger wrote:
> David Gibson wrote:
>
>> But as I said that can be dealt with in the future without breaking
>> compatibility. Objection withdrawn.
>>
>
> And on that note, I officially implore Scott to
> re-submit his binary include patch!
Scott's original patch does still have some implementation details I
didn't like. So in the interests of saving time, I've addressed some
of those, added a testcase, and and now resubmitting my revised
version of Scott's patch.
dtc: Add support for binary includes.
A property's data can be populated with a file's contents
as follows:
node {
prop = /incbin/("path/to/data");
};
A subset of a file can be included by passing start and size parameters.
For example, to include bytes 8 through 23:
node {
prop = /incbin/("path/to/data", 8, 16);
};
As with /include/, non-absolute paths are looked for in the directory
of the source file that includes them.
Implementation revised, and a testcase added by David Gibson
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Scott Wood <scottwood@freescale.com>
2008-06-11 03:58:39 +02:00
|
|
|
%token DT_INCBIN
|
2005-06-08 09:18:34 +02:00
|
|
|
|
|
|
|
%type <data> propdata
|
2007-02-07 06:37:50 +01:00
|
|
|
%type <data> propdataprefix
|
2005-07-15 09:14:24 +02:00
|
|
|
%type <re> memreserve
|
2005-10-24 10:18:38 +02:00
|
|
|
%type <re> memreserves
|
2007-11-07 01:16:19 +01:00
|
|
|
%type <addr> addr
|
2005-06-08 09:18:34 +02:00
|
|
|
%type <data> celllist
|
2007-11-07 01:16:19 +01:00
|
|
|
%type <cell> cellval
|
2005-06-08 09:18:34 +02:00
|
|
|
%type <data> bytestring
|
|
|
|
%type <prop> propdef
|
|
|
|
%type <proplist> proplist
|
|
|
|
|
2005-07-15 09:14:24 +02:00
|
|
|
%type <node> devicetree
|
2005-06-08 09:18:34 +02:00
|
|
|
%type <node> nodedef
|
|
|
|
%type <node> subnode
|
|
|
|
%type <nodelist> subnodes
|
2005-06-16 06:36:37 +02:00
|
|
|
|
2005-06-08 09:18:34 +02:00
|
|
|
%%
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
sourcefile:
|
2010-09-21 00:33:34 +02:00
|
|
|
DT_V1 ';' memreserves devicetree
|
2007-11-07 01:17:17 +01:00
|
|
|
{
|
2010-02-19 05:50:50 +01:00
|
|
|
the_boot_info = build_boot_info($3, $4,
|
|
|
|
guess_boot_cpuid($4));
|
2007-11-07 01:17:17 +01:00
|
|
|
}
|
2005-07-15 09:14:24 +02:00
|
|
|
;
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
memreserves:
|
2007-10-23 16:28:54 +02:00
|
|
|
/* empty */
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2007-10-23 16:28:54 +02:00
|
|
|
$$ = NULL;
|
2005-07-15 09:14:24 +02:00
|
|
|
}
|
2007-10-23 16:28:54 +02:00
|
|
|
| memreserve memreserves
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2007-10-23 16:28:54 +02:00
|
|
|
$$ = chain_reserve_entry($1, $2);
|
2005-07-15 09:14:24 +02:00
|
|
|
}
|
|
|
|
;
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
memreserve:
|
2010-02-24 08:22:17 +01:00
|
|
|
DT_MEMRESERVE addr addr ';'
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2010-02-24 08:22:17 +01:00
|
|
|
$$ = build_reserve_entry($2, $3);
|
|
|
|
}
|
|
|
|
| DT_LABEL memreserve
|
|
|
|
{
|
|
|
|
add_label(&$2->labels, $1);
|
|
|
|
$$ = $2;
|
2005-07-15 09:14:24 +02:00
|
|
|
}
|
2007-11-07 01:17:17 +01:00
|
|
|
;
|
|
|
|
|
2007-11-07 01:16:19 +01:00
|
|
|
addr:
|
|
|
|
DT_LITERAL
|
2007-11-07 01:17:17 +01:00
|
|
|
{
|
|
|
|
$$ = eval_literal($1, 0, 64);
|
|
|
|
}
|
2007-11-07 01:16:19 +01:00
|
|
|
;
|
|
|
|
|
2010-09-21 00:33:34 +02:00
|
|
|
devicetree:
|
|
|
|
'/' nodedef
|
2010-02-25 17:58:29 +01:00
|
|
|
{
|
2010-09-21 00:33:34 +02:00
|
|
|
$$ = name_node($2, "");
|
2010-02-25 17:58:29 +01:00
|
|
|
}
|
2010-09-21 00:33:34 +02:00
|
|
|
| devicetree '/' nodedef
|
2010-02-25 17:58:29 +01:00
|
|
|
{
|
2010-09-21 00:33:34 +02:00
|
|
|
$$ = merge_nodes($1, $3);
|
2010-02-25 17:58:29 +01:00
|
|
|
}
|
2010-09-21 00:33:34 +02:00
|
|
|
| devicetree DT_REF nodedef
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2010-11-02 23:55:04 +01:00
|
|
|
struct node *target = get_node_by_ref($1, $2);
|
2010-09-21 00:33:34 +02:00
|
|
|
|
|
|
|
if (target)
|
|
|
|
merge_nodes(target, $3);
|
|
|
|
else
|
2010-11-02 23:55:04 +01:00
|
|
|
print_error("label or path, '%s', not found", $2);
|
2010-09-21 00:33:34 +02:00
|
|
|
$$ = $1;
|
2005-07-15 09:14:24 +02:00
|
|
|
}
|
2005-06-08 09:18:34 +02:00
|
|
|
;
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
nodedef:
|
|
|
|
'{' proplist subnodes '}' ';'
|
|
|
|
{
|
2005-06-08 09:18:34 +02:00
|
|
|
$$ = build_node($2, $3);
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
proplist:
|
2007-10-23 16:28:54 +02:00
|
|
|
/* empty */
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2007-10-23 16:28:54 +02:00
|
|
|
$$ = NULL;
|
2005-06-08 09:18:34 +02:00
|
|
|
}
|
2007-10-22 23:09:56 +02:00
|
|
|
| proplist propdef
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2007-10-22 23:09:56 +02:00
|
|
|
$$ = chain_property($2, $1);
|
2005-06-08 09:18:34 +02:00
|
|
|
}
|
|
|
|
;
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
propdef:
|
2010-02-24 08:22:17 +01:00
|
|
|
DT_PROPNODENAME '=' propdata ';'
|
|
|
|
{
|
|
|
|
$$ = build_property($1, $3);
|
|
|
|
}
|
|
|
|
| DT_PROPNODENAME ';'
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2010-02-24 08:22:17 +01:00
|
|
|
$$ = build_property($1, empty_data);
|
2005-06-08 09:18:34 +02:00
|
|
|
}
|
2010-02-24 08:22:17 +01:00
|
|
|
| DT_LABEL propdef
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2010-02-24 08:22:17 +01:00
|
|
|
add_label(&$2->labels, $1);
|
|
|
|
$$ = $2;
|
2005-06-08 09:18:34 +02:00
|
|
|
}
|
|
|
|
;
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
propdata:
|
|
|
|
propdataprefix DT_STRING
|
|
|
|
{
|
|
|
|
$$ = data_merge($1, $2);
|
|
|
|
}
|
|
|
|
| propdataprefix '<' celllist '>'
|
|
|
|
{
|
2007-11-02 06:54:26 +01:00
|
|
|
$$ = data_merge($1, $3);
|
2007-10-18 16:42:16 +02:00
|
|
|
}
|
|
|
|
| propdataprefix '[' bytestring ']'
|
|
|
|
{
|
|
|
|
$$ = data_merge($1, $3);
|
|
|
|
}
|
2007-12-05 00:43:50 +01:00
|
|
|
| propdataprefix DT_REF
|
|
|
|
{
|
|
|
|
$$ = data_add_marker($1, REF_PATH, $2);
|
|
|
|
}
|
dtc: Add support for binary includes.
On Wed, Jun 04, 2008 at 09:26:23AM -0500, Jon Loeliger wrote:
> David Gibson wrote:
>
>> But as I said that can be dealt with in the future without breaking
>> compatibility. Objection withdrawn.
>>
>
> And on that note, I officially implore Scott to
> re-submit his binary include patch!
Scott's original patch does still have some implementation details I
didn't like. So in the interests of saving time, I've addressed some
of those, added a testcase, and and now resubmitting my revised
version of Scott's patch.
dtc: Add support for binary includes.
A property's data can be populated with a file's contents
as follows:
node {
prop = /incbin/("path/to/data");
};
A subset of a file can be included by passing start and size parameters.
For example, to include bytes 8 through 23:
node {
prop = /incbin/("path/to/data", 8, 16);
};
As with /include/, non-absolute paths are looked for in the directory
of the source file that includes them.
Implementation revised, and a testcase added by David Gibson
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Scott Wood <scottwood@freescale.com>
2008-06-11 03:58:39 +02:00
|
|
|
| propdataprefix DT_INCBIN '(' DT_STRING ',' addr ',' addr ')'
|
|
|
|
{
|
2009-12-08 04:24:42 +01:00
|
|
|
FILE *f = srcfile_relative_open($4.val, NULL);
|
|
|
|
struct data d;
|
dtc: Add support for binary includes.
On Wed, Jun 04, 2008 at 09:26:23AM -0500, Jon Loeliger wrote:
> David Gibson wrote:
>
>> But as I said that can be dealt with in the future without breaking
>> compatibility. Objection withdrawn.
>>
>
> And on that note, I officially implore Scott to
> re-submit his binary include patch!
Scott's original patch does still have some implementation details I
didn't like. So in the interests of saving time, I've addressed some
of those, added a testcase, and and now resubmitting my revised
version of Scott's patch.
dtc: Add support for binary includes.
A property's data can be populated with a file's contents
as follows:
node {
prop = /incbin/("path/to/data");
};
A subset of a file can be included by passing start and size parameters.
For example, to include bytes 8 through 23:
node {
prop = /incbin/("path/to/data", 8, 16);
};
As with /include/, non-absolute paths are looked for in the directory
of the source file that includes them.
Implementation revised, and a testcase added by David Gibson
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Scott Wood <scottwood@freescale.com>
2008-06-11 03:58:39 +02:00
|
|
|
|
|
|
|
if ($6 != 0)
|
2009-12-08 04:24:42 +01:00
|
|
|
if (fseek(f, $6, SEEK_SET) != 0)
|
2010-10-20 23:44:58 +02:00
|
|
|
print_error("Couldn't seek to offset %llu in \"%s\": %s",
|
2008-09-12 20:39:49 +02:00
|
|
|
(unsigned long long)$6,
|
|
|
|
$4.val,
|
|
|
|
strerror(errno));
|
dtc: Add support for binary includes.
On Wed, Jun 04, 2008 at 09:26:23AM -0500, Jon Loeliger wrote:
> David Gibson wrote:
>
>> But as I said that can be dealt with in the future without breaking
>> compatibility. Objection withdrawn.
>>
>
> And on that note, I officially implore Scott to
> re-submit his binary include patch!
Scott's original patch does still have some implementation details I
didn't like. So in the interests of saving time, I've addressed some
of those, added a testcase, and and now resubmitting my revised
version of Scott's patch.
dtc: Add support for binary includes.
A property's data can be populated with a file's contents
as follows:
node {
prop = /incbin/("path/to/data");
};
A subset of a file can be included by passing start and size parameters.
For example, to include bytes 8 through 23:
node {
prop = /incbin/("path/to/data", 8, 16);
};
As with /include/, non-absolute paths are looked for in the directory
of the source file that includes them.
Implementation revised, and a testcase added by David Gibson
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Scott Wood <scottwood@freescale.com>
2008-06-11 03:58:39 +02:00
|
|
|
|
2009-12-08 04:24:42 +01:00
|
|
|
d = data_copy_file(f, $8);
|
dtc: Add support for binary includes.
On Wed, Jun 04, 2008 at 09:26:23AM -0500, Jon Loeliger wrote:
> David Gibson wrote:
>
>> But as I said that can be dealt with in the future without breaking
>> compatibility. Objection withdrawn.
>>
>
> And on that note, I officially implore Scott to
> re-submit his binary include patch!
Scott's original patch does still have some implementation details I
didn't like. So in the interests of saving time, I've addressed some
of those, added a testcase, and and now resubmitting my revised
version of Scott's patch.
dtc: Add support for binary includes.
A property's data can be populated with a file's contents
as follows:
node {
prop = /incbin/("path/to/data");
};
A subset of a file can be included by passing start and size parameters.
For example, to include bytes 8 through 23:
node {
prop = /incbin/("path/to/data", 8, 16);
};
As with /include/, non-absolute paths are looked for in the directory
of the source file that includes them.
Implementation revised, and a testcase added by David Gibson
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Scott Wood <scottwood@freescale.com>
2008-06-11 03:58:39 +02:00
|
|
|
|
|
|
|
$$ = data_merge($1, d);
|
2009-12-08 04:24:42 +01:00
|
|
|
fclose(f);
|
dtc: Add support for binary includes.
On Wed, Jun 04, 2008 at 09:26:23AM -0500, Jon Loeliger wrote:
> David Gibson wrote:
>
>> But as I said that can be dealt with in the future without breaking
>> compatibility. Objection withdrawn.
>>
>
> And on that note, I officially implore Scott to
> re-submit his binary include patch!
Scott's original patch does still have some implementation details I
didn't like. So in the interests of saving time, I've addressed some
of those, added a testcase, and and now resubmitting my revised
version of Scott's patch.
dtc: Add support for binary includes.
A property's data can be populated with a file's contents
as follows:
node {
prop = /incbin/("path/to/data");
};
A subset of a file can be included by passing start and size parameters.
For example, to include bytes 8 through 23:
node {
prop = /incbin/("path/to/data", 8, 16);
};
As with /include/, non-absolute paths are looked for in the directory
of the source file that includes them.
Implementation revised, and a testcase added by David Gibson
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Scott Wood <scottwood@freescale.com>
2008-06-11 03:58:39 +02:00
|
|
|
}
|
|
|
|
| propdataprefix DT_INCBIN '(' DT_STRING ')'
|
|
|
|
{
|
2009-12-08 04:24:42 +01:00
|
|
|
FILE *f = srcfile_relative_open($4.val, NULL);
|
dtc: Add support for binary includes.
On Wed, Jun 04, 2008 at 09:26:23AM -0500, Jon Loeliger wrote:
> David Gibson wrote:
>
>> But as I said that can be dealt with in the future without breaking
>> compatibility. Objection withdrawn.
>>
>
> And on that note, I officially implore Scott to
> re-submit his binary include patch!
Scott's original patch does still have some implementation details I
didn't like. So in the interests of saving time, I've addressed some
of those, added a testcase, and and now resubmitting my revised
version of Scott's patch.
dtc: Add support for binary includes.
A property's data can be populated with a file's contents
as follows:
node {
prop = /incbin/("path/to/data");
};
A subset of a file can be included by passing start and size parameters.
For example, to include bytes 8 through 23:
node {
prop = /incbin/("path/to/data", 8, 16);
};
As with /include/, non-absolute paths are looked for in the directory
of the source file that includes them.
Implementation revised, and a testcase added by David Gibson
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Scott Wood <scottwood@freescale.com>
2008-06-11 03:58:39 +02:00
|
|
|
struct data d = empty_data;
|
|
|
|
|
2009-12-08 04:24:42 +01:00
|
|
|
d = data_copy_file(f, -1);
|
dtc: Add support for binary includes.
On Wed, Jun 04, 2008 at 09:26:23AM -0500, Jon Loeliger wrote:
> David Gibson wrote:
>
>> But as I said that can be dealt with in the future without breaking
>> compatibility. Objection withdrawn.
>>
>
> And on that note, I officially implore Scott to
> re-submit his binary include patch!
Scott's original patch does still have some implementation details I
didn't like. So in the interests of saving time, I've addressed some
of those, added a testcase, and and now resubmitting my revised
version of Scott's patch.
dtc: Add support for binary includes.
A property's data can be populated with a file's contents
as follows:
node {
prop = /incbin/("path/to/data");
};
A subset of a file can be included by passing start and size parameters.
For example, to include bytes 8 through 23:
node {
prop = /incbin/("path/to/data", 8, 16);
};
As with /include/, non-absolute paths are looked for in the directory
of the source file that includes them.
Implementation revised, and a testcase added by David Gibson
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Scott Wood <scottwood@freescale.com>
2008-06-11 03:58:39 +02:00
|
|
|
|
|
|
|
$$ = data_merge($1, d);
|
2009-12-08 04:24:42 +01:00
|
|
|
fclose(f);
|
dtc: Add support for binary includes.
On Wed, Jun 04, 2008 at 09:26:23AM -0500, Jon Loeliger wrote:
> David Gibson wrote:
>
>> But as I said that can be dealt with in the future without breaking
>> compatibility. Objection withdrawn.
>>
>
> And on that note, I officially implore Scott to
> re-submit his binary include patch!
Scott's original patch does still have some implementation details I
didn't like. So in the interests of saving time, I've addressed some
of those, added a testcase, and and now resubmitting my revised
version of Scott's patch.
dtc: Add support for binary includes.
A property's data can be populated with a file's contents
as follows:
node {
prop = /incbin/("path/to/data");
};
A subset of a file can be included by passing start and size parameters.
For example, to include bytes 8 through 23:
node {
prop = /incbin/("path/to/data", 8, 16);
};
As with /include/, non-absolute paths are looked for in the directory
of the source file that includes them.
Implementation revised, and a testcase added by David Gibson
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Scott Wood <scottwood@freescale.com>
2008-06-11 03:58:39 +02:00
|
|
|
}
|
2007-10-18 16:42:16 +02:00
|
|
|
| propdata DT_LABEL
|
|
|
|
{
|
2007-11-22 04:39:23 +01:00
|
|
|
$$ = data_add_marker($1, LABEL, $2);
|
2007-02-07 06:37:50 +01:00
|
|
|
}
|
|
|
|
;
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
propdataprefix:
|
2007-10-23 16:28:54 +02:00
|
|
|
/* empty */
|
|
|
|
{
|
|
|
|
$$ = empty_data;
|
|
|
|
}
|
|
|
|
| propdata ','
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
|
|
|
$$ = $1;
|
|
|
|
}
|
|
|
|
| propdataprefix DT_LABEL
|
|
|
|
{
|
2007-11-22 04:39:23 +01:00
|
|
|
$$ = data_add_marker($1, LABEL, $2);
|
2007-10-18 16:42:16 +02:00
|
|
|
}
|
2005-06-08 09:18:34 +02:00
|
|
|
;
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
celllist:
|
2007-10-23 16:28:54 +02:00
|
|
|
/* empty */
|
|
|
|
{
|
|
|
|
$$ = empty_data;
|
|
|
|
}
|
2007-11-07 01:16:19 +01:00
|
|
|
| celllist cellval
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2007-11-07 01:16:19 +01:00
|
|
|
$$ = data_append_cell($1, $2);
|
2007-02-15 17:59:27 +01:00
|
|
|
}
|
2007-10-18 16:42:16 +02:00
|
|
|
| celllist DT_REF
|
|
|
|
{
|
2007-11-22 04:39:23 +01:00
|
|
|
$$ = data_append_cell(data_add_marker($1, REF_PHANDLE,
|
|
|
|
$2), -1);
|
2005-06-16 09:04:00 +02:00
|
|
|
}
|
2007-10-18 16:42:16 +02:00
|
|
|
| celllist DT_LABEL
|
|
|
|
{
|
2007-11-22 04:39:23 +01:00
|
|
|
$$ = data_add_marker($1, LABEL, $2);
|
2007-10-18 16:42:16 +02:00
|
|
|
}
|
2005-06-08 09:18:34 +02:00
|
|
|
;
|
|
|
|
|
2007-11-07 01:16:19 +01:00
|
|
|
cellval:
|
2007-11-07 01:17:17 +01:00
|
|
|
DT_LITERAL
|
|
|
|
{
|
|
|
|
$$ = eval_literal($1, 0, 32);
|
|
|
|
}
|
2007-11-07 01:16:19 +01:00
|
|
|
;
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
bytestring:
|
2007-10-23 16:28:54 +02:00
|
|
|
/* empty */
|
|
|
|
{
|
|
|
|
$$ = empty_data;
|
|
|
|
}
|
|
|
|
| bytestring DT_BYTE
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
|
|
|
$$ = data_append_byte($1, $2);
|
|
|
|
}
|
|
|
|
| bytestring DT_LABEL
|
|
|
|
{
|
2007-11-22 04:39:23 +01:00
|
|
|
$$ = data_add_marker($1, LABEL, $2);
|
2007-10-18 16:42:16 +02:00
|
|
|
}
|
2005-06-08 09:18:34 +02:00
|
|
|
;
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
subnodes:
|
2007-10-23 16:28:54 +02:00
|
|
|
/* empty */
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2007-10-23 16:28:54 +02:00
|
|
|
$$ = NULL;
|
2005-06-08 09:18:34 +02:00
|
|
|
}
|
2010-02-24 08:22:17 +01:00
|
|
|
| subnode subnodes
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2007-10-23 16:28:54 +02:00
|
|
|
$$ = chain_node($1, $2);
|
2007-10-18 16:42:16 +02:00
|
|
|
}
|
2007-12-05 00:27:04 +01:00
|
|
|
| subnode propdef
|
|
|
|
{
|
2010-10-20 23:44:58 +02:00
|
|
|
print_error("syntax error: properties must precede subnodes");
|
2007-12-05 00:27:04 +01:00
|
|
|
YYERROR;
|
|
|
|
}
|
2005-06-08 09:18:34 +02:00
|
|
|
;
|
|
|
|
|
2007-10-18 16:42:16 +02:00
|
|
|
subnode:
|
2010-02-24 08:22:17 +01:00
|
|
|
DT_PROPNODENAME nodedef
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2010-02-24 08:22:17 +01:00
|
|
|
$$ = name_node($2, $1);
|
2007-10-18 16:42:16 +02:00
|
|
|
}
|
2010-02-24 08:22:17 +01:00
|
|
|
| DT_LABEL subnode
|
2007-10-18 16:42:16 +02:00
|
|
|
{
|
2010-02-24 08:22:17 +01:00
|
|
|
add_label(&$2->labels, $1);
|
|
|
|
$$ = $2;
|
2007-10-18 16:42:16 +02:00
|
|
|
}
|
2005-06-08 09:18:34 +02:00
|
|
|
;
|
|
|
|
|
|
|
|
%%
|
|
|
|
|
2010-10-20 23:44:58 +02:00
|
|
|
void print_error(char const *fmt, ...)
|
2005-06-08 09:18:34 +02:00
|
|
|
{
|
2010-10-20 23:44:58 +02:00
|
|
|
va_list va;
|
|
|
|
|
|
|
|
va_start(va, fmt);
|
|
|
|
srcpos_verror(&yylloc, fmt, va);
|
|
|
|
va_end(va);
|
|
|
|
|
2008-01-04 00:43:33 +01:00
|
|
|
treesource_error = 1;
|
2005-06-08 09:18:34 +02:00
|
|
|
}
|
2007-02-16 16:33:54 +01:00
|
|
|
|
2010-10-20 23:44:58 +02:00
|
|
|
void yyerror(char const *s) {
|
|
|
|
print_error("%s", s);
|
|
|
|
}
|
|
|
|
|
2008-03-05 01:47:54 +01:00
|
|
|
static unsigned long long eval_literal(const char *s, int base, int bits)
|
2007-02-16 16:33:54 +01:00
|
|
|
{
|
2007-11-07 01:16:19 +01:00
|
|
|
unsigned long long val;
|
2007-07-07 08:18:48 +02:00
|
|
|
char *e;
|
|
|
|
|
2007-11-07 01:16:19 +01:00
|
|
|
errno = 0;
|
|
|
|
val = strtoull(s, &e, base);
|
|
|
|
if (*e)
|
2010-10-20 23:44:58 +02:00
|
|
|
print_error("bad characters in literal");
|
2007-11-07 01:16:19 +01:00
|
|
|
else if ((errno == ERANGE)
|
|
|
|
|| ((bits < 64) && (val >= (1ULL << bits))))
|
2010-10-20 23:44:58 +02:00
|
|
|
print_error("literal out of range");
|
2007-11-07 01:16:19 +01:00
|
|
|
else if (errno != 0)
|
2010-10-20 23:44:58 +02:00
|
|
|
print_error("bad literal");
|
2007-11-07 01:16:19 +01:00
|
|
|
return val;
|
2007-02-16 16:33:54 +01:00
|
|
|
}
|