Ping? On Tue, 2014-06-17 at 12:19 +0100, Ian Campbell wrote: > On Fri, 2014-06-13 at 07:42 +0100, Ian Campbell wrote: > > Hi Alejandro, > > I think yours is the last Ack which is needed for this change. Sorry to > be a pain. > > Cheers, > Ian. > > > I'd like to package sunxi-tools for Debian and therefore it is important for > > the licensing information to be complete/accurate. I believe the intention > > was > > for everything here to be GPL2+ by default, since that is the license on > > every > > file which has one and COPYING contains GPL2. > > > > Early on the license applied to this repo was GPLv3 however this was > > changed to > > GPL2+ by Alejandro in 79ea14d4e050 at which point he had been the only > > contributor. > > > > This patch adds the standard GPL2+ stanza used already in sunxi-tools.git or > > the MIT license stanza when requested by the copyright holder to various > > files > > which were missing one as follows: > > > > adb-devprobe.sh > > fel-gpio > > According to git all of these were written by Henrik. Copyright years > > according to git. Henrik requested that these be put under an MIT > > license, > > so that is what has been done. > > > > boot_head.lds > > fel-pio.lds > > fel-sdboot.lds > > jtag-loop.lds > > According to git all of these were written by Henrik. Copyright years > > according to git. According to Henrik "These linker scripts are all > > GPLv2+ > > as the C / ASM sources they refer to". > > > > include/endian_compat.h > > The content of this file was originally added to fel.c (commit > > c71ff92c02d3), which had a GPL2+ stanza at the time, by Eric Molitor > > and later > > those lines were moved by Alejandro (commit bcde0fc72170) into this > > file. > > I originally added GPL2+ from fel.c and added Eric's copyright with the > > correct year according to git but Eric said "Ack but also would prefer > > MIT/Dual :)", so it has now been changed to MIT. > > > > include/types.h: > > Henrik originally added some of these lines to bootinfo.c, along with a > > GPL2+ stanza, in the original version (commit c26e5ff80af6). Later on > > Alejandro moved them into this file (commit 329a13ed75e5) and added > > more. > > I've copied the stanza from bootinfo.c and added both copyrights with > > the > > years according to git. Authors: > > Henrik, who says "OK". > > Alejandro Mery > > > > Makefile: > > GPL2+ with copyrights and years according to git. Authors are: > > Alejandro Mery > > Henrik Nordstrom, who says "Yes" > > Pat Wood, who says "Fine with me" > > > > usb-boot: > > Henrik is the primary author, added MIT license on Henrik's request with > > his copyright and years according to git. Authors are: > > Henrik Nordstrom, who says "Yes, that too should be MIT" > > Alejandro Mery (typo fix) > > Michal Suchanek (typo fix) > > > > Everyone affected by the above is CCd. > > > > This probably seems pretty obvious to most people, sorry for being so > > pedantic > > about it. It will save hassel when it comes to getting it into Debian > > though. > > > > Cc: Henrik Nordstrom <[email protected]> > > Cc: Eric Molitor <[email protected]> > > Cc: Alejandro Mery <[email protected]> > > Cc: Pat Wood <[email protected]> > > Cc: Michal Suchanek <[email protected]> > > --- > > v2: Gathered feedback from the authors > > - Pat said "Fine with me" > > - Henrik asked that adb-devprobe.sh, fel-gpio and usb-boot be MIT, acked > > *.lds, types.h and Makefile > > - Explicitly listed authors of Makefile and usb-boot > > - Michal Suchanek make a typo fix to usb-boot but wasn't CCd, sorry. > > - Reworded commit message due to some bits now being MIT on request of the > > author. > > --- > > Makefile | 18 ++++++++++++++++++ > > adb-devprobe.sh | 20 ++++++++++++++++++++ > > boot_head.lds | 16 ++++++++++++++++ > > fel-gpio | 20 ++++++++++++++++++++ > > fel-pio.lds | 16 ++++++++++++++++ > > fel-sdboot.lds | 16 ++++++++++++++++ > > include/endian_compat.h | 24 +++++++++++++++++++++++- > > include/types.h | 20 ++++++++++++++++++++ > > jtag-loop.lds | 16 ++++++++++++++++ > > usb-boot | 17 +++++++++++++++++ > > 10 files changed, 182 insertions(+), 1 deletion(-) > > > > diff --git a/Makefile b/Makefile > > index ea8480f..f58bced 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -1,3 +1,21 @@ > > +# Copyright (C) 2012 Alejandro Mery <[email protected]> > > +# Copyright (C) 2012,2013 Henrik Nordstrom <[email protected]> > > +# Copyright (C) 2013 Patrick Wood <[email protected]> > > +# Copyright (C) 2013 Pat Wood <[email protected]> > > +# > > +# This program is free software: you can redistribute it and/or modify > > +# it under the terms of the GNU General Public License as published by > > +# the Free Software Foundation, either version 2 of the License, or > > +# (at your option) any later version. > > +# > > +# This program is distributed in the hope that it will be useful, > > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > +# GNU General Public License for more details. > > +# > > +# You should have received a copy of the GNU General Public License > > +# along with this program. If not, see <http://www.gnu.org/licenses/>. > > + > > CC = gcc > > CFLAGS = -g -O0 -Wall -Wextra > > CFLAGS += -std=c99 -D_POSIX_C_SOURCE=200112L > > diff --git a/adb-devprobe.sh b/adb-devprobe.sh > > index 0494aa6..dae6175 100755 > > --- a/adb-devprobe.sh > > +++ b/adb-devprobe.sh > > @@ -1,5 +1,25 @@ > > #!/bin/bash > > > > +# Copyright (C) 2012 Henrik Nordstrom <[email protected]> > > +# > > +# Permission is hereby granted, free of charge, to any person obtaining a > > copy > > +# of this software and associated documentation files (the "Software"), to > > deal > > +# in the Software without restriction, including without limitation the > > rights > > +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > > +# copies of the Software, and to permit persons to whom the Software is > > +# furnished to do so, subject to the following conditions: > > +# > > +# The above copyright notice and this permission notice shall be included > > in > > +# all copies or substantial portions of the Software. > > +# > > +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS > > OR > > +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > > +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > > THE > > +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > > +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > > FROM, > > +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > > +# THE SOFTWARE. > > + > > adb shell insmod /vendor/modules/sunxi-dbgreg.ko >/dev/null > > > > dump_io() > > diff --git a/boot_head.lds b/boot_head.lds > > index d650bc0..278f530 100644 > > --- a/boot_head.lds > > +++ b/boot_head.lds > > @@ -1,3 +1,19 @@ > > +/* > > + * Copyright (C) 2012 Henrik Nordstrom <[email protected]> > > + * > > + * This program is free software: you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License as published by > > + * the Free Software Foundation, either version 2 of the License, or > > + * (at your option) any later version. > > + * > > + * This program is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + * > > + * You should have received a copy of the GNU General Public License > > + * along with this program. If not, see <http://www.gnu.org/licenses/>. > > + */ > > SECTIONS > > { > > . = 0x40007000; > > diff --git a/fel-gpio b/fel-gpio > > index 11bb194..daf9a26 100755 > > --- a/fel-gpio > > +++ b/fel-gpio > > @@ -1,5 +1,25 @@ > > #!/bin/sh -e > > > > +# Copyright (C) 2012,2013 Henrik Nordstrom <[email protected]> > > +# > > +# Permission is hereby granted, free of charge, to any person obtaining a > > copy > > +# of this software and associated documentation files (the "Software"), to > > deal > > +# in the Software without restriction, including without limitation the > > rights > > +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > > +# copies of the Software, and to permit persons to whom the Software is > > +# furnished to do so, subject to the following conditions: > > +# > > +# The above copyright notice and this permission notice shall be included > > in > > +# all copies or substantial portions of the Software. > > +# > > +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS > > OR > > +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > > +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > > THE > > +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > > +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > > FROM, > > +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > > +# THE SOFTWARE. > > + > > pio_to_sram=0x2000 > > sram_to_pio=0x2004 > > > > diff --git a/fel-pio.lds b/fel-pio.lds > > index 790ff1f..618070c 100644 > > --- a/fel-pio.lds > > +++ b/fel-pio.lds > > @@ -1,3 +1,19 @@ > > +/* > > + * Copyright (C) 2012 Henrik Nordstrom <[email protected]> > > + * > > + * This program is free software: you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License as published by > > + * the Free Software Foundation, either version 2 of the License, or > > + * (at your option) any later version. > > + * > > + * This program is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + * > > + * You should have received a copy of the GNU General Public License > > + * along with this program. If not, see <http://www.gnu.org/licenses/>. > > + */ > > SECTIONS > > { > > . = 0x2000; > > diff --git a/fel-sdboot.lds b/fel-sdboot.lds > > index 7f476f4..67bff97 100644 > > --- a/fel-sdboot.lds > > +++ b/fel-sdboot.lds > > @@ -1,3 +1,19 @@ > > +/* > > + * Copyright (C) 2012 Henrik Nordstrom <[email protected]> > > + * > > + * This program is free software: you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License as published by > > + * the Free Software Foundation, either version 2 of the License, or > > + * (at your option) any later version. > > + * > > + * This program is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + * > > + * You should have received a copy of the GNU General Public License > > + * along with this program. If not, see <http://www.gnu.org/licenses/>. > > + */ > > SECTIONS > > { > > . = 0x0030; > > diff --git a/include/endian_compat.h b/include/endian_compat.h > > index f141371..e463a52 100644 > > --- a/include/endian_compat.h > > +++ b/include/endian_compat.h > > @@ -1,7 +1,29 @@ > > +/* > > + * Copyright (C) 2012 Eric Molitor <[email protected]> > > + * > > + * Permission is hereby granted, free of charge, to any person obtaining a > > copy > > + * of this software and associated documentation files (the "Software"), > > to deal > > + * in the Software without restriction, including without limitation the > > rights > > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or > > sell > > + * copies of the Software, and to permit persons to whom the Software is > > + * furnished to do so, subject to the following conditions: > > + * > > + * The above copyright notice and this permission notice shall be included > > in > > + * all copies or substantial portions of the Software. > > + * > > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS > > OR > > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > > THE > > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > > FROM, > > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > > IN > > + * THE SOFTWARE. > > + */ > > + > > #ifndef SUNXI_ENDIAN_COMPAT_H_ > > #define SUNXI_ENDIAN_COMPAT_H_ > > > > -#ifdef __APPLE__ > > +#ifdef __APPLE__ > > #include <CoreFoundation/CoreFoundation.h> > > #define htole32(x) CFSwapInt32HostToLittle(x) > > #define le32toh(x) CFSwapInt32LittleToHost(x) > > diff --git a/include/types.h b/include/types.h > > index ebf5f15..de37eae 100644 > > --- a/include/types.h > > +++ b/include/types.h > > @@ -1,3 +1,23 @@ > > +/* > > + * (C) Copyright 2012 Henrik Nordstrom <[email protected]> > > + * (C) Copyright 2012 Alejandro Mery <[email protected]> > > + * > > + * This program is free software; you can redistribute it and/or > > + * modify it under the terms of the GNU General Public License as > > + * published by the Free Software Foundation; either version 2 of > > + * the License, or (at your option) any later version. > > + * > > + * This program is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + * > > + * You should have received a copy of the GNU General Public License > > + * along with this program; if not, write to the Free Software > > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > > + * MA 02111-1307 USA > > + */ > > + > > #ifndef SUNXI_TYPES_H > > #define SUNXI_TYPES_H > > > > diff --git a/jtag-loop.lds b/jtag-loop.lds > > index 7f476f4..67bff97 100644 > > --- a/jtag-loop.lds > > +++ b/jtag-loop.lds > > @@ -1,3 +1,19 @@ > > +/* > > + * Copyright (C) 2012 Henrik Nordstrom <[email protected]> > > + * > > + * This program is free software: you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License as published by > > + * the Free Software Foundation, either version 2 of the License, or > > + * (at your option) any later version. > > + * > > + * This program is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + * > > + * You should have received a copy of the GNU General Public License > > + * along with this program. If not, see <http://www.gnu.org/licenses/>. > > + */ > > SECTIONS > > { > > . = 0x0030; > > diff --git a/usb-boot b/usb-boot > > index be2d80a..68ea5c9 100755 > > --- a/usb-boot > > +++ b/usb-boot > > @@ -1,4 +1,21 @@ > > #!/bin/sh -e > > + > > +# Copyright (C) 2013 Henrik Nordstrom <[email protected]> > > +# Copyright (C) 2013 Alejandro Mery <[email protected]> > > +# > > +# This program is free software: you can redistribute it and/or modify > > +# it under the terms of the GNU General Public License as published by > > +# the Free Software Foundation, either version 2 of the License, or > > +# (at your option) any later version. > > +# > > +# This program is distributed in the hope that it will be useful, > > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > +# GNU General Public License for more details. > > +# > > +# You should have received a copy of the GNU General Public License > > +# along with this program. If not, see <http://www.gnu.org/licenses/>. > > + > > top=/usr/share/sunxi-tools/ > > if [ $# -lt 2 ]; then > > echo "Usage: $0 u-boot-spl.bin u-boot.bin [boot.scr] [kernel script.bin > > [initramfs]]" > > -- > > 1.9.0 > > > >
-- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
