From: Steve Sakoman <steve@sakoman.com>
Date: Thu, 16 Sep 2010 05:19:48 +0000 (-0700)
Subject: Beagle, Overo: Don't call nand/onenand functions unless the appropriate CFG option... 
X-Git-Tag: v1.5.0~63
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af54caf9d9cdde3065589cd755c331df1ad498a4;p=pandora-x-loader.git

Beagle, Overo: Don't call nand/onenand functions unless the appropriate CFG option is enabled
---

diff --git a/board/omap3530beagle/omap3530beagle.c b/board/omap3530beagle/omap3530beagle.c
index 1b3d8c7..322ddc6 100644
--- a/board/omap3530beagle/omap3530beagle.c
+++ b/board/omap3530beagle/omap3530beagle.c
@@ -955,6 +955,7 @@ int nand_init(void)
 	__raw_writel(0 , GPMC_CONFIG7 + GPMC_CONFIG_CS0);
 	delay(1000);
 
+#ifdef CFG_NAND_K9F1G08R0A
 	if ((get_mem_type() == GPMC_NAND) || (get_mem_type() == MMC_NAND)) {
 		__raw_writel(M_NAND_GPMC_CONFIG1, GPMC_CONFIG1 + GPMC_CONFIG_CS0);
 		__raw_writel(M_NAND_GPMC_CONFIG2, GPMC_CONFIG2 + GPMC_CONFIG_CS0);
@@ -975,9 +976,10 @@ int nand_init(void)
 #endif
 			return 1;
 		}
-
 	}
+#endif
 
+#ifdef CFG_ONENAND
 	if ((get_mem_type() == GPMC_ONENAND) || (get_mem_type() == MMC_ONENAND)) {
 		__raw_writel(ONENAND_GPMC_CONFIG1, GPMC_CONFIG1 + GPMC_CONFIG_CS0);
 		__raw_writel(ONENAND_GPMC_CONFIG2, GPMC_CONFIG2 + GPMC_CONFIG_CS0);
@@ -999,6 +1001,7 @@ int nand_init(void)
 			return 1;
 		}
 	}
+#endif
 	return 0;
 }
 
diff --git a/board/overo/overo.c b/board/overo/overo.c
index 1a6477f..4ca1ecf 100644
--- a/board/overo/overo.c
+++ b/board/overo/overo.c
@@ -1053,6 +1053,7 @@ int nand_init(void)
 	__raw_writel(0 , GPMC_CONFIG7 + GPMC_CONFIG_CS0);
 	delay(1000);
 
+#ifdef CFG_NAND_K9F1G08R0A
 	if ((get_mem_type() == GPMC_NAND) || (get_mem_type() == MMC_NAND)) {
 		__raw_writel(M_NAND_GPMC_CONFIG1, GPMC_CONFIG1 + GPMC_CONFIG_CS0);
 		__raw_writel(M_NAND_GPMC_CONFIG2, GPMC_CONFIG2 + GPMC_CONFIG_CS0);
@@ -1073,9 +1074,10 @@ int nand_init(void)
 #endif
 			return 1;
 		}
-
 	}
+#endif
 
+#ifdef CFG_ONENAND
 	if ((get_mem_type() == GPMC_ONENAND) || (get_mem_type() == MMC_ONENAND)) {
 		__raw_writel(ONENAND_GPMC_CONFIG1, GPMC_CONFIG1 + GPMC_CONFIG_CS0);
 		__raw_writel(ONENAND_GPMC_CONFIG2, GPMC_CONFIG2 + GPMC_CONFIG_CS0);
@@ -1097,6 +1099,8 @@ int nand_init(void)
 			return 1;
 		}
 	}
+#endif
+
 	return 0;
 }