nand: Remove unused read/write structures

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

diff --git a/include/nand.h b/include/nand.h
index 84116f493722e41d1cd808c2005802ccf07782c0..51a77344c563c5490c05777b6c95d9d2964a1b27 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)
-#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 */
@@ -161,3 +125,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);