[U-Boot] [PATCH 3/3] Blackfin: enable delayed NAND for all relevant boards

[Mike Frysinger]

Now that the NAND is initialized only when used, we can enable support
for it in boards that may have conflicting runtime requirements.  This
saves on the hassle of recompiling with different settings.

Signed-off-by: Mike Frysinger <vapier at gentoo.org>
---
 include/configs/bf526-ezbrd.h       |    7 +------
 include/configs/bf527-ad7160-eval.h |    4 ----
 include/configs/bf527-ezkit.h       |    6 +-----
 include/configs/bf537-stamp.h       |    2 +-
 include/configs/bf548-ezkit.h       |    2 +-
 include/configs/bfin_adi_common.h   |    1 +
 include/configs/cm-bf527.h          |   11 +++++------
 7 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index 4c30c25..efa320e 100644
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -58,27 +58,22 @@
 
 /*
  * NAND Settings
- * (can't be used same time as ethernet)
  */
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
-# define CONFIG_BFIN_NFC
 # define CONFIG_BFIN_NFC_BOOTROM_ECC
 #endif
-#ifdef CONFIG_BFIN_NFC
 #define CONFIG_BFIN_NFC_CTL_VAL	0x0033
 #define CONFIG_DRIVER_NAND_BFIN
 #define CONFIG_SYS_NAND_BASE		0 /* not actually used */
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define NAND_MAX_CHIPS		1
-#define CONFIG_CMD_NAND
-#endif
 
 
 /*
  * Network Settings
  */
 #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) && \
-    !defined(__ADSPBF524__) && !defined(__ADSPBF525__) && !defined(CONFIG_BFIN_NFC)
+    !defined(__ADSPBF524__) && !defined(__ADSPBF525__)
 #define ADI_CMDS_NETWORK	1
 #define CONFIG_BFIN_MAC
 #define CONFIG_RMII
diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h
index 14ade1b..22e6502 100644
--- a/include/configs/bf527-ad7160-eval.h
+++ b/include/configs/bf527-ad7160-eval.h
@@ -57,19 +57,15 @@
 
 /*
  * NAND Settings
- * (can't be used same time as ethernet)
  */
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
-# define CONFIG_BFIN_NFC
 # define CONFIG_BFIN_NFC_BOOTROM_ECC
 #endif
-#ifdef CONFIG_BFIN_NFC
 #define CONFIG_BFIN_NFC_CTL_VAL	0x0033
 #define CONFIG_DRIVER_NAND_BFIN
 #define CONFIG_SYS_NAND_BASE		0 /* not actually used */
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define NAND_MAX_CHIPS		1
-#endif
 
 
 /*
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index 54fc063..2105468 100644
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -57,26 +57,22 @@
 
 /*
  * NAND Settings
- * (can't be used same time as ethernet)
  */
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
-# define CONFIG_BFIN_NFC
 # define CONFIG_BFIN_NFC_BOOTROM_ECC
 #endif
-#ifdef CONFIG_BFIN_NFC
 #define CONFIG_BFIN_NFC_CTL_VAL	0x0033
 #define CONFIG_DRIVER_NAND_BFIN
 #define CONFIG_SYS_NAND_BASE		0 /* not actually used */
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define NAND_MAX_CHIPS		1
-#endif
 
 
 /*
  * Network Settings
  */
 #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) && \
-    !defined(__ADSPBF524__) && !defined(__ADSPBF525__) && !defined(CONFIG_BFIN_NFC)
+    !defined(__ADSPBF524__) && !defined(__ADSPBF525__)
 #define ADI_CMDS_NETWORK	1
 #define CONFIG_BFIN_MAC
 #define CONFIG_RMII
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 22d3150..61f8f1a 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -145,7 +145,7 @@
 /*
  * NAND Settings
  */
-/* #define CONFIG_NAND_PLAT */
+#define CONFIG_NAND_PLAT
 #define CONFIG_SYS_NAND_BASE		0x20212000
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 4412177..c883896 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -124,10 +124,10 @@
 /*
  * NAND Settings
  */
-#define CONFIG_BFIN_NFC_CTL_VAL	0x0033
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
 # define CONFIG_BFIN_NFC_BOOTROM_ECC
 #endif
+#define CONFIG_BFIN_NFC_CTL_VAL	0x0033
 #define CONFIG_DRIVER_NAND_BFIN
 #define CONFIG_SYS_NAND_BASE		0 /* not actually used */
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 608788a..83597ec 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -48,6 +48,7 @@
 # if defined(CONFIG_NAND_PLAT) || defined(CONFIG_DRIVER_NAND_BFIN)
 #  define CONFIG_CMD_NAND
 #  define CONFIG_CMD_NAND_LOCK_UNLOCK
+#  undef CONFIG_NAND_MAYBE_EARLY_INIT
 # endif
 # ifdef CONFIG_POST
 #  define CONFIG_CMD_DIAG
diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index 84c9309..2bf830e 100644
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -60,23 +60,22 @@
 
 /*
  * NAND Settings
- * (can't be used sametime as ethernet)
  */
-/* #define CONFIG_BFIN_NFC */
-#ifdef CONFIG_BFIN_NFC
+#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
+# define CONFIG_BFIN_NFC_BOOTROM_ECC
+#endif
 #define CONFIG_BFIN_NFC_CTL_VAL	0x0033
+#define CONFIG_DRIVER_NAND_BFIN
 #define CONFIG_SYS_NAND_BASE		0 /* not actually used */
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define NAND_MAX_CHIPS		1
-#define CONFIG_CMD_NAND
-#endif
 
 
 /*
  * Network Settings
  */
 #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) && \
-    !defined(__ADSPBF524__) && !defined(__ADSPBF525__) && !defined(CONFIG_BFIN_NFC)
+    !defined(__ADSPBF524__) && !defined(__ADSPBF525__)
 #define ADI_CMDS_NETWORK	1
 #define CONFIG_BFIN_MAC
 #define CONFIG_RMII
-- 
1.7.3.1