[PATCH RFC 13/20] nand: Use correct prototype of board_nand_init() with SPL_NAND_SIMPLE

Lubomir Rintel lkundrak at v3.sk
Tue Nov 17 22:00:11 CET 2020


nand_spl_simple.c machinery allways passes a nand_chip argument to
board_nand_init() even if the main u-boot proper uses the
SYS_NAND_SELF_INIT version.

Signed-off-by: Lubomir Rintel <lkundrak at v3.sk>
---
 include/nand.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/nand.h b/include/nand.h
index 80dd6469bc0..cf3a5e91368 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -35,7 +35,7 @@ unsigned long nand_size(void);
 
 int nand_mtd_to_devnum(struct mtd_info *mtd);
 
-#ifdef CONFIG_SYS_NAND_SELF_INIT
+#if defined(CONFIG_SYS_NAND_SELF_INIT) && !CONFIG_IS_ENABLED(NAND_SIMPLE)
 void board_nand_init(void);
 int nand_register(int devnum, struct mtd_info *mtd);
 #else
-- 
2.28.0



More information about the U-Boot mailing list