diff options
| author | Scott Wood <scottwood@freescale.com> | 2008-07-09 17:47:52 -0500 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2008-07-09 17:47:52 -0500 |
| commit | 9d2e3947b2944e5bb85b4335533f8c93c58445fe (patch) | |
| tree | 7752d1fc2acebc03dc949bd65b49812fb2457c58 | |
| parent | 99c2b434d37863df5dda5207a53760c6506fc2be (diff) | |
| download | u-boot-imx-9d2e3947b2944e5bb85b4335533f8c93c58445fe.zip u-boot-imx-9d2e3947b2944e5bb85b4335533f8c93c58445fe.tar.gz u-boot-imx-9d2e3947b2944e5bb85b4335533f8c93c58445fe.tar.bz2 | |
NAND: ifdef-protect most of nand.h when using legacy NAND.
Some macros such as NAND_CTL_SETALE conflict between current and legacy
NAND, being defined by the subsystem in the former case and the board
config file in the latter.
Signed-off-by: Scott Wood <scottwood@freescale.com>
| -rw-r--r-- | include/nand.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/nand.h b/include/nand.h index 247d346..e1285cd 100644 --- a/include/nand.h +++ b/include/nand.h @@ -24,6 +24,9 @@ #ifndef _NAND_H_ #define _NAND_H_ +extern void nand_init(void); + +#ifndef CFG_NAND_LEGACY #include <linux/mtd/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> @@ -32,7 +35,6 @@ typedef struct mtd_info nand_info_t; extern int nand_curr_device; extern nand_info_t nand_info[]; -extern void nand_init(void); static inline int nand_read(nand_info_t *info, off_t ofs, size_t *len, u_char *buf) { @@ -122,4 +124,5 @@ int nand_get_lock_status(nand_info_t *meminfo, ulong offset); void board_nand_select_device(struct nand_chip *nand, int chip); #endif +#endif /* !CFG_NAND_LEGACY */ #endif |