mirror of
				https://github.com/torvalds/linux.git
				synced 2025-10-31 16:48:26 +02:00 
			
		
		
		
	 12d638f48c
			
		
	
	
		12d638f48c
		
	
	
	
	
		
			
			This adds the following commits from upstream:
1df7b047fe43 pylibfdt/Makefile.pylibfdt: use project's flags to compile the extension
61e88fdcec52 libfdt: overlay: Fix phandle overwrite check for new subtrees
49d30894466e meson: fix installation with meson-python
d54aaf93673c pylibfdt: clean up python build directory
ab86f1e9fda8 pylibfdt: add VERSION.txt to Python sdist
7b8a30eceabe pylibfdt: fix Python version
ff4f17eb5865 pylibfdt/Makefile.pylibfdt: fix Python library being rebuild during install
9e313b14e684 pylibfdt/meson.build: fix Python library being rebuilt during install
d598fc3648ec tests/run_tests.sh: fix Meson library path being dropped
b98239da2f18 tests/meson.build: fix python and yaml tests not running
c17d76ab5e84 checks: Check the overall length of "interrupt-map"
ae26223a056e libfdt: overlay: Refactor overlay_fixup_phandle
4dd831affd01 libfdt: tests: Update test case for overlay_bad_fixup
e6d294200837 tests: Remove two_roots and named_root from LIBTREE_TESTS_L and add all dtb filenames generated by dumptrees to TESTS_TREES_L in Makefile.tests
855c934e26ae tests: fix tests broken under Meson
4fd3f4f0a95d github: enforce testing pylibfdt and yaml support
9ca7d62dbf0b meson: split run-tests by type
bb51223083a4 meson: fix dependencies of tests
e81900635c95 meson: fix pylibfdt missing dependency on libfdt
822123856980 pylibfdt: fix get_mem_rsv for newer Python versions
1fad065080e6 libfdt: overlay: ensure that existing phandles are not overwritten
b0aacd0a7735 github: add windows/msys CI build
ae97d9745862 github: Don't accidentally suppress test errors
057a7dbbb777 github: Display meson test logs on failure
92b5d4e91678 pylibfdt: Remove some apparently deprecated options from setup.py
417e3299dbd1 github: Update to newer checkout action
5e6cefa17e2d fix MinGW format attribute
24f60011fd43 libfdt: Simplify adjustment of values for local fixups
da39ee0e68b6 libfdt: rework shared/static libraries
a669223f7a60 Makefile: do not hardcode the `install` program path
3fbfdd08afd2 libfdt: fix duplicate meson target
dcef5f834ea3 tests: use correct pkg-config when cross compiling
0b8026ff254f meson: allow building from shallow clones
95c74d71f090 treesource: Restore string list output when no type markers
2283dd78eff5 libfdt: fdt_path_offset_namelen: Reject empty path
79b9e326a162 libfdt: fdt_get_alias_namelen: Validate aliases
52157f13ef3d pylibfdt: Support boolean properties
d77433727566 dtc: fix missing string in usage_opts_help
ad8bf9f9aa39 libfdt: Fix fdt_appendprop_addrrange documentation
6c5e189fb952 github: add workflow for Meson builds
a3dc9f006a78 libfdt: rename libfdt-X.Y.Z.so to libfdt.so.X.Y.Z
35019949c4c7 workflows: build: remove setuptools_scm hack
cd3e2304f4a9 pylibfdt: use fallback version in tarballs
0f5864567745 move release version into VERSION.txt
38165954c13b libfdt: add missing version symbols
5e98b5979354 editorconfig: use tab indentation for version.lds
d030a893be25 tests: generate dtbs in Meson build directory
8d8372b13706 tests: fix use of deprecated meson methods
761114effaf7 pylibtfdt: fix use of deprecated meson method
bf6377a98d97 meson: set minimum Meson version to 0.56.0
4c68e4b16b22 libfdt: fix library version to match project version
bdc5c8793a13 meson: allow disabling tests
f088e381f29e Makefile: allow to install libfdt without building executables
6df5328a902c Fix use of <ctype.h> functions
ccf1f62d59ad libfdt: Fix a typo in libfdt.h
71a8b8ef0adf libfdt: meson: Fix linking on macOS linker
589d8c7653c7 dtc: Add an option to generate __local_fixups__ and __fixups__
e8364666d5ac CI: Add build matrix with multiple Linux distributions
3b02a94b486f dtc: Correct invalid dts output with mixed phandles and integers
d4888958d64b tests: Add additional tests for device graph checks
ea3b9a1d2c5a checks: Fix crash in graph_child_address if 'reg' cell size != 1
b2b9671583e9 livetree: fix off-by-one in propval_cell_n() bounds check
ab481e483061 Add definition for a GitHub Actions CI job
c88038c9b8ca Drop obsolete/broken CI definitions
0ac8b30ba5a1 yaml: Depend on libyaml >= 0.2.3
f1657b2fb5be tests: Add test cases for bad endpoint node and remote-endpoint prop checks
44bb89cafd3d checks: Fix segmentation fault in check_graph_node
60bcf1cde1a8 improve documentation for fdt_path_offset()
a6f997bc77d4 add fdt_get_symbol() and fdt_get_symbol_namelen() functions
18f5ec12a10e use fdt_path_getprop_namelen() in fdt_get_alias_namelen()
df093279282c add fdt_path_getprop_namelen() helper
129bb4b78bc6 doc: dt-object-internal: Fix a typo
390f481521c3 fdtoverlay: Drop a a repeated article
9f8b382ed45e manual: Fix and improve documentation about -@
2cdf93a6d402 fdtoverlay: Fix usage string to not mention "<type>"
72fc810c3025 build-sys: add -Wwrite-strings
083ab26da83b tests: fix leaks spotted by ASAN
6f8b28f49609 livetree: fix leak spotted by ASAN
fd68bb8c5658 Make name_node() xstrdup its name argument
4718189c4ca8 Delay xstrdup() of node and property names coming from a flat tree
0b842c3c8199 Make build_property() xstrdup its name argument
9cceabea1ee0 checks: correct I2C 10-bit address check
0d56145938fe yamltree.c: fix -Werror=discarded-qualifiers & -Werror=cast-qual
61fa22b05f69 checks: make check.data const
7a1d72a788e0 checks.c: fix check_msg() leak
ee5799938697 checks.c: fix heap-buffer-overflow
44c9b73801c1 tests: fix -Wwrite-strings
5b60f5104fcc srcpos.c: fix -Wwrite-strings
32174a66efa4 meson: Fix cell overflow tests when running from meson
64a907f08b9b meson.build: bump version to 1.7.0
e3cde0613bfd Add -Wsuggest-attribute=format warning, correct warnings thus generated
41821821101a Use #ifdef NO_VALGRIND
71c19f20b3ef Do not redefine _GNU_SOURCE if already set
039a99414e77 Bump version to v1.7.0
9b62ec84bb2d Merge remote-tracking branch 'gitlab/main'
3f29d6d85c24 pylibfdt: add size_hint parameter for get_path
2022bb10879d checks: Update #{size,address}-cells check for 'dma-ranges'
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
		
	
			
		
			
				
	
	
		
			378 lines
		
	
	
	
		
			9.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			378 lines
		
	
	
	
		
			9.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0-or-later
 | |
| /*
 | |
|  * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 | |
|  */
 | |
| 
 | |
| #include <sys/stat.h>
 | |
| 
 | |
| #include "dtc.h"
 | |
| #include "srcpos.h"
 | |
| 
 | |
| /*
 | |
|  * Command line options
 | |
|  */
 | |
| int quiet;		/* Level of quietness */
 | |
| unsigned 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 */
 | |
| int annotate;		/* Level of annotation: 1 for input source location
 | |
| 			   >1 for full input source location. */
 | |
| 
 | |
| 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:@LAThv";
 | |
| 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, '@'},
 | |
| 	{"local-fixups",     no_argument, NULL, 'L'},
 | |
| 	{"auto-alias",       no_argument, NULL, 'A'},
 | |
| 	{"annotate",         no_argument, NULL, 'T'},
 | |
| 	{"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"
 | |
| #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",
 | |
| 	"\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\tPossibly generates a __local_fixups__ and a __fixups__ node at the root node",
 | |
| 	"\n\tEnable auto-alias of labels",
 | |
| 	"\n\tAnnotate output .dts with input source file and line (-T -T for more details)",
 | |
| 	"\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, ".yaml"))
 | |
| 		return "yaml";
 | |
| 	if (!strcasecmp(s, ".dtbo"))
 | |
| 		return "dtb";
 | |
| 	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 = strtoul(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 'L':
 | |
| 			generate_fixups = 1;
 | |
| 			break;
 | |
| 
 | |
| 		case 'A':
 | |
| 			auto_label_aliases = 1;
 | |
| 			break;
 | |
| 		case 'T':
 | |
| 			annotate++;
 | |
| 			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 (annotate && (!streq(inform, "dts") || !streq(outform, "dts")))
 | |
| 		die("--annotate requires -I dts -O dts\n");
 | |
| 	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);
 | |
| #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")) {
 | |
| 		dt_to_asm(outf, dti, outversion);
 | |
| 	} else if (streq(outform, "null")) {
 | |
| 		/* do nothing */
 | |
| 	} else {
 | |
| 		die("Unknown output format \"%s\"\n", outform);
 | |
| 	}
 | |
| 
 | |
| 	exit(0);
 | |
| }
 |