mirror of
				https://github.com/torvalds/linux.git
				synced 2025-10-31 16:48:26 +02:00 
			
		
		
		
	 6f05afcbb0
			
		
	
	
		6f05afcbb0
		
	
	
	
	
		
			
			Sync to upstream dtc commit 0931cea3ba20 ("dtc: fdtdump: check fdt if
not in scanning mode"). In particular, this pulls in dtc overlay
support.
This adds the following commits from upstream:
f88865469b65 dtc: Fix memory leak in character literal parsing
00fbb8696b66 Rename boot_info
1ef86ad2c24f dtc: Clean up /dts-v1/ and /plugin/ handling in grammar
e3c769aa9c16 dtc: Don't always generate __symbols__ for plugins
c96cb3c0169e tests: Don't use -@ on plugin de/recompile tests
66381538ce24 tests: Remove "suppression of fixups" tests
ba765b273f0f tests: Clarify dtc overlay tests
6ea8cd944fcd tests: More thorough tests of libfdt overlay application without dtc
7d8ef6e1db97 tests: Correct fdt handling of overlays without fixups and base trees without symbols
b4dc0ed8b127 tests: Fix double expansion bugs in test code
3ea879dc0c8f tests: Split overlay tests into those with do/don't exercise dtc plugin generation
47b4d66a2f11 tests: Test auto-alias generation on base tree, not overlay
72e1ad811523 tests: Make overlay/plugin tests unconditional
e7b3c3b5951b tests: Add overlay tests
9637e3f772a9 tests: Add check_path test
20f29d8d41f6 dtc: Plugin and fixup support
a2c92cac53f8 dtc: Document the dynamic plugin internals
8f70ac39801d checks: Pass boot_info instead of root node
ea10f953878f libfdt: add missing errors to fdt_strerror()
daa75e8fa594 libfdt: fix fdt_stringlist_search()
e28eff5b787a libfdt: fix fdt_stringlist_count()
ae97c7722840 tests: overlay: Rename the device tree blobs to be more explicit
96162d2bd9cb tests: overlay: Add test suffix to the compiled blobs
5ce8634733b7 libfdt: Add fdt_overlay_apply to the exported symbols
804a9db90ad2 fdt: strerr: Remove spurious BADOVERLAY
e8c3a1a493fa tests: overlay: Move back the bad fixup tests
7a72d89d3f81 libfdt: overlay: Fix symbols and fixups nodes condition
cabbaa972cdd libfdt: overlay: Report a bad overlay for mismatching local fixups
deb0a5c1aeaa libfdt: Add BADPHANDLE error string
7b7a6be9ba15 libfdt: Don't use 'index' as a local variable name
aea8860d831e tests: Add tests cases for the overlay code
0cdd06c5135b libfdt: Add overlay application function
39240cc865cf libfdt: Extend the reach of FDT_ERR_BADPHANDLE
4aa3a6f5e6d9 libfdt: Add new errors for the overlay code
6d1832c9e64b dtc: Remove "home page" link
45fd440a9561 Fix some typing errors in libfdt.h and livetree.c
a59be4939c13 Merge tag 'v1.4.2'
a34bb721caca dtc: Fix assorted problems in the testcases for the -a option
874f40588d3e Implement the -a option to pad dtb aligned
ec02b34c05be dtc: Makefile improvements for release uploading
1ed45d40a137 dtc: Bump version to 1.4.2
36fd7331fb11 libfdt: simplify fdt_del_mem_rsv()
d877364e4a0f libfdt: Add fdt_setprop_inplace_namelen_partial
3e9037aaad44 libfdt: Add fdt_getprop_namelen_w
84e0e1346c68 libfdt: Add max phandle retrieval function
d29126c90acb libfdt: Add iterator over properties
902d0f0953d0 libfdt: Add a subnodes iterator macro
c539075ba8ba fdtput.c: Fix memory leak.
f79ddb83e185 fdtget.c: Fix memory leak
1074ee54b63f convert-dtsv0-lexer.l: fix memory leak
e24d39a024e6 fdtdump.c: make sure size_t argument to memchr is always unsigned.
44a59713cf05 Remove unused srcpos_dump() function
cb9241ae3453 DTC: Fix memory leak on flatname.
1ee0ae24ea09 Simplify check field and macro names
9d97527a8621 Remove property check functions
2e709d158e11 Remove tree check functions
c4cb12e193e3 Alter grammar to allow multiple /dts-v1/ tags
d71d25d76012 Use xasprintf() in srcpos
9dc404958e9c util: Add xasprintf portable asprintf variant
beef80b8b55f Correct a missing space in a fdt_header cast
68d43cec1253 Correct line lengths in libfdt.h
b0dbceafd49a Correct space-after-tab in libfdt.h
Signed-off-by: Rob Herring <robh@kernel.org>
		
	
			
		
			
				
	
	
		
			253 lines
		
	
	
	
		
			7.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			253 lines
		
	
	
	
		
			7.5 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
 | |
|  */
 | |
| 
 | |
| #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 | |
| 
 | |
| static inline void __attribute__((noreturn)) 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=%d)\n", len);
 | |
| 
 | |
| 	return new;
 | |
| }
 | |
| 
 | |
| extern char *xstrdup(const char *s);
 | |
| extern int 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 util_version(void) __attribute__((noreturn));
 | |
| 
 | |
| /**
 | |
|  * 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 util_usage(const char *errmsg, const char *synopsis,
 | |
| 		const char *short_opts, struct option const long_opts[],
 | |
| 		const char * const opts_help[]) __attribute__((noreturn));
 | |
| 
 | |
| /**
 | |
|  * 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 */
 |