summaryrefslogtreecommitdiff
path: root/include/nand.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-12-13 06:12:36 +0300
committerTom Rini <trini@konsulko.com>2021-12-28 00:20:18 +0300
commit068c41f1cc777caf0221da63b0264249d73c2eba (patch)
treef4885eb56e4bd99e9b69bb22c126de0de63ce876 /include/nand.h
parentbfb5387fe91cc881b4b22218e9a40713b222675b (diff)
downloadu-boot-068c41f1cc777caf0221da63b0264249d73c2eba.tar.xz
Finish conversion CONFIG_SYS_NAND_SELF_INIT to Kconfig
In order to finish this conversion we need to add a symbols for SPL_SYS_NAND_SELF_INIT and TPL_SYS_NAND_SELF_INIT as there are cases there where we need to, or need to not, use that framework as things stand. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/nand.h')
-rw-r--r--include/nand.h18
1 files changed, 1 insertions, 17 deletions
diff --git a/include/nand.h b/include/nand.h
index 09dbda4e81..70c1286ccb 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -10,22 +10,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.
- */
-#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);
unsigned long nand_size(void);
@@ -34,7 +18,7 @@ unsigned long nand_size(void);
int nand_mtd_to_devnum(struct mtd_info *mtd);
-#ifdef CONFIG_SYS_NAND_SELF_INIT
+#if CONFIG_IS_ENABLED(SYS_NAND_SELF_INIT)
void board_nand_init(void);
int nand_register(int devnum, struct mtd_info *mtd);
#else