Outstanding DTC patches?

Outstanding DTC patches?

[Jon Loeliger]

Folks,

I'd like to release a DTC 1.1 Real Soon Now!

However, I've been back-logged due to the holidays.
If you have any outstanding DTC or libfdt patches
that I have not yet applied and that you would like
in that release, please remind me by reposting it
and CC:'ing jdl@jdl.com!

Thanks!
jdl

Re: Outstanding DTC patches?

[David Gibson]

On Wed, Jan 02, 2008 at 12:21:02PM -0600, Jon Loeliger wrote:
> Folks,
> 
> I'd like to release a DTC 1.1 Real Soon Now!
> 
> However, I've been back-logged due to the holidays.
> If you have any outstanding DTC or libfdt patches
> that I have not yet applied and that you would like
> in that release, please remind me by reposting it
> and CC:'ing jdl@jdl.com!

I posted this one a while back, but I guess it dropped through the
cracks.  There's also the patch I sent you quite a long time ago that
adds a clarifying readme about the licensing situation - that might be
an idea for v1.1, too.

dtc: Remove header information dumping

Currently, when used in -Idtb mode, dtc will dump information about
the input blob's header fields to stderr.  This is kind of ugly, and
can get in the way of dtc's real output.

This patch, therefore, removes this.  So that there's still a way of
getting this information for debugging purposes, it places something
similar to the removed code into ftdump, replacing the couple of
header fields it currently prints with a complete header dump.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

Index: dtc/flattree.c
===================================================================
--- dtc.orig/flattree.c	2007-12-08 12:06:11.000000000 +1100
+++ dtc/flattree.c	2007-12-08 12:13:15.000000000 +1100
@@ -898,15 +898,6 @@
 	off_mem_rsvmap = be32_to_cpu(fdt->off_mem_rsvmap);
 	version = be32_to_cpu(fdt->version);
 
-	fprintf(stderr, "\tmagic:\t\t\t0x%x\n", magic);
-	fprintf(stderr, "\ttotalsize:\t\t%d\n", totalsize);
-	fprintf(stderr, "\toff_dt_struct:\t\t0x%x\n", off_dt);
-	fprintf(stderr, "\toff_dt_strings:\t\t0x%x\n", off_str);
-	fprintf(stderr, "\toff_mem_rsvmap:\t\t0x%x\n", off_mem_rsvmap);
-	fprintf(stderr, "\tversion:\t\t0x%x\n", version );
-	fprintf(stderr, "\tlast_comp_version:\t0x%x\n",
-		be32_to_cpu(fdt->last_comp_version));
-
 	if (off_mem_rsvmap >= totalsize)
 		die("Mem Reserve structure offset exceeds total size\n");
 
@@ -916,21 +907,15 @@
 	if (off_str > totalsize)
 		die("String table offset exceeds total size\n");
 
-	if (version >= 2)
-		fprintf(stderr, "\tboot_cpuid_phys:\t0x%x\n",
-			be32_to_cpu(fdt->boot_cpuid_phys));
-
 	size_str = -1;
 	if (version >= 3) {
 		size_str = be32_to_cpu(fdt->size_dt_strings);
-		fprintf(stderr, "\tsize_dt_strings:\t%d\n", size_str);
 		if (off_str+size_str > totalsize)
 			die("String table extends past total size\n");
 	}
 
 	if (version >= 17) {
 		size_dt = be32_to_cpu(fdt->size_dt_struct);
-		fprintf(stderr, "\tsize_dt_struct:\t\t%d\n", size_dt);
 		if (off_dt+size_dt > totalsize)
 			die("Structure block extends past total size\n");
 	}
Index: dtc/ftdump.c
===================================================================
--- dtc.orig/ftdump.c	2007-12-08 12:06:23.000000000 +1100
+++ dtc/ftdump.c	2007-12-08 12:15:09.000000000 +1100
@@ -81,11 +81,13 @@
 static void dump_blob(void *blob)
 {
 	struct fdt_header *bph = blob;
+	uint32_t off_mem_rsvmap = be32_to_cpu(bph->off_mem_rsvmap);
+	uint32_t off_dt = be32_to_cpu(bph->off_dt_struct);
+	uint32_t off_str = be32_to_cpu(bph->off_dt_strings);
 	struct fdt_reserve_entry *p_rsvmap =
-		(struct fdt_reserve_entry *)(blob
-					     + be32_to_cpu(bph->off_mem_rsvmap));
-	char *p_struct = blob + be32_to_cpu(bph->off_dt_struct);
-	char *p_strings = blob + be32_to_cpu(bph->off_dt_strings);
+		(struct fdt_reserve_entry *)(blob + off_mem_rsvmap);
+	char *p_struct = blob + off_dt;
+	char *p_strings = blob + off_str;
 	uint32_t version = be32_to_cpu(bph->version);
 	uint32_t totalsize = be32_to_cpu(bph->totalsize);
 	uint32_t tag;
@@ -98,8 +100,26 @@
 	depth = 0;
 	shift = 4;
 
-	printf("// Version 0x%x tree\n", version);
-	printf("// Totalsize 0x%x(%d)\n", totalsize, totalsize);
+	printf("// magic:\t\t0x%x\n", be32_to_cpu(bph->magic));
+	printf("// totalsize:\t\t0x%x (%d)\n", totalsize, totalsize);
+	printf("// off_dt_struct:\t0x%x\n", off_dt);
+	printf("// off_dt_strings:\t0x%x\n", off_str);
+	printf("// off_mem_rsvmap:\t0x%x\n", off_mem_rsvmap);
+	printf("// version:\t\t%d\n", version);
+	printf("// last_comp_version:\t%d\n",
+	       be32_to_cpu(bph->last_comp_version));
+	if (version >= 2)
+		printf("// boot_cpuid_phys:\t0x%x\n",
+		       be32_to_cpu(bph->boot_cpuid_phys));
+
+	if (version >= 3)
+		printf("// size_dt_strings:\t0x%x\n",
+		       be32_to_cpu(bph->size_dt_strings));
+	if (version >= 17)
+		printf("// size_dt_struct:\t0x%x\n",
+		       be32_to_cpu(bph->size_dt_struct));
+	printf("\n");
+
 	for (i = 0; ; i++) {
 		addr = be64_to_cpu(p_rsvmap[i].address);
 		size = be64_to_cpu(p_rsvmap[i].size);


-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Re: Outstanding DTC patches?

[Jon Loeliger]

So, like, the other day David Gibson mumbled:
> 
> I posted this one a while back, but I guess it dropped through the
> cracks.

Yep, sorry.

> There's also the patch I sent you quite a long time ago that
> adds a clarifying readme about the licensing situation - that might be
> an idea for v1.1, too.

I can not find this; neither locally nor on patchworks.
Do you have a Subject: line, a URL, or could you
please repost it?


> dtc: Remove header information dumping
> 
> Currently, when used in -Idtb mode, dtc will dump information about
> the input blob's header fields to stderr.  This is kind of ugly, and
> can get in the way of dtc's real output.
> 
> This patch, therefore, removes this.  So that there's still a way of
> getting this information for debugging purposes, it places something
> similar to the removed code into ftdump, replacing the couple of
> header fields it currently prints with a complete header dump.
> 
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

Applied.

Thanks,
jdl

Re: Outstanding DTC patches?

[David Gibson]

On Thu, Jan 03, 2008 at 08:14:53AM -0600, Jon Loeliger wrote:
> So, like, the other day David Gibson mumbled:
> > 
> > I posted this one a while back, but I guess it dropped through the
> > cracks.
> 
> Yep, sorry.
> 
> > There's also the patch I sent you quite a long time ago that
> > adds a clarifying readme about the licensing situation - that might be
> > an idea for v1.1, too.
> 
> I can not find this; neither locally nor on patchworks.
> Do you have a Subject: line, a URL, or could you
> please repost it?

Ah, I think I sent it by private mail, so it won't be in patchwork.
Here you are:

dtc/libfdt: Add README clarifying licensing

The fact the dtc are distributed together, but have different licenses
can be a bit confusing.  Several people have enquired as to what the
deal is with the libfdt licensing, so this patch adds a README
clarifying the situation with a rationale.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

Index: dtc/README.license
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ dtc/README.license	2007-11-02 11:43:19.000000000 +1100
@@ -0,0 +1,56 @@
+Licensing and contribution policy of dtc and libfdt
+===================================================
+
+This dtc package contains two pieces of software: dtc itself, and
+libfdt which comprises the files in the libfdt/ subdirectory.  These
+two pieces of software, although closely related, are quite distinct.
+dtc does not incoporate or rely on libfdt for its operation, nor vice
+versa.  It is important that these two pieces of software have
+different license conditions.
+
+As the copyright banners in each source file attest, dtc is licensed
+under the GNU GPL.  The full text of the GPL can be found in the file
+entitled 'GPL' which should be included in this package.  dtc code,
+therefore, may not be incorporated into works which do not have a GPL
+compatible license.
+
+libfdt, however, is GPL/BSD dual-licensed.  That is, it may be used
+either under the terms of the GPL, or under the terms of the 2-clause
+BSD license (aka the ISC license).  The full terms of that license are
+given in the copyright banners of each of the libfdt source files.
+This is, in practice, equivalent to being BSD licensed, since the
+terms of the BSD license are strictly more permissive than the GPL.
+
+I made the decision to license libfdt in this way because I want to
+encourage widespread and correct usage of flattened device trees,
+including by proprietary or otherwise GPL-incompatible firmware or
+tools.  Allowing libfdt to be used under the terms of the BSD license
+makes that it easier for vendors or authors of such software to do so.
+
+This does mean that libfdt code could be "stolen" - say, included in a
+proprietary fimware and extended without contributing those extensions
+back to the libfdt mainline.  While I hope that doesn't happen, I
+believe the goal of allowing libfdt to be widely used is more
+important than avoiding that.  libfdt is quite small, and hardly
+rocket science; so the incentive for such impolite behaviour is small,
+and the inconvenience caused therby is not dire.
+
+Licenses such as the LGPL which would allow code to be used in non-GPL
+software, but also require contributions to be returned were
+considered.  However, libfdt is designed to be used in firmwares and
+other environments with unusual technical constraints.  It's difficult
+to anticipate all possible changes which might be needed to meld
+libfdt into such environments and so difficult to suitably word a
+license that puts the boundary between what is and isn't permitted in
+the intended place.  Again, I judged encouraging widespread use of
+libfdt by keeping the license terms simple and familiar to be the more
+important goal.
+
+**IMPORTANT** It's intended that all of libfdt as released remain
+permissively licensed this way.  Therefore only contributions which
+are released under these terms can be merged into the libfdt mainline.
+
+
+David Gibson <david@gibson.dropbear.id.au>
+(principal original author of dtc and libfdt)
+2 November 2007


-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Re: Outstanding DTC patches?

[Jon Loeliger]

So, like, the other day David Gibson mumbled:
> Ah, I think I sent it by private mail, so it won't be in patchwork.
> Here you are:

Ah, that explains it.

> dtc/libfdt: Add README clarifying licensing
> 
> The fact the dtc are distributed together, but have different licenses
> can be a bit confusing.  Several people have enquired as to what the
> deal is with the libfdt licensing, so this patch adds a README
> clarifying the situation with a rationale.
> 
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

After correcting the log-message English a bit, it was applied.

    The fact that the dtc and libfdt are distributed together, but have
    different licenses, can be a bit confusing.  Several people have
    enquired as to what the deal is with the libfdt licensing, so this
    patch adds a README clarifying the situation with a rationale.

To be in agreement in the record, I too signed off on that patch.

Objections to either, please let me know!

Thanks,
jdl