Commit 9bb9c6a1 authored by Rob Herring's avatar Rob Herring
Browse files

scripts/dtc: Update to upstream version v1.5.0-23-g87963ee20693 



This adds the following commits from upstream:

87963ee20693 livetree: add missing type markers in generated overlay properties
825146d13dc0 Fix typos in various documentation and source files
25bb080c18d1 Update the GPL2 text to the latest revision
243176c4ce84 Fix bogus error on rebuild
ce01b21098a4 libfdt: Add FDT_CREATE_FLAG_NO_NAME_DEDUP flag that trades size for speed
fbb62754ce45 libfdt: Introduce fdt_create_with_flags()
228a44cce857 libfdt: Ensure fdt_add_property frees allocated name string on failure
8f695676227b Avoid assertion in check_interrupts_property()
5c3513f68921 Link tools and tests against libfdt shared library
00f9febf9c16 tests: Rename tests.sh to testutils.sh
c5d45188f923 Clean up LDLIBS handling
6ef8fcd05b74 Rebuild libfdt shared object if versioning linker script changes
26ee65a16c38 Use Python3 by default
cca6546244cb libfdt: Make fdt_get_max_phandle() an inline
730875016a6a libfdt: Add phandle generation helper
7dfb61ba96b1 libfdt: Use fdt_find_max_phandle()
2bc5b66d7f6c libfdt: Add new maximum phandle lookup function
7fcf8208b8a9 libfdt: add fdt_append_addrrange()
ae795b2db7a4 checks: Do not omit nodes with labels if symbol generation is requested
eac2ad495b29 Update version.lds again
f67b47135523 Revert "libfdt: Add phandle generation helper"
54ea41c22415 libfdt: Add phandle generation helper
4762ad051ee0 checks: Fix spelling in check_graph_endpoint
d37f6b20107e Bump version to v1.5.0
a4b1a307ff3a pylibfdt:tests: Extend the way how to find a Python module
625dd8aaf20f pylibfdt: Change how passing tests are recognized
364631626bb7 pylibfdt: Test fdt.setprop take bytes on Python 3, add error handling
cb0f454f73cc pylibfdt: check_err accepts only integer as a first argument.
4b68c6b3605a pylibfdt: Proper handling of bytes/unicode strings and octal literals
78e113e81c9d Use PRIxPTR for printing uintptr_t values
ea7a8f6dad67 libfdt: Fix FDT_ERR_NOTFOUND typos in documentation
5aafd7ca43e0 libfdt: Fix fdt_getprop_by_offset() parameter name in documentation
7cbc550f903b checks: Add unit address check if node is enabled

Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 73c699ff

scripts/dtc/checks.c

+49 −6
Original line number Diff line number Diff line
@@ -660,6 +660,8 @@ ERROR(path_references, fixup_path_references, NULL, &duplicate_node_names); 
static void fixup_omit_unused_nodes(struct check *c, struct dt_info *dti,

				    struct node *node)

{

	if (generate_symbols && node->labels)

		return;

	if (node->omit_if_unused && !node->is_referenced)

		delete_node(node);

}
@@ -1212,8 +1214,24 @@ static void check_avoid_unnecessary_addr_size(struct check *c, struct dt_info *d 
}

WARNING(avoid_unnecessary_addr_size, check_avoid_unnecessary_addr_size, NULL, &avoid_default_addr_size);



static void check_unique_unit_address(struct check *c, struct dt_info *dti,

					      struct node *node)

static bool node_is_disabled(struct node *node)

{

	struct property *prop;



	prop = get_property(node, "status");

	if (prop) {

		char *str = prop->val.val;

		if (streq("disabled", str))

			return true;

	}



	return false;

}



static void check_unique_unit_address_common(struct check *c,

						struct dt_info *dti,

						struct node *node,

						bool disable_check)

{

	struct node *childa;
@@ -1230,18 +1248,38 @@ static void check_unique_unit_address(struct check *c, struct dt_info *dti, 
		if (!strlen(addr_a))

			continue;



		if (disable_check && node_is_disabled(childa))

			continue;



		for_each_child(node, childb) {

			const char *addr_b = get_unitname(childb);

			if (childa == childb)

				break;



			if (disable_check && node_is_disabled(childb))

				continue;



			if (streq(addr_a, addr_b))

				FAIL(c, dti, childb, "duplicate unit-address (also used in node %s)", childa->fullpath);

		}

	}

}



static void check_unique_unit_address(struct check *c, struct dt_info *dti,

					      struct node *node)

{

	check_unique_unit_address_common(c, dti, node, false);

}

WARNING(unique_unit_address, check_unique_unit_address, NULL, &avoid_default_addr_size);



static void check_unique_unit_address_if_enabled(struct check *c, struct dt_info *dti,

					      struct node *node)

{

	check_unique_unit_address_common(c, dti, node, true);

}

CHECK_ENTRY(unique_unit_address_if_enabled, check_unique_unit_address_if_enabled,

	    NULL, false, false, &avoid_default_addr_size);



static void check_obsolete_chosen_interrupt_controller(struct check *c,

						       struct dt_info *dti,

						       struct node *node)
@@ -1542,10 +1580,14 @@ static void check_interrupts_property(struct check *c, 
		prop = get_property(parent, "interrupt-parent");

		if (prop) {

			phandle = propval_cell(prop);

			/* Give up if this is an overlay with external references */

			if ((phandle == 0 || phandle == -1) &&

			    (dti->dtsflags & DTSF_PLUGIN))

			if ((phandle == 0) || (phandle == -1)) {

				/* Give up if this is an overlay with

				 * external references */

				if (dti->dtsflags & DTSF_PLUGIN)

					return;

				FAIL_PROP(c, dti, parent, prop, "Invalid phandle");

				continue;

			}



			irq_node = get_node_by_phandle(root, phandle);

			if (!irq_node) {
@@ -1714,7 +1756,7 @@ static void check_graph_endpoint(struct check *c, struct dt_info *dti, 
		return;



	if (!strprefixeq(node->name, node->basenamelen, "endpoint"))

		FAIL(c, dti, node, "graph endpont node name should be 'endpoint'");

		FAIL(c, dti, node, "graph endpoint node name should be 'endpoint'");



	check_graph_reg(c, dti, node);
@@ -1769,6 +1811,7 @@ static struct check *check_table[] = { 
	&avoid_default_addr_size,

	&avoid_unnecessary_addr_size,

	&unique_unit_address,

	&unique_unit_address_if_enabled,

	&obsolete_chosen_interrupt_controller,

	&chosen_node_is_root, &chosen_node_bootargs, &chosen_node_stdout_path,

scripts/dtc/dtc.h

+2 −1
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ void add_child(struct node *parent, struct node *child); 
void delete_node_by_name(struct node *parent, char *name);

void delete_node(struct node *node);

void append_to_property(struct node *node,

			char *name, const void *data, int len);

			char *name, const void *data, int len,

			enum markertype type);



const char *get_unitname(struct node *node);

struct property *get_property(struct node *node, const char *propname);

scripts/dtc/flattree.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ void dt_to_asm(FILE *f, struct dt_info *dti, int version) 
	fprintf(f, "/* Memory reserve map from source file */\n");



	/*

	 * Use .long on high and low halfs of u64s to avoid .quad

	 * Use .long on high and low halves of u64s to avoid .quad

	 * as it appears .quad isn't available in some assemblers.

	 */

	for (re = dti->reservelist; re; re = re->next) {

scripts/dtc/libfdt/Makefile.libfdt

+2 −0
Original line number Diff line number Diff line
@@ -9,7 +9,9 @@ LIBFDT_VERSION = version.lds 
LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c \

	fdt_addresses.c fdt_overlay.c

LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o)

LIBFDT_LIB = libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT)



libfdt_clean:

	@$(VECHO) CLEAN "(libfdt)"

	rm -f $(STD_CLEANFILES:%=$(LIBFDT_dir)/%)

	rm -f $(LIBFDT_dir)/$(LIBFDT_soname)

scripts/dtc/libfdt/fdt_addresses.c

+47 −0
Original line number Diff line number Diff line
@@ -95,3 +95,50 @@ int fdt_size_cells(const void *fdt, int nodeoffset) 
		return 1;

	return val;

}



/* This function assumes that [address|size]_cells is 1 or 2 */

int fdt_appendprop_addrrange(void *fdt, int parent, int nodeoffset,

			     const char *name, uint64_t addr, uint64_t size)

{

	int addr_cells, size_cells, ret;

	uint8_t data[sizeof(fdt64_t) * 2], *prop;



	ret = fdt_address_cells(fdt, parent);

	if (ret < 0)

		return ret;

	addr_cells = ret;



	ret = fdt_size_cells(fdt, parent);

	if (ret < 0)

		return ret;

	size_cells = ret;



	/* check validity of address */

	prop = data;

	if (addr_cells == 1) {

		if ((addr > UINT32_MAX) || ((UINT32_MAX + 1 - addr) < size))

			return -FDT_ERR_BADVALUE;



		fdt32_st(prop, (uint32_t)addr);

	} else if (addr_cells == 2) {

		fdt64_st(prop, addr);

	} else {

		return -FDT_ERR_BADNCELLS;

	}



	/* check validity of size */

	prop += addr_cells * sizeof(fdt32_t);

	if (size_cells == 1) {

		if (size > UINT32_MAX)

			return -FDT_ERR_BADVALUE;



		fdt32_st(prop, (uint32_t)size);

	} else if (size_cells == 2) {

		fdt64_st(prop, size);

	} else {

		return -FDT_ERR_BADNCELLS;

	}



	return fdt_appendprop(fdt, nodeoffset, name, data,

			      (addr_cells + size_cells) * sizeof(fdt32_t));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE