On Thu, Aug 28, 2014 at 10:53:53AM -0700, Steve Rae wrote: > - update license format > - port dprintf() to debug() > - update formatting > > Signed-off-by: Steve Rae <[email protected]> > --- > > Changes in v2: > - use BSD-3-Clause > > common/aboot.c | 120 > ++++++++++++++++++++++++++------------------------------- > 1 file changed, 55 insertions(+), 65 deletions(-) > > diff --git a/common/aboot.c b/common/aboot.c > index a302c92..351199e 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-3-Clause > */
OK, sorry for the churn. After you pointed out the other differences, I re-asked legal who look a closer look (they started with my "they just changed this one thing..") and do believe the license is GPL compatible but it is NOT BSD-3-Clause. So I think rather than make a one-off tag lets just leave the full text and insert a note saying it's a slightly different wording from normal BSD-3, and we inherit this license as-is from Android. -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
