diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/NETVIA.h | 3 | ||||
| -rw-r--r-- | include/linux/mtd/nand.h | 6 | ||||
| -rw-r--r-- | include/lynxkdi.h | 41 | ||||
| -rw-r--r-- | include/mpc8xx.h | 10 |
4 files changed, 50 insertions, 10 deletions
diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h index 4e213de..8221a19 100644 --- a/include/configs/NETVIA.h +++ b/include/configs/NETVIA.h @@ -386,8 +386,7 @@ /* NAND */ #define CFG_NAND_BASE NAND_BASE - -#define CONFIG_MTD_NAND_ECC_JFFS2 1 +#define CONFIG_MTD_NAND_ECC_JFFS2 #define CFG_MAX_NAND_DEVICE 1 diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index d37055f..bb13431 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -5,7 +5,7 @@ * Steven J. Hill <sjhill@cotw.com> * Thomas Gleixner <gleixner@autronix.de> * - * $Id: nand.h,v 1.13 2002/04/28 13:40:41 gleixner Exp $ + * $Id: nand.h,v 1.7 2003/07/24 23:30:46 a0384864 Exp $ * * 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 @@ -174,8 +174,8 @@ struct nand_flash_dev { #define NAND_NOOB_ECCPOS1 1 #define NAND_NOOB_ECCPOS2 2 #define NAND_NOOB_ECCPOS3 3 -#define NAND_NOOB_ECCPOS4 4 -#define NAND_NOOB_ECCPOS5 5 +#define NAND_NOOB_ECCPOS4 6 +#define NAND_NOOB_ECCPOS5 7 #define NAND_NOOB_BADBPOS -1 #define NAND_NOOB_ECCVPOS -1 diff --git a/include/lynxkdi.h b/include/lynxkdi.h new file mode 100644 index 0000000..fbf7617 --- /dev/null +++ b/include/lynxkdi.h @@ -0,0 +1,41 @@ +/* + * (C) Copyright 2003 + * Orbacom Systems, Inc. + * + * See file CREDITS for list of people who contributed to this + * 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. + * + * 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 __LYNXKDI_H__ +#define __LYNXKDI_H__ + + +/* Boot parameter struct passed to kernel + */ +typedef struct lynxos_bootparms_t { + uint8_t rsvd1[2]; /* Reserved */ + uint8_t ethaddr[6]; /* Ethernet address */ + uint16_t flags; /* Boot flags */ + uint32_t rate; /* System frequency */ + uint32_t clock_ref; /* Time reference */ + uint32_t dramsz; /* DRAM size */ + uint32_t rsvd2; /* Reserved */ +} lynxos_bootparms_t; + + +#endif /* __LYNXKDI_H__ */ diff --git a/include/mpc8xx.h b/include/mpc8xx.h index e74d146..3650643 100644 --- a/include/mpc8xx.h +++ b/include/mpc8xx.h @@ -135,15 +135,15 @@ * PLPRCR - PLL, Low-Power, and Reset Control Register 15-30 */ #ifdef CONFIG_MPC866_et_al -#define PLPRCR_MF_MSK 0xffff0000 /* Multiplication factor bits */ +#define PLPRCR_MF_MSK 0xffff001e /* Multiplication factor + PDF bits */ #define PLPRCR_MFN_MSK 0xf8000000 /* Multiplication factor numerator bits */ #define PLPRCR_MFN_SHIFT 0x0000001b /* Multiplication factor numerator shift*/ #define PLPRCR_MFD_MSK 0x03c00000 /* Multiplication factor denominator bits */ #define PLPRCR_MFD_SHIFT 0x00000017 /* Multiplication factor denominator shift*/ -#define PLPRCR_S_MSK 0x00300000 /* Multiplication factor integer bits */ -#define PLPRCR_S_SHIFT 0x00000014 /* Multiplication factor integer shift*/ -#define PLPRCR_MFI_MSK 0x000f0000 /* Multiplication factor integer bits */ -#define PLPRCR_MFI_SHIFT 0x00000010 /* Multiplication factor integer shift*/ +#define PLPRCR_S_MSK 0x00300000 /* Multiplication factor integer bits */ +#define PLPRCR_S_SHIFT 0x00000014 /* Multiplication factor integer shift */ +#define PLPRCR_MFI_MSK 0x000f0000 /* Multiplication factor integer bits */ +#define PLPRCR_MFI_SHIFT 0x00000010 /* Multiplication factor integer shift */ #else #define PLPRCR_MF_MSK 0xfff00000 /* Multiplication factor bits */ #define PLPRCR_MF_SHIFT 0x00000014 /* Multiplication factor shift value */ |