len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-10-13 16:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dtc: Add support for binary includes.

Browse source 
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>
This commit is contained in:
David Gibson 2008-06-11 11:58:39 +10:00 • committed by Jon Loeliger
parent 050e6f0cff
commit e37ec7d588
8 changed files with 145 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

75
tests/incbin.c Normal file
View file

@ -0,0 +1,75 @@
/*
* libfdt - Flat Device Tree manipulation
* Testcase for string escapes in dtc
* Copyright (C) 2006 David Gibson, IBM Corporation.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include <errno.h>
#include <fdt.h>
#include <libfdt.h>
#include "tests.h"
#include "testdata.h"
#define CHUNKSIZE 1024
void *load_file(const char *name, int *len)
{
FILE *f;
void *buf = NULL;
int bufsize = 0, n;
*len = 0;
f = fopen(name, "r");
if (!f)
FAIL("Couldn't open \"%s\": %s", name, strerror(errno));
while (!feof(f)) {
if (bufsize < (*len + CHUNKSIZE)) {
buf = xrealloc(buf, *len + CHUNKSIZE);
bufsize = *len + CHUNKSIZE;
}
n = fread(buf + *len, 1, CHUNKSIZE, f);
if (ferror(f))
FAIL("Error reading \"%s\": %s", name, strerror(errno));
*len += n;
}
return buf;
}
int main(int argc, char *argv[])
{
void *fdt, *incbin;
int len;
test_init(argc, argv);
incbin = load_file("incbin.bin", &len);
fdt = load_blob_arg(argc, argv);
check_getprop(fdt, 0, "incbin", len, incbin);
check_getprop(fdt, 0, "incbin-partial", 17, incbin + 13);
PASS();
}