diff options
| author | Tom Rini <trini@ti.com> | 2014-03-10 14:22:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-10 14:22:54 -0400 |
| commit | 5495dae7aa9d5cd161e07174d38acac86515c58a (patch) | |
| tree | 848c7f48688aeb5ada1fe221dc5dff4729561814 /include/nand.h | |
| parent | c0d297946fd2540c8057eb1589429978da888dbb (diff) | |
| parent | 27019e4a949fc3be2e895ac20839c4d4d119f902 (diff) | |
| download | olio-uboot-2014.01-5495dae7aa9d5cd161e07174d38acac86515c58a.tar.xz olio-uboot-2014.01-5495dae7aa9d5cd161e07174d38acac86515c58a.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/nand.h')
| -rw-r--r-- | include/nand.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/nand.h b/include/nand.h index 84116f493..fc735d1ec 100644 --- a/include/nand.h +++ b/include/nand.h @@ -21,10 +21,16 @@ * at the same time, so do it here. When all drivers are * converted, this will go away. */ +#ifdef CONFIG_SPL_BUILD +#if defined(CONFIG_NAND_FSL_ELBC) || defined(CONFIG_NAND_FSL_IFC) +#define CONFIG_SYS_NAND_SELF_INIT +#endif +#else #if defined(CONFIG_NAND_FSL_ELBC) || defined(CONFIG_NAND_ATMEL)\ || defined(CONFIG_NAND_FSL_IFC) #define CONFIG_SYS_NAND_SELF_INIT #endif +#endif extern void nand_init(void); |