mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-10-22 16:48:14 +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 b08c8c487083 ("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>
		
	
			
		
			
				
	
	
		
			267 lines
		
	
	
		
			7.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			267 lines
		
	
	
		
			7.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef UTIL_H
 | |
| #define UTIL_H
 | |
| 
 | |
| #include <stdarg.h>
 | |
| #include <stdbool.h>
 | |
| #include <getopt.h>
 | |
| 
 | |
| /*
 | |
|  * Copyright 2011 The Chromium Authors, All Rights Reserved.
 | |
|  * Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc.
 | |
|  *
 | |
|  * 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.
 | |
|  *
 | |
|  *  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
 | |
|  */
 | |
| 
 | |
| #ifdef __GNUC__
 | |
| #define PRINTF(i, j)	__attribute__((format (printf, i, j)))
 | |
| #define NORETURN	__attribute__((noreturn))
 | |
| #else
 | |
| #define PRINTF(i, j)
 | |
| #define NORETURN
 | |
| #endif
 | |
| 
 | |
| #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 | |
| 
 | |
| #define stringify(s)	stringify_(s)
 | |
| #define stringify_(s)	#s
 | |
| 
 | |
| static inline void NORETURN PRINTF(1, 2) die(const char *str, ...)
 | |
| {
 | |
| 	va_list ap;
 | |
| 
 | |
| 	va_start(ap, str);
 | |
| 	fprintf(stderr, "FATAL ERROR: ");
 | |
| 	vfprintf(stderr, str, ap);
 | |
| 	va_end(ap);
 | |
| 	exit(1);
 | |
| }
 | |
| 
 | |
| static inline void *xmalloc(size_t len)
 | |
| {
 | |
| 	void *new = malloc(len);
 | |
| 
 | |
| 	if (!new)
 | |
| 		die("malloc() failed\n");
 | |
| 
 | |
| 	return new;
 | |
| }
 | |
| 
 | |
| static inline void *xrealloc(void *p, size_t len)
 | |
| {
 | |
| 	void *new = realloc(p, len);
 | |
| 
 | |
| 	if (!new)
 | |
| 		die("realloc() failed (len=%zd)\n", len);
 | |
| 
 | |
| 	return new;
 | |
| }
 | |
| 
 | |
| extern char *xstrdup(const char *s);
 | |
| 
 | |
| extern int PRINTF(2, 3) xasprintf(char **strp, const char *fmt, ...);
 | |
| extern char *join_path(const char *path, const char *name);
 | |
| 
 | |
| /**
 | |
|  * Check a property of a given length to see if it is all printable and
 | |
|  * has a valid terminator. The property can contain either a single string,
 | |
|  * or multiple strings each of non-zero length.
 | |
|  *
 | |
|  * @param data	The string to check
 | |
|  * @param len	The string length including terminator
 | |
|  * @return 1 if a valid printable string, 0 if not
 | |
|  */
 | |
| bool util_is_printable_string(const void *data, int len);
 | |
| 
 | |
| /*
 | |
|  * Parse an escaped character starting at index i in string s.  The resulting
 | |
|  * character will be returned and the index i will be updated to point at the
 | |
|  * character directly after the end of the encoding, this may be the '\0'
 | |
|  * terminator of the string.
 | |
|  */
 | |
| char get_escape_char(const char *s, int *i);
 | |
| 
 | |
| /**
 | |
|  * Read a device tree file into a buffer. This will report any errors on
 | |
|  * 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
 | |
|  */
 | |
| char *utilfdt_read_len(const char *filename, off_t *len);
 | |
| 
 | |
| /**
 | |
|  * Read a device tree file into a buffer. Does not report errors, but only
 | |
|  * returns them. The value returned can be passed to strerror() to obtain
 | |
|  * an error message for the user.
 | |
|  *
 | |
|  * @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
 | |
|  */
 | |
| int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len);
 | |
| 
 | |
| /**
 | |
|  * Write a device tree buffer to a file. This will report any errors on
 | |
|  * stderr.
 | |
|  *
 | |
|  * @param filename	The filename to write, or - for stdout
 | |
|  * @param blob		Poiner to buffer containing fdt
 | |
|  * @return 0 if ok, -1 on error
 | |
|  */
 | |
| int utilfdt_write(const char *filename, const void *blob);
 | |
| 
 | |
| /**
 | |
|  * Write a device tree buffer to a file. Does not report errors, but only
 | |
|  * returns them. The value returned can be passed to strerror() to obtain
 | |
|  * an error message for the user.
 | |
|  *
 | |
|  * @param filename	The filename to write, or - for stdout
 | |
|  * @param blob		Poiner to buffer containing fdt
 | |
|  * @return 0 if ok, else an errno value representing the error
 | |
|  */
 | |
| int utilfdt_write_err(const char *filename, const void *blob);
 | |
| 
 | |
| /**
 | |
|  * Decode a data type string. The purpose of this string
 | |
|  *
 | |
|  * The string consists of an optional character followed by the type:
 | |
|  *	Modifier characters:
 | |
|  *		hh or b	1 byte
 | |
|  *		h	2 byte
 | |
|  *		l	4 byte, default
 | |
|  *
 | |
|  *	Type character:
 | |
|  *		s	string
 | |
|  *		i	signed integer
 | |
|  *		u	unsigned integer
 | |
|  *		x	hex
 | |
|  *
 | |
|  * TODO: Implement ll modifier (8 bytes)
 | |
|  * TODO: Implement o type (octal)
 | |
|  *
 | |
|  * @param fmt		Format string to process
 | |
|  * @param type		Returns type found(s/d/u/x), or 0 if none
 | |
|  * @param size		Returns size found(1,2,4,8) or 4 if none
 | |
|  * @return 0 if ok, -1 on error (no type given, or other invalid format)
 | |
|  */
 | |
| int utilfdt_decode_type(const char *fmt, int *type, int *size);
 | |
| 
 | |
| /*
 | |
|  * This is a usage message fragment for the -t option. It is the format
 | |
|  * supported by utilfdt_decode_type.
 | |
|  */
 | |
| 
 | |
| #define USAGE_TYPE_MSG \
 | |
| 	"<type>\ts=string, i=int, u=unsigned, x=hex\n" \
 | |
| 	"\tOptional modifier prefix:\n" \
 | |
| 	"\t\thh or b=byte, h=2 byte, l=4 byte (default)";
 | |
| 
 | |
| /**
 | |
|  * Print property data in a readable format to stdout
 | |
|  *
 | |
|  * Properties that look like strings will be printed as strings. Otherwise
 | |
|  * the data will be displayed either as cells (if len is a multiple of 4
 | |
|  * bytes) or bytes.
 | |
|  *
 | |
|  * If len is 0 then this function does nothing.
 | |
|  *
 | |
|  * @param data	Pointers to property data
 | |
|  * @param len	Length of property data
 | |
|  */
 | |
| void utilfdt_print_data(const char *data, int len);
 | |
| 
 | |
| /**
 | |
|  * Show source version and exit
 | |
|  */
 | |
| void NORETURN util_version(void);
 | |
| 
 | |
| /**
 | |
|  * Show usage and exit
 | |
|  *
 | |
|  * This helps standardize the output of various utils.  You most likely want
 | |
|  * to use the usage() helper below rather than call this.
 | |
|  *
 | |
|  * @param errmsg	If non-NULL, an error message to display
 | |
|  * @param synopsis	The initial example usage text (and possible examples)
 | |
|  * @param short_opts	The string of short options
 | |
|  * @param long_opts	The structure of long options
 | |
|  * @param opts_help	An array of help strings (should align with long_opts)
 | |
|  */
 | |
| void NORETURN util_usage(const char *errmsg, const char *synopsis,
 | |
| 			 const char *short_opts,
 | |
| 			 struct option const long_opts[],
 | |
| 			 const char * const opts_help[]);
 | |
| 
 | |
| /**
 | |
|  * Show usage and exit
 | |
|  *
 | |
|  * If you name all your usage variables with usage_xxx, then you can call this
 | |
|  * help macro rather than expanding all arguments yourself.
 | |
|  *
 | |
|  * @param errmsg	If non-NULL, an error message to display
 | |
|  */
 | |
| #define usage(errmsg) \
 | |
| 	util_usage(errmsg, usage_synopsis, usage_short_opts, \
 | |
| 		   usage_long_opts, usage_opts_help)
 | |
| 
 | |
| /**
 | |
|  * Call getopt_long() with standard options
 | |
|  *
 | |
|  * Since all util code runs getopt in the same way, provide a helper.
 | |
|  */
 | |
| #define util_getopt_long() getopt_long(argc, argv, usage_short_opts, \
 | |
| 				       usage_long_opts, NULL)
 | |
| 
 | |
| /* Helper for aligning long_opts array */
 | |
| #define a_argument required_argument
 | |
| 
 | |
| /* Helper for usage_short_opts string constant */
 | |
| #define USAGE_COMMON_SHORT_OPTS "hV"
 | |
| 
 | |
| /* Helper for usage_long_opts option array */
 | |
| #define USAGE_COMMON_LONG_OPTS \
 | |
| 	{"help",      no_argument, NULL, 'h'}, \
 | |
| 	{"version",   no_argument, NULL, 'V'}, \
 | |
| 	{NULL,        no_argument, NULL, 0x0}
 | |
| 
 | |
| /* Helper for usage_opts_help array */
 | |
| #define USAGE_COMMON_OPTS_HELP \
 | |
| 	"Print this help and exit", \
 | |
| 	"Print version and exit", \
 | |
| 	NULL
 | |
| 
 | |
| /* Helper for getopt case statements */
 | |
| #define case_USAGE_COMMON_FLAGS \
 | |
| 	case 'h': usage(NULL); \
 | |
| 	case 'V': util_version(); \
 | |
| 	case '?': usage("unknown option");
 | |
| 
 | |
| #endif /* UTIL_H */
 |