Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c29cfc21 authored by Rob Herring's avatar Rob Herring Committed by LuK1337
Browse files

scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987 



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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarAtman <masteratman@gmail.com>
parent 3f8bfa49

include/linux/libfdt_env.h

+3 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _LIBFDT_ENV_H

#define _LIBFDT_ENV_H

#ifndef LIBFDT_ENV_H

#define LIBFDT_ENV_H



#include <linux/kernel.h>

#include <linux/string.h>
@@ -16,4 +16,4 @@ typedef __be64 fdt64_t; 
#define fdt64_to_cpu(x) be64_to_cpu(x)

#define cpu_to_fdt64(x) cpu_to_be64(x)



#endif /* _LIBFDT_ENV_H */
 
#endif /* LIBFDT_ENV_H */

scripts/dtc/checks.c

+290 −149

File changed.

Preview size limit exceeded, changes collapsed.

scripts/dtc/dtc-parser.y

+11 −6
Original line number Diff line number Diff line
@@ -166,7 +166,17 @@ devicetree: 
		{

			$$ = merge_nodes($1, $3);

		}



	| DT_REF nodedef

		{

			/*

			 * We rely on the rule being always:

			 *   versioninfo plugindecl memreserves devicetree

			 * so $-1 is what we want (plugindecl)

			 */

			if (!($<flags>-1 & DTSF_PLUGIN))

				ERROR(&@2, "Label or path %s not found", $1);

			$$ = add_orphan_node(name_node(build_node(NULL, NULL), ""), $2, $1);

		}

	| devicetree DT_LABEL DT_REF nodedef

		{

			struct node *target = get_node_by_ref($1, $3);
@@ -209,11 +219,6 @@ devicetree: 


			$$ = $1;

		}

	| /* empty */

		{

			/* build empty node */

			$$ = name_node(build_node(NULL, NULL), "");

		}

	;



nodedef:

scripts/dtc/dtc.c

+3 −4
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ static void fill_fullpaths(struct node *tree, const char *prefix) 
}



/* Usage related data. */

#define FDT_VERSION(version)	_FDT_VERSION(version)

#define _FDT_VERSION(version)	#version

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[] = {
@@ -98,7 +96,7 @@ static const char * const usage_opts_help[] = { 
	 "\t\tdts - device tree source text\n"

	 "\t\tdtb - device tree blob\n"

	 "\t\tasm - assembler source",

	"\n\tBlob version to produce, defaults to "FDT_VERSION(DEFAULT_FDT_VERSION)" (for dtb and asm output)",

	"\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)",
@@ -319,13 +317,14 @@ int main(int argc, char *argv[]) 
		dti->boot_cpuid_phys = cmdline_boot_cpuid;



	fill_fullpaths(dti->dt, "");

	process_checks(force, dti);



	/* 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);

scripts/dtc/dtc.h

+6 −5
Original line number Diff line number Diff line 
#ifndef _DTC_H

#define _DTC_H

#ifndef DTC_H

#define DTC_H



/*

 * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
@@ -67,7 +67,8 @@ typedef uint32_t cell_t; 




#define streq(a, b)	(strcmp((a), (b)) == 0)

#define strneq(a, b, n)	(strncmp((a), (b), (n)) == 0)

#define strstarts(s, prefix)	(strncmp((s), (prefix), strlen(prefix)) == 0)

#define strprefixeq(a, n, b)	(strlen(b) == (n) && (memcmp(a, b, n) == 0))



#define ALIGN(x, a)	(((x) + (a) - 1) & ~((a) - 1))
@@ -203,7 +204,7 @@ struct node *build_node_delete(void); 
struct node *name_node(struct node *node, char *name);

struct node *chain_node(struct node *first, struct node *list);

struct node *merge_nodes(struct node *old_node, struct node *new_node);

void add_orphan_node(struct node *old_node, struct node *new_node, char *ref);

struct node *add_orphan_node(struct node *old_node, struct node *new_node, char *ref);



void add_property(struct node *node, struct property *prop);

void delete_property_by_name(struct node *node, char *name);
@@ -289,4 +290,4 @@ struct dt_info *dt_from_source(const char *f); 


struct dt_info *dt_from_fs(const char *dirname);



#endif /* _DTC_H */
 
#endif /* DTC_H */