Am 14.03.2012 08:56, schrieb Guan Xuetao: > On Wed, 2012-03-14 at 02:39 +0100, Andreas Färber wrote: >> Embed CPUUniCore32State into UniCore32CPU. >> >> Contributed under GPLv2+. >> >> Signed-off-by: Andreas Färber <afaer...@suse.de> >> --- >> Makefile.target | 1 + >> target-unicore32/cpu-qom.h | 72 ++++++++++++++++++++++++++++++++++ >> target-unicore32/cpu.c | 91 >> ++++++++++++++++++++++++++++++++++++++++++++ > I hope the gpl information for cpu.c and cpu-qom.h could be consistent > with other files.
Copy&paste from other cpu-qom.h files. :) I can change it to match the rest of target-unicore32. But speaking of matching licenses, your previous text has "as published by the Free Software Foundation", which I think is a bit safer in theory (no company X can publish a "GPL" v4 of their own and change it to their liking) and would make the change smaller. For example: * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * published by the Free Software Foundation, or (at your option) any + * later version. See the COPYING file in the top-level directory. What do you think? Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
