[U-Boot] [U-Boot, v1, 3/4] cleanup code which handles the Android sparse image format

[Tom Rini]

On Thu, Aug 28, 2014 at 10:24:32AM -0700, Steve Rae wrote:

> OK - AWESOME!
> 
> Can you just update the one line, ( and drop the bsd-3l-clause.txt )
> Or would you like me to submit a "v2" ?

Lets just do a v2 for clarity.

> 
> Thanks, Steve
> 
> 
> On 14-08-28 10:11 AM, Tom Rini wrote:
> >On Sat, Aug 23, 2014 at 10:39:02AM -0700, Steve Rae wrote:
> >
> >>- update license format
> >>- port dprintf() to debug()
> >>- update formatting
> >>
> >>Signed-off-by: Steve Rae <srae at broadcom.com>
> >>---
> >>
> >>  Licenses/bsd-3L-clause.txt |  24 +++++++++
> >>  common/aboot.c             | 120 +++++++++++++++++++++------------------------
> >>  2 files changed, 79 insertions(+), 65 deletions(-)
> >>  create mode 100644 Licenses/bsd-3L-clause.txt
> >>
> >>diff --git a/Licenses/bsd-3L-clause.txt b/Licenses/bsd-3L-clause.txt
> >>new file mode 100644
> >>index 0000000..3a08ce4
> >>--- /dev/null
> >>+++ b/Licenses/bsd-3L-clause.txt
> >>@@ -0,0 +1,24 @@
> >>+Redistribution and use in source and binary forms, with or without
> >>+modification, are permitted provided that the following conditions
> >>+are met:
> >>+1. Redistributions of source code must retain the above copyright
> >>+   notice, this list of conditions and the following disclaimer.
> >>+2. Redistributions in binary form must reproduce the above copyright
> >>+   notice, this list of conditions and the following disclaimer in the
> >>+   documentation and/or other materials provided with the distribution.
> >>+3. Neither the name of The Linux Foundation nor
> >>+   the names of its contributors may be used to endorse or promote
> >>+   products derived from this software without specific prior written
> >>+   permission.
> >>+
> >>+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
> >>+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
> >>+THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> >>+NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
> >>+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
> >>+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
> >>+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
> >>+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
> >>+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> >>+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
> >>+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> >>diff --git a/common/aboot.c b/common/aboot.c
> >>index a302c92..f38fc95 100644
> >>--- a/common/aboot.c
> >>+++ b/common/aboot.c
> >>@@ -3,31 +3,9 @@
> >>   * All rights reserved.
> >>   *
> >>   * Copyright (c) 2009-2014, The Linux Foundation. All rights reserved.
> >>+ * Portions Copyright 2014 Broadcom Corporation.
> >>   *
> >>- * Redistribution and use in source and binary forms, with or without
> >>- * modification, are permitted provided that the following conditions are met:
> >>- *     * Redistributions of source code must retain the above copyright
> >>- *       notice, this list of conditions and the following disclaimer.
> >>- *     * Redistributions in binary form must reproduce the above copyright
> >>- *       notice, this list of conditions and the following disclaimer in the
> >>- *       documentation and/or other materials provided with the distribution.
> >>- *     * Neither the name of The Linux Foundation nor
> >>- *       the names of its contributors may be used to endorse or promote
> >>- *       products derived from this software without specific prior written
> >>- *       permission.
> >>- *
> >>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
> >>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> >>- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> >>- * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
> >>- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
> >>- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
> >>- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
> >>- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> >>- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> >>- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> >>- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> >>- *
> >>+ * SPDX-License-Identifier:	BSD-3L-Clause
> >>   */
> >
> >OK, so I asked around in the legal dept here and the answer was we can
> >just call it BSD-3-Clause in the SPDX-License-Identifier and be OK, so
> >lets do that.
> >
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140828/6138d604/attachment.pgp>