diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-02-11 22:07:48 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-02-11 22:07:48 +0100 |
| commit | 0990dc61787ec03b0ae7579a51e5eb661112f13f (patch) | |
| tree | a825f9abe4dcfee295eb637bbaac76c6ffef47ee /include/nand.h | |
| parent | b4116ede36da628a517a94d6cba9dba4a02104a4 (diff) | |
| parent | c17834749279b02f31c1d9ce5ca8427b795bb90d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
* 'master' of git://git.denx.de/u-boot-nand-flash:
nand/fsl_elbc: Convert to self-init
nand: Introduce CONFIG_SYS_NAND_SELF_INIT
nand_spl: store ecc data on the stack
mtd/nand: Add ONFI support for FSL NAND controller
nand: make 1-bit software ECC configurable
nand: Sanitize ONFI strings.
nand: Merge changes to BBT from Linux nand driver
nand: Merge changes from Linux nand driver
nand: cleanup whitespace
nand: Add more NAND types from Linux nand driver
nand: Merge BCH code from Linux nand driver
NAND: Remove additional (CONFIG_SYS)_NAND_MAX_CHIPS
NAND: remove NAND_MAX_CHIPS definitions
nand_spl_simple: store ecc data on the stack
Diffstat (limited to 'include/nand.h')
| -rw-r--r-- | include/nand.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/nand.h b/include/nand.h index d444ddcefe..8b3a1a77a3 100644 --- a/include/nand.h +++ b/include/nand.h @@ -24,13 +24,29 @@ #ifndef _NAND_H_ #define _NAND_H_ +#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) +#define CONFIG_SYS_NAND_SELF_INIT +#endif + extern void nand_init(void); #include <linux/mtd/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> +#ifdef CONFIG_SYS_NAND_SELF_INIT +void board_nand_init(void); +int nand_register(int devnum); +#else extern int board_nand_init(struct nand_chip *nand); +#endif typedef struct mtd_info nand_info_t; |