From: oharboe Date: Fri, 29 Feb 2008 12:37:45 +0000 (+0000) Subject: Uwe Hermann: X-Git-Tag: v0.1.0~893 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=6d3bed69dc023f49b51b6504d977463e722e9e9d Uwe Hermann: Small cosmetic fixes in the license header to make them all look the same, fix some typos, update README. git-svn-id: svn://svn.berlios.de/openocd/trunk@396 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- diff --git a/README b/README index 588f3ea632..3c5b637c5a 100644 --- a/README +++ b/README @@ -112,7 +112,7 @@ Support for Intel XScale CPUs is also included: - IXP42x And support for the Marvell Feroceon CPU core as found in the -Orion SOC family is included as well. +Orion SoC family is included as well. 3. Host platforms @@ -125,6 +125,9 @@ AMD64-Linux, Alpha-Linux, ARM-Linux, and PowerPC OS-X. Documentation for the OpenOCD is hosted in the Berlios OpenFacts Wiki at http://openfacts.berlios.de/index-en.phtml?title=Open_On-Chip_Debugger. +There is also and openocd(1) manpage, the 'openocd --help' output and +an OpenOCD info page (type 'info openocd'). + 5. Licensing OpenOCD is licensed under the terms of the GNU General Public License, see the diff --git a/src/flash/nand.c b/src/flash/nand.c index d0e1d8df4b..f01b94c29c 100644 --- a/src/flash/nand.c +++ b/src/flash/nand.c @@ -2,10 +2,8 @@ * Copyright (C) 2007 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * partially based on * - * drivers/mtd/nand_ids.c * - * * - * Copyright (C) 2002 Thomas Gleixner (tglx@linutronix.de) * + * Partially based on drivers/mtd/nand_ids.c from Linux. * + * Copyright (C) 2002 Thomas Gleixner * * * * 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/flash/nand.h b/src/flash/nand.h index cb18b0c8c2..d0dd757984 100644 --- a/src/flash/nand.h +++ b/src/flash/nand.h @@ -2,12 +2,10 @@ * Copyright (C) 2007 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * partially based on * - * linux/include/linux/mtd/nand.h * - * * - * Copyright (c) 2000 David Woodhouse * - * Steven J. Hill * - * Thomas Gleixner * + * Partially based on linux/include/linux/mtd/nand.h * + * Copyright (C) 2000 David Woodhouse * + * Copyright (C) 2000 Steven J. Hill * + * Copyright (C) 2000 Thomas Gleixner * * * * 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/flash/s3c2410_nand.c b/src/flash/s3c2410_nand.c index 436eb156a6..352d38498d 100644 --- a/src/flash/s3c2410_nand.c +++ b/src/flash/s3c2410_nand.c @@ -1,14 +1,26 @@ -/* src/flash/s3c2410_nand.c - * +/*************************************************************************** + * Copyright (C) 2007, 2008 by Ben Dooks * + * ben@fluff.org * + * * + * 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. * + ***************************************************************************/ + +/* * S3C2410 OpenOCD NAND Flash controller support. * - * Copyright 2007,2008 Ben Dooks - * - * 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. - * * Many thanks to Simtec Electronics for sponsoring this work. */ diff --git a/src/flash/s3c2412_nand.c b/src/flash/s3c2412_nand.c index 1ddcff04ea..5d2b85c6d8 100644 --- a/src/flash/s3c2412_nand.c +++ b/src/flash/s3c2412_nand.c @@ -1,14 +1,26 @@ -/* src/flash/s3c2412_nand.c - * +/*************************************************************************** + * Copyright (C) 2007, 2008 by Ben Dooks * + * ben@fluff.org * + * * + * 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. * + ***************************************************************************/ + +/* * S3C2412 OpenOCD NAND Flash controller support. * - * Copyright 2007,2008 Ben Dooks - * - * 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. - * * Many thanks to Simtec Electronics for sponsoring this work. */ diff --git a/src/flash/s3c2440_nand.c b/src/flash/s3c2440_nand.c index a6b9b04d7d..dc64ad6d2b 100644 --- a/src/flash/s3c2440_nand.c +++ b/src/flash/s3c2440_nand.c @@ -1,14 +1,26 @@ -/* src/flash/s3c2440_nand.c - * +/*************************************************************************** + * Copyright (C) 2007, 2008 by Ben Dooks * + * ben@fluff.org * + * * + * 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. * + ***************************************************************************/ + +/* * S3C2440 OpenOCD NAND Flash controller support. * - * Copyright 2007,2008 Ben Dooks - * - * 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. - * * Many thanks to Simtec Electronics for sponsoring this work. */ diff --git a/src/flash/s3c2443_nand.c b/src/flash/s3c2443_nand.c index a66f158d6e..5b685c904e 100644 --- a/src/flash/s3c2443_nand.c +++ b/src/flash/s3c2443_nand.c @@ -1,18 +1,29 @@ -/* src/flash/s3c2443_nand.c - * +/*************************************************************************** + * Copyright (C) 2007, 2008 by Ben Dooks * + * ben@fluff.org * + * * + * 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. * + ***************************************************************************/ + +/* * S3C2443 OpenOCD NAND Flash controller support. * - * Copyright 2007,2008 Ben Dooks - * - * 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. - * * Many thanks to Simtec Electronics for sponsoring this work. */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/flash/s3c24xx_nand.c b/src/flash/s3c24xx_nand.c index 6bde224fa3..21633c94c7 100644 --- a/src/flash/s3c24xx_nand.c +++ b/src/flash/s3c24xx_nand.c @@ -1,14 +1,26 @@ -/* src/flash/s3c24xx_nand.c - * +/*************************************************************************** + * Copyright (C) 2007, 2008 by Ben Dooks * + * ben@fluff.org * + * * + * 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. * + ***************************************************************************/ + +/* * S3C24XX Series OpenOCD NAND Flash controller support. * - * Copyright 2007,2008 Ben Dooks - * - * 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. - * * Many thanks to Simtec Electronics for sponsoring this work. */ diff --git a/src/flash/s3c24xx_nand.h b/src/flash/s3c24xx_nand.h index f419352636..d77bafe558 100644 --- a/src/flash/s3c24xx_nand.h +++ b/src/flash/s3c24xx_nand.h @@ -1,14 +1,26 @@ -/* src/flash/s3c24xx_nand.h - * +/*************************************************************************** + * Copyright (C) 2007, 2008 by Ben Dooks * + * ben@fluff.org * + * * + * 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. * + ***************************************************************************/ + +/* * S3C24XX Series OpenOCD NAND Flash controller support. * - * Copyright 2007,2008 Ben Dooks - * - * 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. - * * Many thanks to Simtec Electronics for sponsoring this work. */ diff --git a/src/flash/s3c24xx_regs_nand.h b/src/flash/s3c24xx_regs_nand.h index d742205ac1..7d295d8082 100644 --- a/src/flash/s3c24xx_regs_nand.h +++ b/src/flash/s3c24xx_regs_nand.h @@ -1,19 +1,30 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-nand.h - * - * Copyright (c) 2004,2005 Simtec Electronics - * http://www.simtec.co.uk/products/SWLINUX/ - * - * 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. - * +/*************************************************************************** + * Copyright (C) 2004, 2005 by Simtec Electronics * + * linux@simtec.co.uk * + * http://www.simtec.co.uk/products/SWLINUX/ * + * * + * 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., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +/* * S3C2410 NAND register definitions -*/ + */ #ifndef __ASM_ARM_REGS_NAND #define __ASM_ARM_REGS_NAND "$Id: nand.h,v 1.3 2003/12/09 11:36:29 ben Exp $" - #define S3C2410_NFREG(x) (x) #define S3C2410_NFCONF S3C2410_NFREG(0x00) @@ -117,7 +128,5 @@ #define S3C2412_NFECCERR_MULTIBIT (2) #define S3C2412_NFECCERR_ECCAREA (3) - - #endif /* __ASM_ARM_REGS_NAND */ diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c index dc9de7425a..2eca290cb7 100644 --- a/src/flash/stellaris.c +++ b/src/flash/stellaris.c @@ -1,7 +1,7 @@ /*************************************************************************** * Copyright (C) 2006 by Magnus Lundin * - * lundin@mlu.mine.nu * - * * + * lundin@mlu.mine.nu * + * * * 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 * @@ -20,10 +20,7 @@ /*************************************************************************** * STELLARIS is tested on LM3S811 -* -* -* - ***************************************************************************/ +***************************************************************************/ #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/flash/stellaris.h b/src/flash/stellaris.h index 8024258ea4..4ea1fe5aaf 100644 --- a/src/flash/stellaris.h +++ b/src/flash/stellaris.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Magnus Lundin * - * lundinªmlu.mine.nu * + * lundin@mlu.mine.nu * * * * 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/flash/tms470.c b/src/flash/tms470.c index 55adfd81dc..cfbb072d78 100644 --- a/src/flash/tms470.c +++ b/src/flash/tms470.c @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Copyright 2007, 2008 by Christopher Kilgour * + * Copyright (C) 2007,2008 by Christopher Kilgour * * techie |_at_| whiterocker |_dot_| com * * * * This program is free software; you can redistribute it and/or modify * @@ -17,7 +17,6 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/flash/tms470.h b/src/flash/tms470.h index ad5108d190..ad569bbbc7 100644 --- a/src/flash/tms470.h +++ b/src/flash/tms470.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Copyright 2007, 2008 by Christopher Kilgour * + * Copyright (C) 2007,2008 by Christopher Kilgour * * techie |_at_| whiterocker |_dot_| com * * * * This program is free software; you can redistribute it and/or modify * @@ -17,7 +17,6 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ - #ifndef TMS470_DOT_H #define TMS470_DOT_H diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c index d0011f0ddf..ba43aa4c65 100644 --- a/src/jtag/usbprog.c +++ b/src/jtag/usbprog.c @@ -1,14 +1,6 @@ /*************************************************************************** - * Copyright (C) 2007 by Benedikt Sauter sauter@ixbat.de * - * based on Dominic Rath's amt_jtagaccel.c * - * * - * usbprog is a free programming adapter. You can easily install * - * different firmware versions from an "online pool" over USB. * - * The adapter can be used for programming and debugging AVR and ARM * - * processors, as USB to RS232 converter, as JTAG interface or as * - * simple I/O interface (5 lines). * - * * - * http://www.embedded-projects.net/usbprog * + * Copyright (C) 2007 by Benedikt Sauter * + * sauter@ixbat.de * * * * 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 * @@ -25,6 +17,19 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + +/* + * This file is based on Dominic Rath's amt_jtagaccel.c. + * + * usbprog is a free programming adapter. You can easily install + * different firmware versions from an "online pool" over USB. + * The adapter can be used for programming and debugging AVR and ARM + * processors, as USB to RS232 converter, as JTAG interface or as + * simple I/O interface (5 lines). + * + * http://www.embedded-projects.net/usbprog + */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/target/arm11.c b/src/target/arm11.c index 05b6112e87..85068a1119 100644 --- a/src/target/arm11.c +++ b/src/target/arm11.c @@ -16,7 +16,6 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/target/arm11.h b/src/target/arm11.h index 9c1bcd0677..0b203325ac 100644 --- a/src/target/arm11.h +++ b/src/target/arm11.h @@ -16,7 +16,6 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ - #ifndef ARM11_H #define ARM11_H diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c index 97ec2fba0e..72d4ee04a5 100644 --- a/src/target/arm11_dbgtap.c +++ b/src/target/arm11_dbgtap.c @@ -16,7 +16,6 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/target/armv7m.c b/src/target/armv7m.c index bed3948547..2f82a6f15b 100644 --- a/src/target/armv7m.c +++ b/src/target/armv7m.c @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * + * * * Copyright (C) 2006 by Magnus Lundin * * lundin@mlu.mine.nu * * * diff --git a/src/target/armv7m.h b/src/target/armv7m.h index 0059b18d0d..946264c4af 100644 --- a/src/target/armv7m.h +++ b/src/target/armv7m.h @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * + * * * Copyright (C) 2006 by Magnus Lundin * * lundin@mlu.mine.nu * * * diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c index bdb405039d..8e8665bc44 100644 --- a/src/target/cortex_m3.c +++ b/src/target/cortex_m3.c @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * + * * * Copyright (C) 2006 by Magnus Lundin * * lundin@mlu.mine.nu * * * diff --git a/src/target/cortex_m3.h b/src/target/cortex_m3.h index 0ed3b0adb1..d04923f954 100644 --- a/src/target/cortex_m3.h +++ b/src/target/cortex_m3.h @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * + * * * Copyright (C) 2006 by Magnus Lundin * * lundin@mlu.mine.nu * * * diff --git a/src/target/cortex_swjdp.c b/src/target/cortex_swjdp.c index 160f4c53f5..81ff6f993c 100644 --- a/src/target/cortex_swjdp.c +++ b/src/target/cortex_swjdp.c @@ -22,7 +22,7 @@ * CoreSight (Light?) SerialWireJtagDebugPort * * * * CoreSight™ DAP-Lite TRM, ARM DDI 0316A * - * Cortex-M3™ TRM, ARM DDI 0337C * + * Cortex-M3™ TRM, ARM DDI 0337C * * * ***************************************************************************/ #ifdef HAVE_CONFIG_H diff --git a/src/target/feroceon.c b/src/target/feroceon.c index 9e200d626c..5346a14d10 100644 --- a/src/target/feroceon.c +++ b/src/target/feroceon.c @@ -1,26 +1,26 @@ +/*************************************************************************** + * Copyright (C) 2008 by Marvell Semiconductors, Inc. * + * Written by Nicolas Pitre * + * * + * 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. * + ***************************************************************************/ + /* * Marvell Feroceon (88F5182, 88F5281) support. * - * Copyright (C) 2008 Marvell Semiconductors, Inc. - * Written by Nicolas Pitre - * - * 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. - */ - -/* * The Feroceon core mimics the ARM926 ICE interface with the following * differences: * diff --git a/src/target/target_request.h b/src/target/target_request.h index 0547c1d3bb..487ce3465b 100644 --- a/src/target/target_request.h +++ b/src/target/target_request.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007 by Dominic Rath * + * Copyright (C) 2007 by Dominic Rath * * Dominic.Rath@gmx.de * * * * This program is free software; you can redistribute it and/or modify *