mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-31 02:15:45 +01:00 
			
		
		
		
	This adds the following commits from upstream:
aadd0b65c987 checks: centralize printing of property names in failure messages
88960e398907 checks: centralize printing of node path in check_msg
f1879e1a50eb Add limited read-only support for older (V2 and V3) device tree to libfdt.
37dea76e9700 srcpos: drop special handling of tab
65893da4aee0 libfdt: overlay: Add missing license
962a45ca034d Avoid installing pylibfdt when dependencies are missing
cd6ea1b2bea6 Makefile: Split INSTALL out into INSTALL_{PROGRAM,LIB,DATA,SCRIPT}
51b3a16338df Makefile.tests: Add LIBDL make(1) variable for portability sake
333d533a8f4d Attempt to auto-detect stat(1) being used if not given proper invocation
e54388015af1 dtc: Bump version to v1.4.6
a1fe86f380cb fdtoverlay: Switch from using alloca to malloc
c8d5472de3ff tests: Improve compatibility with other platforms
c81d389a10cc checks: add chosen node checks
e671852042a7 checks: add aliases node checks
d0c44ebe3f42 checks: check for #{size,address}-cells without child nodes
18a3d84bb802 checks: add string list check for *-names properties
8fe94fd6f19f checks: add string list check
6c5730819604 checks: add a string check for 'label' property
a384191eba09 checks: fix sound-dai phandle with arg property check
b260c4f610c0 Fix ambiguous grammar for devicetree rule
fe667e382bac tests: Add some basic tests for the pci_bridge checks
7975f6422260 Fix widespread incorrect use of strneq(), replace with new strprefixeq()
fca296445eab Add strstarts() helper function
cc392f089007 tests: Check non-matching cases for fdt_node_check_compatible()
bba26a5291c8 livetree: avoid assertion of orphan phandles with overlays
c8f8194d76cc implement strnlen for systems that need it
c8b38f65fdec libfdt: Remove leading underscores from identifiers
3b62fdaebfe5 Remove leading underscores from identifiers
2d45d1c5c65e Replace FDT_VERSION() with stringify()
2e6fe5a107b5 Fix some errors in comments
b0ae9e4b0ceb tests: Correct warning in sw_tree1.c
Commit c8b38f65fdec upstream ("libfdt: Remove leading underscores from
identifiers") changed the multiple inclusion define protection, so the
kernel's libfdt_env.h needs the corresponding update.
Signed-off-by: Rob Herring <robh@kernel.org>
[ Linux commit: 9130ba884640328bb78aaa4840e5ddf06ccafb1c ]
[erosca: - Fixup conflicts in include/linux/libfdt_env.h caused by v2018.03-rc4
           commit b08c8c4870 ("libfdt: move headers to <linux/libfdt.h>
	   and <linux/libfdt_env.h>")
	 - Fix build errors in lib/libfdt/fdt_ro.c, tools/libfdt/fdt_rw.c by:
	   - s/_fdt_mem_rsv/fdt_mem_rsv_/
	   - s/_fdt_offset_ptr/fdt_offset_ptr_/
	   - s/_fdt_check_node_offset/fdt_check_node_offset_/
	   - s/_fdt_check_prop_offset/fdt_check_prop_offset_/
	   - s/_fdt_find_add_string/fdt_find_add_string_/]
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
		
	
		
			
				
	
	
		
			140 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			140 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * libfdt - Flat Device Tree manipulation
 | |
|  * Copyright (C) 2006 David Gibson, IBM Corporation.
 | |
|  *
 | |
|  * libfdt is dual licensed: you can use it either under the terms of
 | |
|  * the GPL, or the BSD license, at your option.
 | |
|  *
 | |
|  *  a) This library 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 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 General Public License for more details.
 | |
|  *
 | |
|  *     You should have received a copy of the GNU 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
 | |
|  *
 | |
|  * Alternatively,
 | |
|  *
 | |
|  *  b) Redistribution and use in source and binary forms, with or
 | |
|  *     without modification, are permitted provided that the following
 | |
|  *     conditions are met:
 | |
|  *
 | |
|  *     1. Redistributions of source code must retain the above
 | |
|  *        copyright notice, this list of conditions and the following
 | |
|  *        disclaimer.
 | |
|  *     2. Redistributions in binary form must reproduce the above
 | |
|  *        copyright notice, this list of conditions and the following
 | |
|  *        disclaimer in the documentation and/or other materials
 | |
|  *        provided with the distribution.
 | |
|  *
 | |
|  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
 | |
|  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 | |
|  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 | |
|  *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 | |
|  *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
 | |
|  *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 | |
|  *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 | |
|  *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 | |
|  *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 | |
|  *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 | |
|  *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 | |
|  *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 | |
|  *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 | |
|  */
 | |
| #include "libfdt_env.h"
 | |
| 
 | |
| #include <fdt.h>
 | |
| #include <libfdt.h>
 | |
| 
 | |
| #include "libfdt_internal.h"
 | |
| 
 | |
| int fdt_setprop_inplace_namelen_partial(void *fdt, int nodeoffset,
 | |
| 					const char *name, int namelen,
 | |
| 					uint32_t idx, const void *val,
 | |
| 					int len)
 | |
| {
 | |
| 	void *propval;
 | |
| 	int proplen;
 | |
| 
 | |
| 	propval = fdt_getprop_namelen_w(fdt, nodeoffset, name, namelen,
 | |
| 					&proplen);
 | |
| 	if (!propval)
 | |
| 		return proplen;
 | |
| 
 | |
| 	if (proplen < (len + idx))
 | |
| 		return -FDT_ERR_NOSPACE;
 | |
| 
 | |
| 	memcpy((char *)propval + idx, val, len);
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
 | |
| 			const void *val, int len)
 | |
| {
 | |
| 	const void *propval;
 | |
| 	int proplen;
 | |
| 
 | |
| 	propval = fdt_getprop(fdt, nodeoffset, name, &proplen);
 | |
| 	if (!propval)
 | |
| 		return proplen;
 | |
| 
 | |
| 	if (proplen != len)
 | |
| 		return -FDT_ERR_NOSPACE;
 | |
| 
 | |
| 	return fdt_setprop_inplace_namelen_partial(fdt, nodeoffset, name,
 | |
| 						   strlen(name), 0,
 | |
| 						   val, len);
 | |
| }
 | |
| 
 | |
| static void fdt_nop_region_(void *start, int len)
 | |
| {
 | |
| 	fdt32_t *p;
 | |
| 
 | |
| 	for (p = start; (char *)p < ((char *)start + len); p++)
 | |
| 		*p = cpu_to_fdt32(FDT_NOP);
 | |
| }
 | |
| 
 | |
| int fdt_nop_property(void *fdt, int nodeoffset, const char *name)
 | |
| {
 | |
| 	struct fdt_property *prop;
 | |
| 	int len;
 | |
| 
 | |
| 	prop = fdt_get_property_w(fdt, nodeoffset, name, &len);
 | |
| 	if (!prop)
 | |
| 		return len;
 | |
| 
 | |
| 	fdt_nop_region_(prop, len + sizeof(*prop));
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| int fdt_node_end_offset_(void *fdt, int offset)
 | |
| {
 | |
| 	int depth = 0;
 | |
| 
 | |
| 	while ((offset >= 0) && (depth >= 0))
 | |
| 		offset = fdt_next_node(fdt, offset, &depth);
 | |
| 
 | |
| 	return offset;
 | |
| }
 | |
| 
 | |
| int fdt_nop_node(void *fdt, int nodeoffset)
 | |
| {
 | |
| 	int endoffset;
 | |
| 
 | |
| 	endoffset = fdt_node_end_offset_(fdt, nodeoffset);
 | |
| 	if (endoffset < 0)
 | |
| 		return endoffset;
 | |
| 
 | |
| 	fdt_nop_region_(fdt_offset_ptr_w(fdt, nodeoffset, 0),
 | |
| 			endoffset - nodeoffset);
 | |
| 	return 0;
 | |
| }
 |