CPCI4052: Remove CONFIG_SYS_LONGHELP

[karo-tx-uboot.git] / include / nand.h

diff --git a/include/nand.h b/include/nand.h
index 2b62ef777e7df87917194f79bb6b7a8db037daf1..f4b217904e20182c1945b75a94c1bfbb1922b433 100644 (file)
--- a/include/nand.h
+++ b/include/nand.h
@@ -16,16 +16,6 @@
 
 #include <config.h>
 
-/*
- * All boards using a given driver must convert to self-init
- * at the same time, so do it here.  When all drivers are
- * converted, this will go away.
- */
-#if defined(CONFIG_NAND_FSL_ELBC) || defined(CONFIG_NAND_ATMEL)\
-       || defined(CONFIG_NAND_FSL_IFC) || defined(CONFIG_NAND_MXC)
-#define CONFIG_SYS_NAND_SELF_INIT
-#endif
-
 extern void nand_init(void);
 
 #include <linux/compat.h>
@@ -76,34 +66,8 @@ static inline int nand_erase(nand_info_t *info, loff_t off, size_t size)
  * declarations from nand_util.c
  ****************************************************************************/
 
-struct nand_write_options {
-       u_char *buffer;         /* memory block containing image to write */
-       ulong length;           /* number of bytes to write */
-       ulong offset;           /* start address in NAND */
-       int quiet;              /* don't display progress messages */
-       int autoplace;          /* if true use auto oob layout */
-       int forcejffs2;         /* force jffs2 oob layout */
-       int forceyaffs;         /* force yaffs oob layout */
-       int noecc;              /* write without ecc */
-       int writeoob;           /* image contains oob data */
-       int pad;                /* pad to page size */
-       int blockalign;         /* 1|2|4 set multiple of eraseblocks
-                                * to align to */
-};
-
-typedef struct nand_write_options nand_write_options_t;
 typedef struct mtd_oob_ops mtd_oob_ops_t;
 
-struct nand_read_options {
-       u_char *buffer;         /* memory block in which read image is written*/
-       ulong length;           /* number of bytes to read */
-       ulong offset;           /* start address in NAND */
-       int quiet;              /* don't display progress messages */
-       int readoob;            /* put oob data in image */
-};
-
-typedef struct nand_read_options nand_read_options_t;
-
 struct nand_erase_options {
        loff_t length;          /* number of bytes to erase */
        loff_t offset;          /* first address in NAND to erase */
@@ -124,15 +88,16 @@ typedef struct nand_erase_options nand_erase_options_t;
 int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
                       size_t *actual, loff_t lim, u_char *buffer);
 
-#define WITH_YAFFS_OOB (1 << 0) /* whether write with yaffs format. This flag
-                                 * is a 'mode' meaning it cannot be mixed with
-                                 * other flags */
-#define WITH_DROP_FFS  (1 << 1) /* drop trailing all-0xff pages */
+#define WITH_DROP_FFS  (1 << 0) /* drop trailing all-0xff pages */
+#define WITH_WR_VERIFY (1 << 1) /* verify data was written correctly */
 
 int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
                        size_t *actual, loff_t lim, u_char *buffer, int flags);
 int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts);
 int nand_torture(nand_info_t *nand, loff_t offset);
+int nand_verify_page_oob(nand_info_t *nand, struct mtd_oob_ops *ops,
+                       loff_t ofs);
+int nand_verify(nand_info_t *nand, loff_t ofs, size_t len, u_char *buf);
 
 #define NAND_LOCK_STATUS_TIGHT 0x01
 #define NAND_LOCK_STATUS_UNLOCK 0x04
@@ -161,3 +126,4 @@ __attribute__((noreturn)) void nand_boot(void);
 #define ENV_OFFSET_SIZE 8
 int get_nand_env_oob(nand_info_t *nand, unsigned long *result);
 #endif
+int spl_nand_erase_one(int block, int page);