Convert CONFIG_TPL_NAND_INIT to Kconfig

This converts the following to Kconfig:
   CONFIG_TPL_NAND_INIT

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index d75f371c951ff0f6ef0f5fd2ff6827ff87d21ac7..4129a33866bf492b3ef90063441e914e3e2483ed 100644 (file)
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -23,6 +23,9 @@ config TPL_SYS_NAND_SELF_INIT
          This option, if enabled, provides more flexible and linux-like
          NAND initialization process, in SPL.
 
+config TPL_NAND_INIT
+       bool
+
 config SYS_NAND_DRIVER_ECC_LAYOUT
        bool "Omit standard ECC layouts to save space"
        help
@@ -165,6 +168,7 @@ config NAND_FSL_ELBC_DT
 config NAND_FSL_IFC
        bool "Support Freescale Integrated Flash Controller NAND driver"
        select TPL_SYS_NAND_SELF_INIT if TPL_NAND_SUPPORT
+       select TPL_NAND_INIT if TPL && !TPL_FRAMEWORK
        select SPL_SYS_NAND_SELF_INIT
        select SYS_NAND_SELF_INIT
        select FSL_IFC

diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile
index 6ec3581d20e919704621432d76e4f5c5a2936ee0..e3f6b903f75f9ec52730bc80bd55c26c4e536f6d 100644 (file)
--- a/drivers/mtd/nand/raw/Makefile
+++ b/drivers/mtd/nand/raw/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o
 obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o
 obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o
 obj-$(CONFIG_SPL_NAND_IDENT) += nand_ids.o nand_timings.o
-obj-$(CONFIG_SPL_NAND_INIT) += nand.o
+obj-$(CONFIG_TPL_NAND_INIT) += nand.o
 ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
 obj-$(CONFIG_ENV_IS_IN_NAND) += nand_util.o
 endif

diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c
index b7e37416a49b8d0c27ed10be5773f476eba219c6..4d11922a65038c7e03c5a5796f95e7549a00c6d8 100644 (file)
--- a/drivers/mtd/nand/raw/fsl_ifc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c
@@ -297,7 +297,7 @@ void nand_boot(void)
        uboot();
 }
 
-#ifndef CONFIG_SPL_NAND_INIT
+#ifndef CONFIG_TPL_NAND_INIT
 void nand_init(void)
 {
 }

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 9024df1adcfd58b579fa2be88e141804f46e3ef7..ead53556615763886d3dc2deae2d13189db76a44 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -50,7 +50,6 @@
 #define CONFIG_SYS_NAND_U_BOOT_START   0x00200000
 #else
 #ifdef CONFIG_TPL_BUILD
-#define CONFIG_SPL_NAND_INIT
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
 #define CONFIG_SYS_NAND_U_BOOT_SIZE    (576 << 10)
 #define CONFIG_SYS_NAND_U_BOOT_DST     (0x11000000)

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index b68082c41105133d32249d94bf56173690e77ed1..849a0b8cb6497bec5bb633137c7168ee0e626bef 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -93,7 +93,6 @@
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
 #elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
-#define CONFIG_SPL_NAND_INIT
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
 #define CONFIG_SYS_NAND_U_BOOT_SIZE    (832 << 10)
 #define CONFIG_SYS_NAND_U_BOOT_DST     (0x11000000)