diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/gt64260.h | 10 | ||||
| -rw-r--r-- | include/asm-ppc/gt64260_defs.h | 10 | ||||
| -rw-r--r-- | include/asm-ppc/harrier.h | 12 | ||||
| -rw-r--r-- | include/asm-ppc/ibm403.h | 35 | ||||
| -rw-r--r-- | include/asm-ppc/ibm405.h | 34 | ||||
| -rw-r--r-- | include/asm-ppc/ibm_ocp_pci.h | 34 | ||||
| -rw-r--r-- | include/asm-ppc/mpc10x.h | 10 | ||||
| -rw-r--r-- | include/asm-ppc/ppc405_dma.h | 18 | ||||
| -rw-r--r-- | include/asm-ppc/pplus.h | 12 | ||||
| -rw-r--r-- | include/asm-ppc/processor.h | 9 | ||||
| -rw-r--r-- | include/asm-ppc/rtc.h | 10 | ||||
| -rw-r--r-- | include/asm-ppc/todc.h | 10 |
12 files changed, 62 insertions, 142 deletions
diff --git a/include/asm-ppc/gt64260.h b/include/asm-ppc/gt64260.h index 90ddb3d457e3..ad55f6af4318 100644 --- a/include/asm-ppc/gt64260.h +++ b/include/asm-ppc/gt64260.h @@ -5,12 +5,10 @@ * * Author: Mark A. Greer <mgreer@mvista.com> * - * Copyright 2001 MontaVista Software Inc. - * - * 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. + * 2001 (c) MontaVista, Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2.1. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. */ #ifndef __ASMPPC_GT64260_H #define __ASMPPC_GT64260_H diff --git a/include/asm-ppc/gt64260_defs.h b/include/asm-ppc/gt64260_defs.h index 3ad58564be78..ed4a6f6dd483 100644 --- a/include/asm-ppc/gt64260_defs.h +++ b/include/asm-ppc/gt64260_defs.h @@ -5,12 +5,10 @@ * * Author: Mark A. Greer <mgreer@mvista.com> * - * Copyright 2001 MontaVista Software Inc. - * - * 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. + * 2001 (c) MontaVista, Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2.1. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. */ #ifndef __ASMPPC_GT64260_DEFS_H #define __ASMPPC_GT64260_DEFS_H diff --git a/include/asm-ppc/harrier.h b/include/asm-ppc/harrier.h index ec0f19901ff7..162302f27157 100644 --- a/include/asm-ppc/harrier.h +++ b/include/asm-ppc/harrier.h @@ -1,17 +1,15 @@ /* - * arch/ppc/kernel/harrier.h + * include/asm-ppc/harrier.h * * Definitions for Motorola MCG Harrier North Bridge & Memory controller * * Author: Dale Farnsworth * dale.farnsworth@mvista.com * - * Copyright 2001 MontaVista Software Inc. - * - * 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. + * 2001 (c) MontaVista, Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2.1. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. */ #ifndef __ASMPPC_HARRIER_H diff --git a/include/asm-ppc/ibm403.h b/include/asm-ppc/ibm403.h index 83515ab507c5..15257f554e92 100644 --- a/include/asm-ppc/ibm403.h +++ b/include/asm-ppc/ibm403.h @@ -1,35 +1,10 @@ /* - * ibm403.h + * Authors: Armin Kuster <akuster@mvista.com> and Tom Rini <trini@mvista.com> * - * This was derived from the ibm4xx.h and all 403 specific definitions - * were moved here. - * - * Armin Kuster <akuster@mvista.com> - * Tom Rini <trini@mvista.com> - * Oct, 2001 - * - * - * Copyright 2001 MontaVista Softare Inc. - * - * 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 SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR 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. - * - * 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., - * 675 Mass Ave, Cambridge, MA 02139, USA. + * 2001 (c) MontaVista, Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2.1. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. */ diff --git a/include/asm-ppc/ibm405.h b/include/asm-ppc/ibm405.h index f12ae76a5e69..e6dd4db97f7a 100644 --- a/include/asm-ppc/ibm405.h +++ b/include/asm-ppc/ibm405.h @@ -1,34 +1,10 @@ /* - * ibm405.h + * Author: Armin Kuster <akuster@mvista.com> * - * This was derived from the ppc4xx.h and contains - * common 405 offsets - * - * Armin Kuster akuster@pacbell.net - * Jan, 2002 - * - * - * Copyright 2002 MontaVista Softare Inc. - * - * 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 SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR 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. - * - * 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., - * 675 Mass Ave, Cambridge, MA 02139, USA. + * 2002 (c) MontaVista, Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2.1. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. */ #ifdef __KERNEL__ diff --git a/include/asm-ppc/ibm_ocp_pci.h b/include/asm-ppc/ibm_ocp_pci.h index c6a66e5d141c..0c554beae306 100644 --- a/include/asm-ppc/ibm_ocp_pci.h +++ b/include/asm-ppc/ibm_ocp_pci.h @@ -1,34 +1,10 @@ /* - * ibm_ocp_pci.h + * Author: Armin Kuster <akuster@mvista.com> * - * This was derived from the ibm_ocp.h - * - * Current Maintainer - * Armin Kuster akuster@mvista.com - * AUg, 2002 - * - * - * Copyright 2001-2002 MontaVista Softare Inc. - * - * 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 SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR 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. - * - * 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., - * 675 Mass Ave, Cambridge, MA 02139, USA. + * 2001-2002 (c) MontaVista, Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2.1. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. */ #ifdef __KERNEL__ diff --git a/include/asm-ppc/mpc10x.h b/include/asm-ppc/mpc10x.h index d2676d8f8088..b7ad80afced7 100644 --- a/include/asm-ppc/mpc10x.h +++ b/include/asm-ppc/mpc10x.h @@ -7,12 +7,10 @@ * Author: Mark A. Greer * mgreer@mvista.com * - * Copyright 2001 MontaVista Software Inc. - * - * 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. + * 2001 (c) MontaVista, Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2.1. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. */ #ifndef __PPC_KERNEL_MPC10X_H #define __PPC_KERNEL_MPC10X_H diff --git a/include/asm-ppc/ppc405_dma.h b/include/asm-ppc/ppc405_dma.h index eabdb2502e4a..69b17da1c504 100644 --- a/include/asm-ppc/ppc405_dma.h +++ b/include/asm-ppc/ppc405_dma.h @@ -1,17 +1,13 @@ /* + * Author: Pete Popov <ppopov@mvista.com> * - * Copyright 2000 MontaVista Software Inc. - * PPC405 modifications - * Author: MontaVista Software, Inc. - * ppopov@mvista.com or source@mvista.com - * - * - * Module name: ppc405_dma.h - * - * Description: - * Data structures specific to the IBM PowerPC 405 on-chip DMA controller - * and API. + * 2000 (c) MontaVista, Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2.1. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. * + * Data structures specific to the IBM PowerPC 405 on-chip DMA controller + * and API. */ #ifdef __KERNEL__ diff --git a/include/asm-ppc/pplus.h b/include/asm-ppc/pplus.h index fd2bb02d7af1..4d00aae691be 100644 --- a/include/asm-ppc/pplus.h +++ b/include/asm-ppc/pplus.h @@ -1,17 +1,15 @@ /* - * arch/ppc/kernel/pplus.h + * include/asm-ppc/pplus.h * * Definitions for Motorola MCG Falcon/Raven & HAWK North Bridge & Memory ctlr. * * Author: Mark A. Greer * mgreer@mvista.com * - * Copyright 2001 MontaVista Software Inc. - * - * 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. + * 2001 (c) MontaVista, Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2.1. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. */ #ifndef __ASMPPC_PPLUS_H diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index b958da9e3c13..8692d5cb2c6c 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -50,7 +50,11 @@ #else #define MSR_ (MSR_ME|MSR_RI) #endif +#ifdef CONFIG_4xx +#define MSR_KERNEL (MSR_|MSR_IR|MSR_DR|MSR_CE|MSR_DE) +#else #define MSR_KERNEL (MSR_|MSR_IR|MSR_DR) +#endif #define MSR_USER (MSR_KERNEL|MSR_PR|MSR_EE) /* Floating Point Status and Control Register (FPSCR) Fields */ @@ -159,6 +163,7 @@ #define SPRN_DBCR1 0x3BD /* Debug Control Register 1 */ #define SPRN_DBSR 0x3F0 /* Debug Status Register */ #define DBSR_IC 0x80000000 /* Instruction Completion */ +#define DBSR_BT 0x40000000 /* Branch taken */ #define DBSR_TIE 0x10000000 /* Trap Instruction debug Event */ #define SPRN_DCCR 0x3FA /* Data Cache Cacheability Register */ #define DCCR_NOCACHE 0 /* Noncacheable */ @@ -642,6 +647,10 @@ struct thread_struct { void *pgdir; /* root of page-table tree */ int fpexc_mode; /* floating-point exception mode */ signed long last_syscall; +#ifdef CONFIG_4xx + unsigned long dbcr0; /* debug control register values */ + unsigned long dbcr1; +#endif double fpr[32]; /* Complete floating point set */ unsigned long fpscr_pad; /* fpr ... fpscr must be contiguous */ unsigned long fpscr; /* Floating point status */ diff --git a/include/asm-ppc/rtc.h b/include/asm-ppc/rtc.h index 8421a2e5156c..ef83cf06a9af 100644 --- a/include/asm-ppc/rtc.h +++ b/include/asm-ppc/rtc.h @@ -1,9 +1,13 @@ /* * inclue/asm-ppc/rtc.h * - * Copyright 2002 MontaVista Software Inc. * Author: Tom Rini <trini@mvista.com> * + * 2002 (c) MontaVista, Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2.1. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. + * * Based on: * include/asm-m68k/rtc.h * @@ -16,10 +20,6 @@ * * With additional work by Paul Mackerras and Franz Sirl. */ -/* permission is hereby granted to copy, modify and redistribute this code - * in terms of the GNU Library General Public License, Version 2 or later, - * at your option. - */ #ifndef __ASM_RTC_H__ #define __ASM_RTC_H__ diff --git a/include/asm-ppc/todc.h b/include/asm-ppc/todc.h index 3f72c47e09bf..518e5b272715 100644 --- a/include/asm-ppc/todc.h +++ b/include/asm-ppc/todc.h @@ -7,12 +7,10 @@ * Author: Mark A. Greer * mgreer@mvista.com * - * Copyright 2001 MontaVista Software Inc. - * - * 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. + * 2001 (c) MontaVista, Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2.1. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. */ /* |
