Project import generated by Copybara.
GitOrigin-RevId: e83fa8b811782a36f5c8a90de328d888701f3647
diff --git a/include/nand.h b/include/nand.h
index 735b819..2a19eca 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -1,8 +1,14 @@
-/* SPDX-License-Identifier: GPL-2.0 */
/*
* (C) Copyright 2005
* 2N Telekomunikace, a.s. <www.2n.cz>
* Ladislav Michl <michl@2n.cz>
+ *
+ * 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
+ * version 2 as published by the Free Software Foundation.
*/
#ifndef _NAND_H_
@@ -21,48 +27,45 @@
#endif
#else
#if defined(CONFIG_NAND_FSL_ELBC) || defined(CONFIG_NAND_ATMEL)\
- || defined(CONFIG_NAND_FSL_IFC) || defined(CONFIG_SPI_NAND)\
- || defined(CONFIG_MESON_NFC) || defined(CONFIG_MTD_SPI_NAND)
+ || defined(CONFIG_NAND_FSL_IFC)
#define CONFIG_SYS_NAND_SELF_INIT
#endif
#endif
extern void nand_init(void);
-unsigned long nand_size(void);
#include <linux/compat.h>
#include <linux/mtd/mtd.h>
-#include <linux/mtd/rawnand.h>
-
-int nand_mtd_to_devnum(struct mtd_info *mtd);
+#include <linux/mtd/nand.h>
#ifdef CONFIG_SYS_NAND_SELF_INIT
void board_nand_init(void);
-int nand_register(int devnum, struct mtd_info *mtd);
+int nand_register(int devnum);
#else
extern int board_nand_init(struct nand_chip *nand);
#endif
-extern int nand_curr_device;
+typedef struct mtd_info nand_info_t;
-static inline int nand_read(struct mtd_info *info, loff_t ofs, size_t *len,
- u_char *buf)
+extern int nand_curr_device;
+extern nand_info_t nand_info[];
+
+static inline int nand_read(nand_info_t *info, loff_t ofs, size_t *len, u_char *buf)
{
return mtd_read(info, ofs, *len, (size_t *)len, buf);
}
-static inline int nand_write(struct mtd_info *info, loff_t ofs, size_t *len,
- u_char *buf)
+static inline int nand_write(nand_info_t *info, loff_t ofs, size_t *len, u_char *buf)
{
return mtd_write(info, ofs, *len, (size_t *)len, buf);
}
-static inline int nand_block_isbad(struct mtd_info *info, loff_t ofs)
+static inline int nand_block_isbad(nand_info_t *info, loff_t ofs)
{
return mtd_block_isbad(info, ofs);
}
-static inline int nand_erase(struct mtd_info *info, loff_t off, size_t size)
+static inline int nand_erase(nand_info_t *info, loff_t off, size_t size)
{
struct erase_info instr;
@@ -79,8 +82,34 @@
* 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 */
@@ -98,59 +127,43 @@
typedef struct nand_erase_options nand_erase_options_t;
-int nand_read_skip_bad(struct mtd_info *mtd, loff_t offset, size_t *length,
+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_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(struct mtd_info *mtd, loff_t offset, size_t *length,
+#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 */
+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(struct mtd_info *mtd,
- const nand_erase_options_t *opts);
-int nand_torture(struct mtd_info *mtd, loff_t offset);
-int nand_verify_page_oob(struct mtd_info *mtd, struct mtd_oob_ops *ops,
- loff_t ofs);
-int nand_verify(struct mtd_info *mtd, loff_t ofs, size_t len, u_char *buf);
+int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts);
+int nand_torture(nand_info_t *nand, loff_t offset);
#define NAND_LOCK_STATUS_TIGHT 0x01
#define NAND_LOCK_STATUS_UNLOCK 0x04
-int nand_lock(struct mtd_info *mtd, int tight);
-int nand_unlock(struct mtd_info *mtd, loff_t start, size_t length,
- int allexcept);
-int nand_get_lock_status(struct mtd_info *mtd, loff_t offset);
+int nand_lock(nand_info_t *meminfo, int tight);
+int nand_unlock(nand_info_t *meminfo, loff_t start, size_t length,
+ int allexcept);
+int nand_get_lock_status(nand_info_t *meminfo, loff_t offset);
int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst);
-int nand_spl_read_block(int block, int offset, int len, void *dst);
void nand_deselect(void);
-
+nand_info_t *get_nand_dev_by_index(int dev);
#ifdef CONFIG_SYS_NAND_SELECT_DEVICE
void board_nand_select_device(struct nand_chip *nand, int chip);
#endif
__attribute__((noreturn)) void nand_boot(void);
+#endif
+
#ifdef CONFIG_ENV_OFFSET_OOB
#define ENV_OOB_MARKER 0x30425645 /*"EVB0" in little-endian -- offset is stored
as block number*/
#define ENV_OOB_MARKER_OLD 0x30564e45 /*"ENV0" in little-endian -- offset is
stored as byte number */
#define ENV_OFFSET_SIZE 8
-int get_nand_env_oob(struct mtd_info *mtd, unsigned long *result);
+int get_nand_env_oob(nand_info_t *nand, unsigned long *result);
#endif
int spl_nand_erase_one(int block, int page);
-
-/* platform specific init functions */
-void sunxi_nand_init(void);
-
-/*
- * get_nand_dev_by_index - Get the nand info based in index.
- *
- * @dev - index to the nand device.
- *
- * returns pointer to the nand device info structure or NULL on failure.
- */
-struct mtd_info *get_nand_dev_by_index(int dev);
-
-#endif /* _NAND_H_ */
