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>
		
	
			
		
			
				
	
	
		
			365 lines
		
	
	
		
			9.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			365 lines
		
	
	
		
			9.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 | |
|  *
 | |
|  *
 | |
|  * 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
 | |
|  */
 | |
| 
 | |
| #include <sys/stat.h>
 | |
| 
 | |
| #include "dtc.h"
 | |
| #include "srcpos.h"
 | |
| 
 | |
| /*
 | |
|  * Command line options
 | |
|  */
 | |
| int quiet;		/* Level of quietness */
 | |
| int reservenum;		/* Number of memory reservation slots */
 | |
| int minsize;		/* Minimum blob size */
 | |
| int padsize;		/* Additional padding to blob */
 | |
| int alignsize;		/* Additional padding to blob accroding to the alignsize */
 | |
| int phandle_format = PHANDLE_EPAPR;	/* Use linux,phandle or phandle properties */
 | |
| int generate_symbols;	/* enable symbols & fixup support */
 | |
| int generate_fixups;		/* suppress generation of fixups on symbol support */
 | |
| int auto_label_aliases;		/* auto generate labels -> aliases */
 | |
| 
 | |
| static int is_power_of_2(int x)
 | |
| {
 | |
| 	return (x > 0) && ((x & (x - 1)) == 0);
 | |
| }
 | |
| 
 | |
| static void fill_fullpaths(struct node *tree, const char *prefix)
 | |
| {
 | |
| 	struct node *child;
 | |
| 	const char *unit;
 | |
| 
 | |
| 	tree->fullpath = join_path(prefix, tree->name);
 | |
| 
 | |
| 	unit = strchr(tree->name, '@');
 | |
| 	if (unit)
 | |
| 		tree->basenamelen = unit - tree->name;
 | |
| 	else
 | |
| 		tree->basenamelen = strlen(tree->name);
 | |
| 
 | |
| 	for_each_child(tree, child)
 | |
| 		fill_fullpaths(child, tree->fullpath);
 | |
| }
 | |
| 
 | |
| /* Usage related data. */
 | |
| static const char usage_synopsis[] = "dtc [options] <input file>";
 | |
| static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@Ahv";
 | |
| static struct option const usage_long_opts[] = {
 | |
| 	{"quiet",            no_argument, NULL, 'q'},
 | |
| 	{"in-format",         a_argument, NULL, 'I'},
 | |
| 	{"out",               a_argument, NULL, 'o'},
 | |
| 	{"out-format",        a_argument, NULL, 'O'},
 | |
| 	{"out-version",       a_argument, NULL, 'V'},
 | |
| 	{"out-dependency",    a_argument, NULL, 'd'},
 | |
| 	{"reserve",           a_argument, NULL, 'R'},
 | |
| 	{"space",             a_argument, NULL, 'S'},
 | |
| 	{"pad",               a_argument, NULL, 'p'},
 | |
| 	{"align",             a_argument, NULL, 'a'},
 | |
| 	{"boot-cpu",          a_argument, NULL, 'b'},
 | |
| 	{"force",            no_argument, NULL, 'f'},
 | |
| 	{"include",           a_argument, NULL, 'i'},
 | |
| 	{"sort",             no_argument, NULL, 's'},
 | |
| 	{"phandle",           a_argument, NULL, 'H'},
 | |
| 	{"warning",           a_argument, NULL, 'W'},
 | |
| 	{"error",             a_argument, NULL, 'E'},
 | |
| 	{"symbols",	     no_argument, NULL, '@'},
 | |
| 	{"auto-alias",       no_argument, NULL, 'A'},
 | |
| 	{"help",             no_argument, NULL, 'h'},
 | |
| 	{"version",          no_argument, NULL, 'v'},
 | |
| 	{NULL,               no_argument, NULL, 0x0},
 | |
| };
 | |
| static const char * const usage_opts_help[] = {
 | |
| 	"\n\tQuiet: -q suppress warnings, -qq errors, -qqq all",
 | |
| 	"\n\tInput formats are:\n"
 | |
| 	 "\t\tdts - device tree source text\n"
 | |
| 	 "\t\tdtb - device tree blob\n"
 | |
| 	 "\t\tfs  - /proc/device-tree style directory",
 | |
| 	"\n\tOutput file",
 | |
| 	"\n\tOutput formats are:\n"
 | |
| 	 "\t\tdts - device tree source text\n"
 | |
| 	 "\t\tdtb - device tree blob\n"
 | |
| 	 "\t\tasm - assembler source",
 | |
| 	"\n\tBlob version to produce, defaults to "stringify(DEFAULT_FDT_VERSION)" (for dtb and asm output)",
 | |
| 	"\n\tOutput dependency file",
 | |
| 	"\n\tMake space for <number> reserve map entries (for dtb and asm output)",
 | |
| 	"\n\tMake the blob at least <bytes> long (extra space)",
 | |
| 	"\n\tAdd padding to the blob of <bytes> long (extra space)",
 | |
| 	"\n\tMake the blob align to the <bytes> (extra space)",
 | |
| 	"\n\tSet the physical boot cpu",
 | |
| 	"\n\tTry to produce output even if the input tree has errors",
 | |
| 	"\n\tAdd a path to search for include files",
 | |
| 	"\n\tSort nodes and properties before outputting (useful for comparing trees)",
 | |
| 	"\n\tValid phandle formats are:\n"
 | |
| 	 "\t\tlegacy - \"linux,phandle\" properties only\n"
 | |
| 	 "\t\tepapr  - \"phandle\" properties only\n"
 | |
| 	 "\t\tboth   - Both \"linux,phandle\" and \"phandle\" properties",
 | |
| 	"\n\tEnable/disable warnings (prefix with \"no-\")",
 | |
| 	"\n\tEnable/disable errors (prefix with \"no-\")",
 | |
| 	"\n\tEnable generation of symbols",
 | |
| 	"\n\tEnable auto-alias of labels",
 | |
| 	"\n\tPrint this help and exit",
 | |
| 	"\n\tPrint version and exit",
 | |
| 	NULL,
 | |
| };
 | |
| 
 | |
| static const char *guess_type_by_name(const char *fname, const char *fallback)
 | |
| {
 | |
| 	const char *s;
 | |
| 
 | |
| 	s = strrchr(fname, '.');
 | |
| 	if (s == NULL)
 | |
| 		return fallback;
 | |
| 	if (!strcasecmp(s, ".dts"))
 | |
| 		return "dts";
 | |
| 	if (!strcasecmp(s, ".dtb"))
 | |
| 		return "dtb";
 | |
| 	return fallback;
 | |
| }
 | |
| 
 | |
| static const char *guess_input_format(const char *fname, const char *fallback)
 | |
| {
 | |
| 	struct stat statbuf;
 | |
| 	fdt32_t magic;
 | |
| 	FILE *f;
 | |
| 
 | |
| 	if (stat(fname, &statbuf) != 0)
 | |
| 		return fallback;
 | |
| 
 | |
| 	if (S_ISDIR(statbuf.st_mode))
 | |
| 		return "fs";
 | |
| 
 | |
| 	if (!S_ISREG(statbuf.st_mode))
 | |
| 		return fallback;
 | |
| 
 | |
| 	f = fopen(fname, "r");
 | |
| 	if (f == NULL)
 | |
| 		return fallback;
 | |
| 	if (fread(&magic, 4, 1, f) != 1) {
 | |
| 		fclose(f);
 | |
| 		return fallback;
 | |
| 	}
 | |
| 	fclose(f);
 | |
| 
 | |
| 	if (fdt32_to_cpu(magic) == FDT_MAGIC)
 | |
| 		return "dtb";
 | |
| 
 | |
| 	return guess_type_by_name(fname, fallback);
 | |
| }
 | |
| 
 | |
| int main(int argc, char *argv[])
 | |
| {
 | |
| 	struct dt_info *dti;
 | |
| 	const char *inform = NULL;
 | |
| 	const char *outform = NULL;
 | |
| 	const char *outname = "-";
 | |
| 	const char *depname = NULL;
 | |
| 	bool force = false, sort = false;
 | |
| 	const char *arg;
 | |
| 	int opt;
 | |
| 	FILE *outf = NULL;
 | |
| 	int outversion = DEFAULT_FDT_VERSION;
 | |
| 	long long cmdline_boot_cpuid = -1;
 | |
| 
 | |
| 	quiet      = 0;
 | |
| 	reservenum = 0;
 | |
| 	minsize    = 0;
 | |
| 	padsize    = 0;
 | |
| 	alignsize  = 0;
 | |
| 
 | |
| 	while ((opt = util_getopt_long()) != EOF) {
 | |
| 		switch (opt) {
 | |
| 		case 'I':
 | |
| 			inform = optarg;
 | |
| 			break;
 | |
| 		case 'O':
 | |
| 			outform = optarg;
 | |
| 			break;
 | |
| 		case 'o':
 | |
| 			outname = optarg;
 | |
| 			break;
 | |
| 		case 'V':
 | |
| 			outversion = strtol(optarg, NULL, 0);
 | |
| 			break;
 | |
| 		case 'd':
 | |
| 			depname = optarg;
 | |
| 			break;
 | |
| 		case 'R':
 | |
| 			reservenum = strtol(optarg, NULL, 0);
 | |
| 			break;
 | |
| 		case 'S':
 | |
| 			minsize = strtol(optarg, NULL, 0);
 | |
| 			break;
 | |
| 		case 'p':
 | |
| 			padsize = strtol(optarg, NULL, 0);
 | |
| 			break;
 | |
| 		case 'a':
 | |
| 			alignsize = strtol(optarg, NULL, 0);
 | |
| 			if (!is_power_of_2(alignsize))
 | |
| 				die("Invalid argument \"%d\" to -a option\n",
 | |
| 				    alignsize);
 | |
| 			break;
 | |
| 		case 'f':
 | |
| 			force = true;
 | |
| 			break;
 | |
| 		case 'q':
 | |
| 			quiet++;
 | |
| 			break;
 | |
| 		case 'b':
 | |
| 			cmdline_boot_cpuid = strtoll(optarg, NULL, 0);
 | |
| 			break;
 | |
| 		case 'i':
 | |
| 			srcfile_add_search_path(optarg);
 | |
| 			break;
 | |
| 		case 'v':
 | |
| 			util_version();
 | |
| 		case 'H':
 | |
| 			if (streq(optarg, "legacy"))
 | |
| 				phandle_format = PHANDLE_LEGACY;
 | |
| 			else if (streq(optarg, "epapr"))
 | |
| 				phandle_format = PHANDLE_EPAPR;
 | |
| 			else if (streq(optarg, "both"))
 | |
| 				phandle_format = PHANDLE_BOTH;
 | |
| 			else
 | |
| 				die("Invalid argument \"%s\" to -H option\n",
 | |
| 				    optarg);
 | |
| 			break;
 | |
| 
 | |
| 		case 's':
 | |
| 			sort = true;
 | |
| 			break;
 | |
| 
 | |
| 		case 'W':
 | |
| 			parse_checks_option(true, false, optarg);
 | |
| 			break;
 | |
| 
 | |
| 		case 'E':
 | |
| 			parse_checks_option(false, true, optarg);
 | |
| 			break;
 | |
| 
 | |
| 		case '@':
 | |
| 			generate_symbols = 1;
 | |
| 			break;
 | |
| 		case 'A':
 | |
| 			auto_label_aliases = 1;
 | |
| 			break;
 | |
| 
 | |
| 		case 'h':
 | |
| 			usage(NULL);
 | |
| 		default:
 | |
| 			usage("unknown option");
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	if (argc > (optind+1))
 | |
| 		usage("missing files");
 | |
| 	else if (argc < (optind+1))
 | |
| 		arg = "-";
 | |
| 	else
 | |
| 		arg = argv[optind];
 | |
| 
 | |
| 	/* minsize and padsize are mutually exclusive */
 | |
| 	if (minsize && padsize)
 | |
| 		die("Can't set both -p and -S\n");
 | |
| 
 | |
| 	if (depname) {
 | |
| 		depfile = fopen(depname, "w");
 | |
| 		if (!depfile)
 | |
| 			die("Couldn't open dependency file %s: %s\n", depname,
 | |
| 			    strerror(errno));
 | |
| 		fprintf(depfile, "%s:", outname);
 | |
| 	}
 | |
| 
 | |
| 	if (inform == NULL)
 | |
| 		inform = guess_input_format(arg, "dts");
 | |
| 	if (outform == NULL) {
 | |
| 		outform = guess_type_by_name(outname, NULL);
 | |
| 		if (outform == NULL) {
 | |
| 			if (streq(inform, "dts"))
 | |
| 				outform = "dtb";
 | |
| 			else
 | |
| 				outform = "dts";
 | |
| 		}
 | |
| 	}
 | |
| 	if (streq(inform, "dts"))
 | |
| 		dti = dt_from_source(arg);
 | |
| 	else if (streq(inform, "fs"))
 | |
| 		dti = dt_from_fs(arg);
 | |
| 	else if(streq(inform, "dtb"))
 | |
| 		dti = dt_from_blob(arg);
 | |
| 	else
 | |
| 		die("Unknown input format \"%s\"\n", inform);
 | |
| 
 | |
| 	dti->outname = outname;
 | |
| 
 | |
| 	if (depfile) {
 | |
| 		fputc('\n', depfile);
 | |
| 		fclose(depfile);
 | |
| 	}
 | |
| 
 | |
| 	if (cmdline_boot_cpuid != -1)
 | |
| 		dti->boot_cpuid_phys = cmdline_boot_cpuid;
 | |
| 
 | |
| 	fill_fullpaths(dti->dt, "");
 | |
| 
 | |
| 	/* on a plugin, generate by default */
 | |
| 	if (dti->dtsflags & DTSF_PLUGIN) {
 | |
| 		generate_fixups = 1;
 | |
| 	}
 | |
| 
 | |
| 	process_checks(force, dti);
 | |
| 
 | |
| 	if (auto_label_aliases)
 | |
| 		generate_label_tree(dti, "aliases", false);
 | |
| 
 | |
| 	if (generate_symbols)
 | |
| 		generate_label_tree(dti, "__symbols__", true);
 | |
| 
 | |
| 	if (generate_fixups) {
 | |
| 		generate_fixups_tree(dti, "__fixups__");
 | |
| 		generate_local_fixups_tree(dti, "__local_fixups__");
 | |
| 	}
 | |
| 
 | |
| 	if (sort)
 | |
| 		sort_tree(dti);
 | |
| 
 | |
| 	if (streq(outname, "-")) {
 | |
| 		outf = stdout;
 | |
| 	} else {
 | |
| 		outf = fopen(outname, "wb");
 | |
| 		if (! outf)
 | |
| 			die("Couldn't open output file %s: %s\n",
 | |
| 			    outname, strerror(errno));
 | |
| 	}
 | |
| 
 | |
| 	if (streq(outform, "dts")) {
 | |
| 		dt_to_source(outf, dti);
 | |
| 	} else if (streq(outform, "dtb")) {
 | |
| 		dt_to_blob(outf, dti, outversion);
 | |
| 	} else if (streq(outform, "asm")) {
 | |
| 		dt_to_asm(outf, dti, outversion);
 | |
| 	} else if (streq(outform, "null")) {
 | |
| 		/* do nothing */
 | |
| 	} else {
 | |
| 		die("Unknown output format \"%s\"\n", outform);
 | |
| 	}
 | |
| 
 | |
| 	exit(0);
 | |
| }
 |