From c70e9fc2337519fc8ef6faca5bccb0e92e68675d Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 15 Feb 2010 23:10:19 +0000 Subject: Various license header consistency fixes (trivial). - Consistently use the same wording and formatting for all license headers. - Remove useless whitespace, add missing whitespace, fix indentation. - Add missing "This file is part of the coreboot project." where needed. - Change "(C) Copyright John Doe" to "Copyright (C) John Doe" for consistency. - Add some missing "(C)" strings and copyright years where needed. - Move random comments and file descriptions out of the license header. - Drop incorrect file descriptions completely (e.g. lpc47m10x/Makefile.inc). There should be no changes in _content_ of the license headers, if you spot such changes that's a bug, please report! Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5127 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/assert.h | 6 +++++- src/include/console/vtxprintf.h | 10 ++++----- src/include/cpu/amd/geode_post_code.h | 35 ++++++++++++++++---------------- src/include/cpu/amd/model_fxx_powernow.h | 5 +++-- src/include/cpu/x86/multiboot.h | 30 ++++++++++++++++----------- src/include/cpu/x86/smm.h | 1 - src/include/lib.h | 2 +- src/include/pc80/vga.h | 26 +++++++++++++----------- src/include/pc80/vga_io.h | 26 +++++++++++++----------- src/include/sdram_mode.h | 6 +++++- 10 files changed, 82 insertions(+), 65 deletions(-) (limited to 'src/include') diff --git a/src/include/assert.h b/src/include/assert.h index 4103291461..6d65ffdbdf 100644 --- a/src/include/assert.h +++ b/src/include/assert.h @@ -1,5 +1,5 @@ /* - * assert.h: Debugging macros + * This file is part of the coreboot project. * * Copyright (C) 2005 Digital Design Corporation * @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +/* + * assert.h: Debugging macros + */ + #ifndef __ASSERT_H_DEFINED #define __ASSERT_H_DEFINED diff --git a/src/include/console/vtxprintf.h b/src/include/console/vtxprintf.h index 4c7c51c375..c949c12115 100644 --- a/src/include/console/vtxprintf.h +++ b/src/include/console/vtxprintf.h @@ -3,10 +3,9 @@ * * Copyright (C) 2009 coresystems GmbH * - * 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; version 2 of - * the License. + * 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; version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,8 +14,7 @@ * * 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., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __CONSOLE_VTXPRINTF_H diff --git a/src/include/cpu/amd/geode_post_code.h b/src/include/cpu/amd/geode_post_code.h index be0b57db2e..9d17fb6c9f 100644 --- a/src/include/cpu/amd/geode_post_code.h +++ b/src/include/cpu/amd/geode_post_code.h @@ -1,21 +1,22 @@ /* -* This file is part of the coreboot project. -* -* Copyright (C) 2007 Advanced Micro Devices -* -* 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. -* -* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ + * This file is part of the coreboot project. + * + * Copyright (C) 2007 Advanced Micro Devices + * + * 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; version 2 of the License. + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + /* standard AMD post definitions -- might as well use them. */ #define POST_Output_Port (0x080) /* port to write post codes to*/ diff --git a/src/include/cpu/amd/model_fxx_powernow.h b/src/include/cpu/amd/model_fxx_powernow.h index 262af2d01b..e270c167a9 100644 --- a/src/include/cpu/amd/model_fxx_powernow.h +++ b/src/include/cpu/amd/model_fxx_powernow.h @@ -4,8 +4,8 @@ * Copyright (C) 2009 Rudolf Marek * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License v2 as published by - * the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,6 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + #ifndef MODEL_FXX_POWERNOW_H #define MODEL_FXX_POWERNOW_H diff --git a/src/include/cpu/x86/multiboot.h b/src/include/cpu/x86/multiboot.h index 74fac15153..c027fd7b55 100644 --- a/src/include/cpu/x86/multiboot.h +++ b/src/include/cpu/x86/multiboot.h @@ -1,20 +1,26 @@ -/* multiboot.h - multiboot header file. */ /* - * Copyright (C) 2003 Free Software Foundation, Inc. - * Copyright (C) 2008 Robert Millan + * This file is part of the coreboot project. * - * 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. + * Copyright (C) 2003 Free Software Foundation, Inc. + * Copyright (C) 2008 Robert Millan * - * 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. + * 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 . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* + * multiboot.h - multiboot header file. */ #ifndef MULTIBOOT_H diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index c4a57470b2..6baefcb2f7 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - /* AMD64 SMM State-Save Area * starts @ 0x7e00 */ diff --git a/src/include/lib.h b/src/include/lib.h index 8afa12880e..d8e4eec2c3 100644 --- a/src/include/lib.h +++ b/src/include/lib.h @@ -1,7 +1,7 @@ /* * This file is part of the coreboot project. * - * Copyright (C) 2009, Myles Watson + * Copyright (C) 2009 Myles Watson * * 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 diff --git a/src/include/pc80/vga.h b/src/include/pc80/vga.h index d4dea873b3..3d757f858d 100644 --- a/src/include/pc80/vga.h +++ b/src/include/pc80/vga.h @@ -1,19 +1,21 @@ /* - * Copyright (C) 2007-2009 Luc Verhaegen + * This file is part of the coreboot project. * - * 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. + * Copyright (C) 2007-2009 Luc Verhaegen * - * 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. + * 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. * - * 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., 51 - * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef VGA_H diff --git a/src/include/pc80/vga_io.h b/src/include/pc80/vga_io.h index 64c62c7697..72411a7868 100644 --- a/src/include/pc80/vga_io.h +++ b/src/include/pc80/vga_io.h @@ -1,19 +1,21 @@ /* - * Copyright (C) 2007 Luc Verhaegen + * This file is part of the coreboot project. * - * 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. + * Copyright (C) 2007 Luc Verhaegen * - * 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. + * 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. * - * 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., 51 - * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef VGA_IO_H diff --git a/src/include/sdram_mode.h b/src/include/sdram_mode.h index 29f3154897..14e9d2560e 100644 --- a/src/include/sdram_mode.h +++ b/src/include/sdram_mode.h @@ -1,5 +1,5 @@ /* - * sdram_mode.h: Definitions for SDRAM Mode Register and Extended Mode Register + * This file is part of the coreboot project. * * Copyright (C) 2005 Digital Design Corporation * @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +/* + * sdram_mode.h: Definitions for SDRAM Mode Register and Extended Mode Register + */ + #ifndef __SDRAMMODE_H_DEFINED #define __SDRAMMODE_H_DEFINED -- cgit v1.2.3