Commit 79edff12 authored by Rob Herring's avatar Rob Herring
Browse files

scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9 



This adds the following commits from upstream:

183df9e9c2b9 gitignore: Ignore the swp files
0db6d09584e1 gitignore: Add cscope files
307afa1a7be8 Update Jon Loeliger's email
ca16a723fa9d fdtdump: Fix gcc11 warning
64990a272e8f srcpos: increase MAX_SRCFILE_DEPTH
163f0469bf2e dtc: Allow overlays to have .dtbo extension
3b01518e688d Set last_comp_version correctly in new dtb and fix potential version issues in fdt_open_into
f7e5737f26aa tests: Fix overlay_overlay_nosugar test case
7cd5d5fe43d5 libfdt: Tweak description of assume-aligned load helpers
a7c404099349 libfdt: Internally perform potentially unaligned loads
bab85e48a6f4 meson: increase default timeout for tests
f8b46098824d meson: do not assume python is installed, skip tests
30a56bce4f0b meson: fix -Wall warning
5e735860c478 libfdt: Check for 8-byte address alignment in fdt_ro_probe_()
67849a327927 build-sys: add meson build
05874d08212d pylibfdt: allow build out of tree
3bc3a6b9fe0c dtc: Fix signedness comparisons warnings: Wrap (-1)
e1147b159e92 dtc: Fix signedness comparisons warnings: change types
04cf1fdc0fcf convert-dtsv0: Fix signedness comparisons warning
b30013edb878 libfdt: Fix kernel-doc comments

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

scripts/dtc/data.c

+3 −3
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ void data_free(struct data d) 
		free(d.val);

}



struct data data_grow_for(struct data d, int xlen)

struct data data_grow_for(struct data d, unsigned int xlen)

{

	struct data nd;

	int newsize;

	unsigned int newsize;



	if (xlen == 0)

		return d;
@@ -84,7 +84,7 @@ struct data data_copy_file(FILE *f, size_t maxlen) 
	while (!feof(f) && (d.len < maxlen)) {

		size_t chunksize, ret;



		if (maxlen == -1)

		if (maxlen == (size_t)-1)

			chunksize = 4096;

		else

			chunksize = maxlen - d.len;

scripts/dtc/dtc.c

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ static const char *guess_type_by_name(const char *fname, const char *fallback) 
		return "dts";

	if (!strcasecmp(s, ".yaml"))

		return "yaml";

	if (!strcasecmp(s, ".dtbo"))

		return "dtb";

	if (!strcasecmp(s, ".dtb"))

		return "dtb";

	return fallback;
@@ -357,6 +359,8 @@ int main(int argc, char *argv[]) 
#endif

	} else if (streq(outform, "dtb")) {

		dt_to_blob(outf, dti, outversion);

	} else if (streq(outform, "dtbo")) {

		dt_to_blob(outf, dti, outversion);

	} else if (streq(outform, "asm")) {

		dt_to_asm(outf, dti, outversion);

	} else if (streq(outform, "null")) {

scripts/dtc/dtc.h

+4 −4
Original line number Diff line number Diff line
@@ -105,13 +105,13 @@ extern const char *markername(enum markertype markertype); 


struct  marker {

	enum markertype type;

	int offset;

	unsigned int offset;

	char *ref;

	struct marker *next;

};



struct data {

	int len;

	unsigned int len;

	char *val;

	struct marker *markers;

};
@@ -129,7 +129,7 @@ size_t type_marker_length(struct marker *m); 


void data_free(struct data d);



struct data data_grow_for(struct data d, int xlen);

struct data data_grow_for(struct data d, unsigned int xlen);



struct data data_copy_mem(const char *mem, int len);

struct data data_copy_escape_string(const char *s, int len);
@@ -253,7 +253,7 @@ void append_to_property(struct node *node, 
const char *get_unitname(struct node *node);

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

cell_t propval_cell(struct property *prop);

cell_t propval_cell_n(struct property *prop, int n);

cell_t propval_cell_n(struct property *prop, unsigned int n);

struct property *get_property_by_label(struct node *tree, const char *label,

				       struct node **node);

struct marker *get_marker_label(struct node *tree, const char *label,

scripts/dtc/fdtoverlay.c

0 → 100644
+208 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Copyright (c) 2017 Konsulko Group Inc. All rights reserved.

 *

 * Author:

 *	 Pantelis Antoniou <pantelis.antoniou@konsulko.com>

 */



#include <assert.h>

#include <ctype.h>

#include <getopt.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <inttypes.h>



#include <libfdt.h>



#include "util.h"



#define BUF_INCREMENT	65536



/* Usage related data. */

static const char usage_synopsis[] =

	"apply a number of overlays to a base blob\n"

	"	fdtoverlay <options> [<overlay.dtbo> [<overlay.dtbo>]]\n"

	"\n"

	USAGE_TYPE_MSG;

static const char usage_short_opts[] = "i:o:v" USAGE_COMMON_SHORT_OPTS;

static struct option const usage_long_opts[] = {

	{"input",            required_argument, NULL, 'i'},

	{"output",	     required_argument, NULL, 'o'},

	{"verbose",	           no_argument, NULL, 'v'},

	USAGE_COMMON_LONG_OPTS,

};

static const char * const usage_opts_help[] = {

	"Input base DT blob",

	"Output DT blob",

	"Verbose messages",

	USAGE_COMMON_OPTS_HELP

};



int verbose = 0;



static void *apply_one(char *base, const char *overlay, size_t *buf_len,

		       const char *name)

{

	char *tmp = NULL;

	char *tmpo;

	int ret;



	/*

	 * We take a copies first, because a a failed apply can trash

	 * both the base blob and the overlay

	 */

	tmpo = xmalloc(fdt_totalsize(overlay));



	do {

		tmp = xrealloc(tmp, *buf_len);

		ret = fdt_open_into(base, tmp, *buf_len);

		if (ret) {

			fprintf(stderr,

				"\nFailed to make temporary copy: %s\n",

				fdt_strerror(ret));

			goto fail;

		}



		memcpy(tmpo, overlay, fdt_totalsize(overlay));



		ret = fdt_overlay_apply(tmp, tmpo);

		if (ret == -FDT_ERR_NOSPACE) {

			*buf_len += BUF_INCREMENT;

		}

	} while (ret == -FDT_ERR_NOSPACE);



	if (ret) {

		fprintf(stderr, "\nFailed to apply '%s': %s\n",

			name, fdt_strerror(ret));

		goto fail;

	}



	free(base);

	free(tmpo);

	return tmp;



fail:

	free(tmpo);

	if (tmp)

		free(tmp);



	return NULL;

}

static int do_fdtoverlay(const char *input_filename,

			 const char *output_filename,

			 int argc, char *argv[])

{

	char *blob = NULL;

	char **ovblob = NULL;

	size_t buf_len;

	int i, ret = -1;



	blob = utilfdt_read(input_filename, &buf_len);

	if (!blob) {

		fprintf(stderr, "\nFailed to read '%s'\n", input_filename);

		goto out_err;

	}

	if (fdt_totalsize(blob) > buf_len) {

		fprintf(stderr,

 "\nBase blob is incomplete (%lu / %" PRIu32 " bytes read)\n",

			(unsigned long)buf_len, fdt_totalsize(blob));

		goto out_err;

	}



	/* allocate blob pointer array */

	ovblob = xmalloc(sizeof(*ovblob) * argc);

	memset(ovblob, 0, sizeof(*ovblob) * argc);



	/* read and keep track of the overlay blobs */

	for (i = 0; i < argc; i++) {

		size_t ov_len;

		ovblob[i] = utilfdt_read(argv[i], &ov_len);

		if (!ovblob[i]) {

			fprintf(stderr, "\nFailed to read '%s'\n", argv[i]);

			goto out_err;

		}

		if (fdt_totalsize(ovblob[i]) > ov_len) {

			fprintf(stderr,

"\nOverlay '%s' is incomplete (%lu / %" PRIu32 " bytes read)\n",

				argv[i], (unsigned long)ov_len,

				fdt_totalsize(ovblob[i]));

			goto out_err;

		}

	}



	buf_len = fdt_totalsize(blob);



	/* apply the overlays in sequence */

	for (i = 0; i < argc; i++) {

		blob = apply_one(blob, ovblob[i], &buf_len, argv[i]);

		if (!blob)

			goto out_err;

	}



	fdt_pack(blob);

	ret = utilfdt_write(output_filename, blob);

	if (ret)

		fprintf(stderr, "\nFailed to write '%s'\n",

			output_filename);



out_err:

	if (ovblob) {

		for (i = 0; i < argc; i++) {

			if (ovblob[i])

				free(ovblob[i]);

		}

		free(ovblob);

	}

	free(blob);



	return ret;

}



int main(int argc, char *argv[])

{

	int opt, i;

	char *input_filename = NULL;

	char *output_filename = NULL;



	while ((opt = util_getopt_long()) != EOF) {

		switch (opt) {

		case_USAGE_COMMON_FLAGS



		case 'i':

			input_filename = optarg;

			break;

		case 'o':

			output_filename = optarg;

			break;

		case 'v':

			verbose = 1;

			break;

		}

	}



	if (!input_filename)

		usage("missing input file");



	if (!output_filename)

		usage("missing output file");



	argv += optind;

	argc -= optind;



	if (argc <= 0)

		usage("missing overlay file(s)");



	if (verbose) {

		printf("input  = %s\n", input_filename);

		printf("output = %s\n", output_filename);

		for (i = 0; i < argc; i++)

			printf("overlay[%d] = %s\n", i, argv[i]);

	}



	if (do_fdtoverlay(input_filename, output_filename, argc, argv))

		return 1;



	return 0;

}

scripts/dtc/flattree.c

+4 −4
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static void asm_emit_align(void *e, int a) 
static void asm_emit_data(void *e, struct data d)

{

	FILE *f = e;

	int off = 0;

	unsigned int off = 0;

	struct marker *m = d.markers;



	for_each_marker_of_type(m, LABEL)
@@ -219,7 +219,7 @@ static struct emitter asm_emitter = { 


static int stringtable_insert(struct data *d, const char *str)

{

	int i;

	unsigned int i;



	/* FIXME: do this more efficiently? */
@@ -345,7 +345,7 @@ static void make_fdt_header(struct fdt_header *fdt, 
void dt_to_blob(FILE *f, struct dt_info *dti, int version)

{

	struct version_info *vi = NULL;

	int i;

	unsigned int i;

	struct data blob       = empty_data;

	struct data reservebuf = empty_data;

	struct data dtbuf      = empty_data;
@@ -446,7 +446,7 @@ static void dump_stringtable_asm(FILE *f, struct data strbuf) 
void dt_to_asm(FILE *f, struct dt_info *dti, int version)

{

	struct version_info *vi = NULL;

	int i;

	unsigned int i;

	struct data strbuf = empty_data;

	struct reserve_info *re;

	const char *symprefix = "dt";