libfdt: Ensure INT_MAX is defined in libfdt_env.h
Subsystems (3)
Rob Herring
maintainerPATCH 1/3 libfdt: Ensure INT_MAX is defined in libfdt_env.h
The next update of libfdt has a new dependency on INT_MAX. Update the instances of libfdt_env.h in the kernel to either include the necessary header with the definition or define it locally.
--- arch/arm/boot/compressed/libfdt_env.h | 2 ++ arch/powerpc/boot/libfdt_env.h | 2 ++ include/linux/libfdt_env.h | 1 + 3 files changed, 5 insertions(+)
arch/arm/boot/compressed/libfdt_env.h +2 -0
@@ -6,6 +6,8 @@#include <linux/string.h> #include <asm/byteorder.h> +#define INT_MAX ((int)(~0U>>1)) +typedef __be16 fdt16_t ;typedef __be32 fdt32_t ;typedef __be64 fdt64_t ;
arch/powerpc/boot/libfdt_env.h +2 -0
@@ -5,6 +5,8 @@#include <types.h> #include <string.h> +#define INT_MAX ((int)(~0U>>1)) +#include "of.h" typedef unsigned long uintptr_t ;
include/linux/libfdt_env.h +1 -0
@@ -2,6 +2,7 @@#ifndef LIBFDT_ENV_H #define LIBFDT_ENV_H +#include <linux/kernel.h> /* For INT_MAX */ #include <linux/string.h> #include <asm/byteorder.h>
Signature · 1 line
2.17.1
Rob Herring
maintainerPATCH 2/3 scripts/dtc: Add yamltree.c to dtc sources
dtc has a new source file, yamltree.c, that needs to be copied when syncing dtc sources.
--- scripts/dtc/update-dtc-source.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/dtc/update-dtc-source.sh +1 -1
@@ -32,7 +32,7 @@ DTC_UPSTREAM_PATH=`pwd`/../dtc DTC_LINUX_PATH=`pwd`/scripts/dtc DTC_SOURCE="checks.c data.c dtc.c dtc.h flattree.c fstree.c livetree.c srcpos.c \ - srcpos.h treesource.c util.c util.h version_gen.h Makefile.dtc \ + srcpos.h treesource.c util.c util.h version_gen.h yamltree.c Makefile.dtc \ dtc-lexer.l dtc-parser.y" LIBFDT_SOURCE="Makefile.libfdt fdt.c fdt.h fdt_addresses.c fdt_empty_tree.c \ fdt_overlay.c fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c \
Signature · 1 line
2.17.1
Rob Herring
maintainerPATCH 3/3 scripts/dtc: Update to upstream version v1.4.7-14-gc86da84d30e4
In reply to Rob HerringMajor changes are I2C and SPI bus checks, YAML output format (for future validation), some new libfdt functions, and more libfdt validation of dtbs.
The YAML addition adds an optional dependency on libyaml. pkg-config is used to test for it and pkg-config became a kconfig dependency in 4.18.
This adds the following commits from upstream:
c86da84d30e4 Add support for YAML encoded output361b5e7d8067 Make type_marker_length helper publicbfbfab047e45 pylibfdt: Add a means to add and delete notes 9005f4108e7c pylibfdt: Allow delprop() to return errorsb94c056b137e Make valgrind optionalfd06c54d4711 tests: Better testing of dtc -I fs modec3f50c9a86d9 tests: Allow dtbs_equal_unordered to ignore mem reserves 0ac9fdee37c7 dtc: trivial '-I fs -O dts' test0fd1c8c783f3 pylibfdt: fdt_get_mem_rsv returns 2 uint64_t values 04853cad18f4 pylibfdt: Don't incorrectly / unnecessarily override uint64_t typemap 9619c8619c37 Kill bogus TYPE_BLOB marker typeac68ff92ae20 parser: add TYPE_STRING marker to path references 90a190eb04d9 checks: add SPI bus checks53a1bd546905 checks: add I2C bus checks88f18909db73 dtc: Bump version to v1.4.785bce8b2f06d tests: Correction to vg_prepare_blob()57f7f9e7bc7c tests: Don't call memcmp() with NULL arguments c12b2b0c20eb libfdt: fdt_address_cells() and fdt_size_cells() 3fe0eeda0b7f livetree: Set phandle properties type to uint32 853649acceba pylibfdt: Support the sequential-write interface 9b0e4fe26093 tests: Improve fdt_resize() tests1087504bb3e8 libfdt: Add necessary header padding in fdt_create() c72fa777e613 libfdt: Copy the struct region in fdt_resize() 32b9c6130762 Preserve datatype markers when emitting dts format 6dcb8ba408ec libfdt: Add helpers for accessing unaligned words 42607f21d43e tests: Fix incorrect check name 'prop_name_chars' 9d78c33bf8a1 tests: fix grep for checks error messagesb770f3d1c13f pylibfdt: Support setting the name of a node 2f0d07e678e0 pylibfdt: Add functions to set and get properties as strings 354d3dc55939 pylibfdt: Update the bytearray size with pack() 3c374d46acce pylibfdt: Allow reading integer values from properties 49d32ce40bb4 pylibfdt: Use an unsigned type for fdt32_t481246a0c13a pylibfdt: Avoid accessing the internal _fdt member in tests 9aafa33d99ed pylibfdt: Add functions to update properties 5a598671fdbf pylibfdt: Support device-tree creation/expansion 483e170625e1 pylibfdt: Add support for reading the memory reserve map 29bb05aa4200 pylibfdt: Add support for the rest of the header functions 582a7159a5d0 pylibfdt: Add support for fdt_next_node()f0f8c9169819 pylibfdt: Reorder functions to match libfdt.h 64a69d123935 pylibfdt: Return string instead of bytearray from getprop() 4d09a83420df fdtput: Add documentatione617cbe1bd67 fdtget: Add documentation180a93924014 Use <inttypes.h> format specifiers in a bunch of places we should b9af3b396576 scripts/dtc: Fixed format mismatch in fprintf 4b8fcc3d015c libfdt: Add fdt_check_full() functionc14223fb2292 tests: Use valgrind client requests for better checking 5b67d2b955a3 tests: Better handling of valgrind errors saving blobs e2556aaeb506 tests: Remove unused #definefb9c6abddaa8 Use size_t for blob lengths in utilfdt_read* 0112fda03bf6 libfdt: Add fdt_header_size()6473a21d8bfe Consolidate utilfdt_read_len() variantsd5db5382c5e5 libfdt: Safer access to memory reservations719d582e98ec libfdt: Propagate name errors in fdt_getprop_by_offset() 70166d62a27f libfdt: Safer access to strings sectioneb890c0f77dc libfdt: Make fdt_check_header() more thorough 899d6fad93f3 libfdt: Improve sequential write state checking 04b5b4062ccd libfdt: Clean up header checking functions44d3efedc816 Preserve datatype information when parsing dts f0be81bd8de0 Make Property a subclass of bytearray24b1f3f064d4 pylibfdt: Add a method to access the device tree directly
---
As usual, this generated from a script copying from upstream dtc. The only part here that's not is dtc/Makefile.
scripts/dtc/Makefile | 7 + scripts/dtc/Makefile.dtc | 4 + scripts/dtc/checks.c | 143 ++++++++++++++++ scripts/dtc/data.c | 4 +- scripts/dtc/dtc-parser.y | 16 +- scripts/dtc/dtc.c | 11 ++ scripts/dtc/dtc.h | 13 ++ scripts/dtc/flattree.c | 2 +- scripts/dtc/libfdt/fdt.c | 81 ++++++++- scripts/dtc/libfdt/fdt_addresses.c | 35 ++-- scripts/dtc/libfdt/fdt_overlay.c | 6 +- scripts/dtc/libfdt/fdt_ro.c | 199 ++++++++++++++++++--- scripts/dtc/libfdt/fdt_rw.c | 28 +-- scripts/dtc/libfdt/fdt_sw.c | 109 +++++++++--- scripts/dtc/libfdt/libfdt.h | 76 ++++++++- scripts/dtc/libfdt/libfdt_env.h | 1 + scripts/dtc/libfdt/libfdt_internal.h | 5 +- scripts/dtc/livetree.c | 12 +- scripts/dtc/treesource.c | 225 ++++++++++++++---------- scripts/dtc/util.c | 23 +-- scripts/dtc/util.h | 20 +-- scripts/dtc/version_gen.h | 2 +- scripts/dtc/yamltree.c | 247 +++++++++++++++++++++++++++ 23 files changed, 1033 insertions(+), 236 deletions(-) create mode 100644 scripts/dtc/yamltree.c
scripts/dtc/Makefile +7 -0
@@ -11,6 +11,13 @@ dtc-objs += dtc-lexer.lex.o dtc-parser.tab.o # Source files need to get at the userspace version of libfdt_env.h to compile HOST_EXTRACFLAGS := -I$(src)/libfdt +ifeq ($(shell pkg-config --exists yaml-0.1; echo $$?),1) +HOST_EXTRACFLAGS += -DNO_YAML +else +dtc-objs += yamltree.o +HOSTLDLIBS_dtc := $(shell pkg-config --libs yaml-0.1) +endif + # Generated files need one more search path to include headers in source tree HOSTCFLAGS_dtc-lexer.lex.o := -I$(src) HOSTCFLAGS_dtc-parser.tab.o := -I$(src)
scripts/dtc/Makefile.dtc +4 -0
@@ -14,5 +14,9 @@ DTC_SRCS = \ treesource.c \ util.c +ifneq ($(NO_YAML),1) +DTC_SRCS += yamltree.c +endif + DTC_GEN_SRCS = dtc-lexer.lex.c dtc-parser.tab.c DTC_OBJS = $(DTC_SRCS:%.c=%.o) $(DTC_GEN_SRCS:%.c=%.o)
scripts/dtc/checks.c +143 -0
155 lines not on this page · raw message
scripts/dtc/data.c +3 -1
@@ -74,7 +74,8 @@ struct data data_copy_escape_string(const char *s, int len)struct data d;char *q; - d =data_grow_for (empty_data, len +1 ); + d =data_add_marker (empty_data,TYPE_STRING ,NULL ); + d =data_grow_for (d, len +1 ); q = d.val;while (i < len) {
@@ -94,6 +95,7 @@ struct data data_copy_file(FILE *f, size_t maxlen) {struct data d = empty_data; + d =data_add_marker (d,TYPE_NONE ,NULL );while (!feof (f) && (d.len < maxlen)) {size_t chunksize, ret;
scripts/dtc/dtc-parser.y +11 -5
@@ -287,6 +287,7 @@ propdata: } | propdataprefix DT_REF { + $1 = data_add_marker($1, TYPE_STRING, $2); $$ = data_add_marker($1, REF_PATH, $2); } | propdataprefix DT_INCBIN '(' DT_STRING ',' integer_prim ',' integer_prim ')'
@@ -340,22 +341,27 @@ arrayprefix: DT_BITS DT_LITERAL '<' { unsigned long long bits; + enum markertype type = TYPE_UINT32; bits = $2; - if ((bits != 8) && (bits != 16) && - (bits != 32) && (bits != 64)) { + switch (bits) { + case 8: type = TYPE_UINT8; break; + case 16: type = TYPE_UINT16; break; + case 32: type = TYPE_UINT32; break; + case 64: type = TYPE_UINT64; break; + default: ERROR(&@2, "Array elements must be" " 8, 16, 32 or 64-bits"); bits = 32; } - $$.data = empty_data; + $$.data = data_add_marker(empty_data, type, NULL); $$.bits = bits; } | '<' { - $$.data = empty_data; + $$.data = data_add_marker(empty_data, TYPE_UINT32, NULL); $$.bits = 32; } | arrayprefix integer_prim
@@ -499,7 +505,7 @@ integer_unary: bytestring: /* empty */ { - $$ = empty_data; + $$ = data_add_marker(empty_data, TYPE_UINT8, NULL); } | bytestring DT_BYTE {
scripts/dtc/dtc.c +11 -0
@@ -95,6 +95,9 @@ static const char * const usage_opts_help[] = { "\n\tOutput formats are:\n" "\t\tdts - device tree source text\n" "\t\tdtb - device tree blob\n" +#ifndef NO_YAML + "\t\tyaml - device tree encoded as YAML\n" +#endif"\t\tasm - assembler source" , "\n\tBlob version to produce, defaults to "stringify(DEFAULT_FDT_VERSION)" (for dtb and asm output)", "\n\tOutput dependency file",
@@ -128,6 +131,8 @@ static const char *guess_type_by_name(const char *fname, const char *fallback)return fallback;if (!strcasecmp (s,".dts" ))return "dts" ; +if (!strcasecmp (s,".yaml" )) +return "yaml" ;if (!strcasecmp (s,".dtb" ))return "dtb" ;return fallback;
@@ -350,6 +355,12 @@ int main(int argc, char *argv[])if (streq (outform,"dts" )) {dt_to_source (outf, dti); +#ifndef NO_YAML + }else if (streq (outform,"yaml" )) { +if (!streq (inform,"dts" )) +die ("YAML output format requires dts input format\n" ); +dt_to_yaml (outf, dti); +#endif }else if (streq (outform,"dtb" )) {dt_to_blob (outf, dti, outversion); }else if (streq (outform,"asm" )) {
scripts/dtc/dtc.h +13 -0
@@ -74,10 +74,17 @@ typedef uint32_t cell_t;/* Data blobs */ enum markertype { +TYPE_NONE ,REF_PHANDLE ,REF_PATH ,LABEL , +TYPE_UINT8 , +TYPE_UINT16 , +TYPE_UINT32 , +TYPE_UINT64 , +TYPE_STRING , }; +extern const char *markername (enum markertype markertype);struct marker {enum markertype type;
@@ -101,6 +108,8 @@ struct data { for_each_marker(m) \ if ((m)->type == (t)) +size_t type_marker_length(struct marker *m); + void data_free(struct data d); struct data data_grow_for(struct data d, int xlen);
@@ -290,6 +299,10 @@ struct dt_info *dt_from_blob(const char *fname);void dt_to_source (FILE *f,struct dt_info *dti);struct dt_info *dt_from_source (const char *f); +/* YAML source */ + +void dt_to_yaml (FILE *f,struct dt_info *dti); +/* FS trees */ struct dt_info *dt_from_fs (const char *dirname);
scripts/dtc/flattree.c +1 -1
@@ -393,7 +393,7 @@ void dt_to_blob(FILE *f, struct dt_info *dti, int version) padlen =0 ;if (quiet <1 )fprintf (stderr, -"Warning: blob size %d >= minimum size %d\n" , +"Warning: blob size %" PRIu32" >= minimum size %d\n" ,fdt32_to_cpu (fdt.totalsize), minsize); } }
scripts/dtc/libfdt/fdt.c +79 -2
99 lines not on this page · raw message
scripts/dtc/libfdt/fdt_addresses.c +13 -22
@@ -1,6 +1,7 @@/* * libfdt - Flat Device Tree manipulation * Copyright (C) 2014 David Gibson <[email protected]> +* Copyright (C) 2018 embedded brains GmbH * * libfdt is dual licensed: you can use it either under the terms of * the GPL, or the BSD license, at your option.
@@ -55,42 +56,32 @@#include "libfdt_internal.h" -int fdt_address_cells (const void *fdt,int nodeoffset) +static int fdt_cells (const void *fdt,int nodeoffset,const char *name) { -const fdt32_t *ac; +const fdt32_t *c;int val;int len; - ac =fdt_getprop (fdt, nodeoffset,"#address-cells" , &len); -if (!ac) + c =fdt_getprop (fdt, nodeoffset, name, &len); +if (!c)return 2 ; -if (len !=sizeof (*ac)) +if (len !=sizeof (*c))return -FDT_ERR_BADNCELLS ; - val =fdt32_to_cpu (*ac); + val =fdt32_to_cpu (*c);if ((val <=0 ) || (val >FDT_MAX_NCELLS ))return -FDT_ERR_BADNCELLS ;return val; } -int fdt_size_cells (const void *fdt,int nodeoffset) +int fdt_address_cells (const void *fdt,int nodeoffset) { -const fdt32_t *sc; -int val; -int len; - - sc =fdt_getprop (fdt, nodeoffset,"#size-cells" , &len); -if (!sc) -return 2 ; - -if (len !=sizeof (*sc)) -return -FDT_ERR_BADNCELLS ; - - val =fdt32_to_cpu (*sc); -if ((val <0 ) || (val >FDT_MAX_NCELLS )) -return -FDT_ERR_BADNCELLS ; +return fdt_cells (fdt, nodeoffset,"#address-cells" ); +} -return val; +int fdt_size_cells (const void *fdt,int nodeoffset) +{ +return fdt_cells (fdt, nodeoffset,"#size-cells" ); }
scripts/dtc/libfdt/fdt_overlay.c +3 -3
@@ -697,7 +697,7 @@ static int get_path_len(const void *fdt, int nodeoffset)int len =0 , namelen;const char *name; -FDT_CHECK_HEADER (fdt); +FDT_RO_PROBE (fdt);for (;;) { name =fdt_get_name (fdt, nodeoffset, &namelen);
@@ -866,8 +866,8 @@ int fdt_overlay_apply(void *fdt, void *fdto)uint32_t delta =fdt_get_max_phandle (fdt);int ret; -FDT_CHECK_HEADER (fdt); -FDT_CHECK_HEADER (fdto); +FDT_RO_PROBE (fdt); +FDT_RO_PROBE (fdto); ret =overlay_adjust_local_phandles (fdto, delta);if (ret)
scripts/dtc/libfdt/fdt_ro.c +174 -25
311 lines not on this page · raw message
scripts/dtc/libfdt/fdt_rw.c +14 -14
@@ -67,9 +67,9 @@ static int fdt_blocks_misordered_(const void *fdt, (fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt))); } -static int fdt_rw_check_header_ (void *fdt) +static int fdt_rw_probe_ (void *fdt) { -FDT_CHECK_HEADER (fdt); +FDT_RO_PROBE (fdt);if (fdt_version (fdt) <17 )return -FDT_ERR_BADVERSION ;
@@ -82,10 +82,10 @@ static int fdt_rw_check_header_(void *fdt)return 0 ; } -#define FDT_RW_CHECK_HEADER (fdt) \ +#define FDT_RW_PROBE (fdt) \ { \ int err_; \ - if ((err_ = fdt_rw_check_header_(fdt)) != 0) \ + if ((err_ = fdt_rw_probe_(fdt)) != 0) \ return err_; \ }
@@ -176,7 +176,7 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size)struct fdt_reserve_entry *re;int err; -FDT_RW_CHECK_HEADER (fdt); +FDT_RW_PROBE (fdt); re =fdt_mem_rsv_w_ (fdt,fdt_num_mem_rsv (fdt)); err =fdt_splice_mem_rsv_ (fdt, re,0 ,1 );
@@ -192,7 +192,7 @@ int fdt_del_mem_rsv(void *fdt, int n) {struct fdt_reserve_entry *re =fdt_mem_rsv_w_ (fdt, n); -FDT_RW_CHECK_HEADER (fdt); +FDT_RW_PROBE (fdt);if (n >=fdt_num_mem_rsv (fdt))return -FDT_ERR_NOTFOUND ;
@@ -252,7 +252,7 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name)int oldlen, newlen;int err; -FDT_RW_CHECK_HEADER (fdt); +FDT_RW_PROBE (fdt); namep = (char *)(uintptr_t )fdt_get_name (fdt, nodeoffset, &oldlen);if (!namep)
@@ -275,7 +275,7 @@ int fdt_setprop_placeholder(void *fdt, int nodeoffset, const char *name,struct fdt_property *prop;int err; -FDT_RW_CHECK_HEADER (fdt); +FDT_RW_PROBE (fdt); err =fdt_resize_property_ (fdt, nodeoffset, name, len, &prop);if (err == -FDT_ERR_NOTFOUND )
@@ -308,7 +308,7 @@ int fdt_appendprop(void *fdt, int nodeoffset, const char *name,struct fdt_property *prop;int err, oldlen, newlen; -FDT_RW_CHECK_HEADER (fdt); +FDT_RW_PROBE (fdt); prop =fdt_get_property_w (fdt, nodeoffset, name, &oldlen);if (prop) {
@@ -334,7 +334,7 @@ int fdt_delprop(void *fdt, int nodeoffset, const char *name)struct fdt_property *prop;int len, proplen; -FDT_RW_CHECK_HEADER (fdt); +FDT_RW_PROBE (fdt); prop =fdt_get_property_w (fdt, nodeoffset, name, &len);if (!prop)
@@ -354,7 +354,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,uint32_t tag;fdt32_t *endtag; -FDT_RW_CHECK_HEADER (fdt); +FDT_RW_PROBE (fdt); offset =fdt_subnode_offset_namelen (fdt, parentoffset, name, namelen);if (offset >=0 )
@@ -394,7 +394,7 @@ int fdt_del_node(void *fdt, int nodeoffset) {int endoffset; -FDT_RW_CHECK_HEADER (fdt); +FDT_RW_PROBE (fdt); endoffset =fdt_node_end_offset_ (fdt, nodeoffset);if (endoffset <0 )
@@ -435,7 +435,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)const char *fdtend = fdtstart +fdt_totalsize (fdt);char *tmp; -FDT_CHECK_HEADER (fdt); +FDT_RO_PROBE (fdt); mem_rsv_size = (fdt_num_mem_rsv (fdt)+1 ) *sizeof (struct fdt_reserve_entry );
@@ -494,7 +494,7 @@ int fdt_pack(void *fdt) {int mem_rsv_size; -FDT_RW_CHECK_HEADER (fdt); +FDT_RW_PROBE (fdt); mem_rsv_size = (fdt_num_mem_rsv (fdt)+1 ) *sizeof (struct fdt_reserve_entry );
scripts/dtc/libfdt/fdt_sw.c +87 -22
193 lines not on this page · raw message
scripts/dtc/libfdt/libfdt.h +67 -9
136 lines not on this page · raw message
scripts/dtc/libfdt/libfdt_env.h +1 -0
@@ -56,6 +56,7 @@#include <stdint.h> #include <stdlib.h> #include <string.h> +#include <limits.h> #ifdef __CHECKER__#define FDT_FORCE __attribute__((force))
scripts/dtc/libfdt/libfdt_internal.h +3 -2
@@ -55,10 +55,11 @@#define FDT_ALIGN (x, a) (((x) + (a) - 1) & ~((a) - 1))#define FDT_TAGALIGN (x) (FDT_ALIGN((x), FDT_TAGSIZE)) -#define FDT_CHECK_HEADER (fdt) \ +int fdt_ro_probe_ (const void *fdt); +#define FDT_RO_PROBE (fdt) \ { \ int err_; \ - if ((err_ = fdt_check_header(fdt)) != 0) \ + if ((err_ = fdt_ro_probe_(fdt)) != 0) \ return err_; \ }
scripts/dtc/livetree.c +6 -6
@@ -594,6 +594,7 @@ struct node *get_node_by_ref(struct node *tree, const char *ref)cell_t get_node_phandle (struct node *root,struct node *node) {static cell_t phandle =1 ;/* FIXME: ick, static local */ +struct data d = empty_data;if ((node->phandle !=0 ) && (node->phandle !=-1 ))return node->phandle;
@@ -603,17 +604,16 @@ cell_t get_node_phandle(struct node *root, struct node *node) node->phandle = phandle; + d =data_add_marker (d,TYPE_UINT32 ,NULL ); + d =data_append_cell (d, phandle); +if (!get_property (node,"linux,phandle" ) && (phandle_format &PHANDLE_LEGACY )) -add_property (node, -build_property ("linux,phandle" , -data_append_cell (empty_data, phandle))); +add_property (node,build_property ("linux,phandle" , d));if (!get_property (node,"phandle" ) && (phandle_format &PHANDLE_EPAPR )) -add_property (node, -build_property ("phandle" , -data_append_cell (empty_data, phandle))); +add_property (node,build_property ("phandle" , d));/* If the node *does* have a phandle property, we must * be dealing with a self-referencing phandle, which will be
scripts/dtc/treesource.c +135 -90
282 lines not on this page · raw message
scripts/dtc/util.c +6 -17
@@ -227,11 +227,11 @@ char get_escape_char(const char *s, int *i)return val; } -int utilfdt_read_err_len (const char *filename,char **buffp,off_t *len) +int utilfdt_read_err (const char *filename,char **buffp,size_t *len) {int fd =0 ;/* assume stdin */ char *buf =NULL ; -off_t bufsize =1024 , offset =0 ; +size_t bufsize =1024 , offset =0 ;int ret =0 ; *buffp =NULL ;
@@ -264,20 +264,15 @@ int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len)free (buf); else *buffp = buf; - *len = bufsize; +if (len) + *len = bufsize;return ret; } -int utilfdt_read_err (const char *filename,char **buffp) -{ -off_t len; -return utilfdt_read_err_len (filename, buffp, &len); -} - -char *utilfdt_read_len (const char *filename,off_t *len) +char *utilfdt_read (const char *filename,size_t *len) {char *buff; -int ret =utilfdt_read_err_len (filename, &buff, len); +int ret =utilfdt_read_err (filename, &buff, len);if (ret) { fprintf(stderr, "Couldn't open blob from '%s': %s\n", filename,
@@ -288,12 +283,6 @@ char *utilfdt_read_len(const char *filename, off_t *len)return buff; } -char *utilfdt_read (const char *filename) -{ -off_t len; -return utilfdt_read_len (filename, &len); -} -int utilfdt_write_err (const char *filename,const void *blob) {int fd =1 ;/* assume stdout */
scripts/dtc/util.h +4 -16
@@ -98,16 +98,10 @@ char get_escape_char(const char *s, int *i);* stderr. * * @param filename The filename to read, or - for stdin -* @return Pointer to allocated buffer containing fdt, or NULL on error -*/ -char *utilfdt_read (const char *filename); - -/** -* Like utilfdt_read(), but also passes back the size of the file read. -* * @param len If non-NULL, the amount of data we managed to read +* @return Pointer to allocated buffer containing fdt, or NULL on error */ -char *utilfdt_read_len (const char *filename,off_t *len); +char *utilfdt_read (const char *filename,size_t *len);/** * Read a device tree file into a buffer. Does not report errors, but only
@@ -116,16 +110,10 @@ char *utilfdt_read_len(const char *filename, off_t *len);* * @param filename The filename to read, or - for stdin * @param buffp Returns pointer to buffer containing fdt -* @return 0 if ok, else an errno value representing the error -*/ -int utilfdt_read_err (const char *filename,char **buffp); - -/** -* Like utilfdt_read_err(), but also passes back the size of the file read. -* * @param len If non-NULL, the amount of data we managed to read +* @return 0 if ok, else an errno value representing the error */ -int utilfdt_read_err_len (const char *filename,char **buffp,off_t *len); +int utilfdt_read_err (const char *filename,char **buffp,size_t *len);/** * Write a device tree buffer to a file. This will report any errors on
scripts/dtc/version_gen.h +1 -1
@@ -1 +1 @@ -#define DTC_VERSION "DTC 1.4.6-g84e414b0" +#define DTC_VERSION "DTC 1.4.7-gc86da84d"
scripts/dtc/yamltree.c new file +247 -0
247 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH 3/3] scripts/dtc: Update to upstream version v1.4.7-14-gc86da84d30e4
Quoted 6 lines · Rob Herring
Major changes are I2C and SPI bus checks, YAML output format (for future validation), some new libfdt functions, and more libfdt validation of dtbs.
The YAML addition adds an optional dependency on libyaml. pkg-config is used to test for it and pkg-config became a kconfig dependency in 4.18.
For Ubuntu, the libyaml dependency is provided by the packages:
libyaml-0-2
libyaml-dev
-Frank
Quoted 5 lines
This adds the following commits from upstream:
c86da84d30e4Add support for YAML encoded output361b5e7d8067Maketype_marker_lengthhelper public
< snip >
Rob Herring
maintainerRe: [PATCH 3/3] scripts/dtc: Update to upstream version v1.4.7-14-gc86da84d30e4
Quoted 6 lines · Frank Rowand
Quoted 4 lines · Rob Herring
Major changes are I2C and SPI bus checks, YAML output format (for future validation), some new libfdt functions, and more libfdt validation of dtbs.
Quoted 7 lines
Quoted 2 lines
The YAML addition adds an optional dependency on libyaml. pkg-config is used to test for it and pkg-config became a kconfig dependency in 4.18.
For Ubuntu, the libyaml dependency is provided by the packages:
libyaml-0-2 libyaml-dev
Yes, but as it is not yet required by anything in the kernel I don't think that needs to be documented yet. Also, offhand, I don't think we generally document in the kernel distro specifics like package names.
Rob
Re: [PATCH 3/3] scripts/dtc: Update to upstream version v1.4.7-14-gc86da84d30e4
Quoted 12 lines · Rob Herring
Quoted 11 lines · Frank Rowand
Quoted 6 lines · Rob Herring
Major changes are I2C and SPI bus checks, YAML output format (for future validation), some new libfdt functions, and more libfdt validation of dtbs.
The YAML addition adds an optional dependency on libyaml. pkg-config is used to test for it and pkg-config became a kconfig dependency in 4.18.
For Ubuntu, the libyaml dependency is provided by the packages:
Quoted 9 lines
Quoted 2 lines
libyaml-0-2 libyaml-devYes, but as it is not yet required by anything in the kernel I don't think that needs to be documented yet. Also, offhand, I don't think we generally document in the kernel distro specifics like package names.
Rob
Agreed. I was providing information that might save other people a bit of research. It is sufficiently visible in the email thread and does not need to be in the commit message.