diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-08-28 00:17:41 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-08-28 00:17:41 +0200 |
| commit | 5928da0193d31f52f4a5b9f6ed3d3f0390ffd2c1 (patch) | |
| tree | cbd840fb27b43725aa1475fea7a5418fc2a37186 /include | |
| parent | ce3277a6f2c082f39596d3d3d88dd0a5bc91439d (diff) | |
| parent | 77b351cd0f20483eefa09bebebb3e0cbf5555b2c (diff) | |
| download | talos-obmc-uboot-5928da0193d31f52f4a5b9f6ed3d3f0390ffd2c1.tar.gz talos-obmc-uboot-5928da0193d31f52f4a5b9f6ed3d3f0390ffd2c1.zip | |
Merge branch 'next' of git://git.denx.de/u-boot-nand-flash into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-davinci/emif_defs.h | 10 | ||||
| -rw-r--r-- | include/configs/kmeter1.h | 6 | ||||
| -rw-r--r-- | include/linux/mtd/nand.h | 5 |
3 files changed, 19 insertions, 2 deletions
diff --git a/include/asm-arm/arch-davinci/emif_defs.h b/include/asm-arm/arch-davinci/emif_defs.h index 646fc77469..c91e30c8fc 100644 --- a/include/asm-arm/arch-davinci/emif_defs.h +++ b/include/asm-arm/arch-davinci/emif_defs.h @@ -55,6 +55,16 @@ typedef struct { dv_reg NANDF2ECC; dv_reg NANDF3ECC; dv_reg NANDF4ECC; + u_int8_t RSVD2[60]; + dv_reg NAND4BITECCLOAD; + dv_reg NAND4BITECC1; + dv_reg NAND4BITECC2; + dv_reg NAND4BITECC3; + dv_reg NAND4BITECC4; + dv_reg NANDERRADD1; + dv_reg NANDERRADD2; + dv_reg NANDERRVAL1; + dv_reg NANDERRVAL2; } emif_registers; typedef emif_registers *emifregs; diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 869fd4ca1a..79d8638fe2 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -324,6 +324,12 @@ #define CONFIG_SYS_DTT_HYSTERESIS 3 #define CONFIG_SYS_DTT_BUS_NUM (CONFIG_SYS_MAX_I2C_BUS) +#if defined(CONFIG_CMD_NAND) +#define CONFIG_NAND_KMETER1 +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE CONFIG_SYS_PIGGY_BASE +#endif + #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI #endif diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 3e0044b94f..cb7c19a439 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -128,6 +128,7 @@ typedef enum { NAND_ECC_SOFT, NAND_ECC_HW, NAND_ECC_HW_SYNDROME, + NAND_ECC_HW_OOB_FIRST, } nand_ecc_modes_t; /* @@ -268,13 +269,13 @@ struct nand_ecc_ctrl { uint8_t *calc_ecc); int (*read_page_raw)(struct mtd_info *mtd, struct nand_chip *chip, - uint8_t *buf); + uint8_t *buf, int page); void (*write_page_raw)(struct mtd_info *mtd, struct nand_chip *chip, const uint8_t *buf); int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip, - uint8_t *buf); + uint8_t *buf, int page); int (*read_subpage)(struct mtd_info *mtd, struct nand_chip *chip, uint32_t offs, uint32_t len, |
