From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 26 Dec 2012 19:51:11 +0000 (+0000)
Subject: MIPS: BCM47XX: nvram add nand flash support
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c4485671fbbb6fc453c2fb2dbb4bfc374770b0e7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

MIPS: BCM47XX: nvram add nand flash support

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Patchwork: http://patchwork.linux-mips.org/patch/4741/
Signed-off-by: John Crispin <blogic@openwrt.org>
---

diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
index 80e352e0c995..42e527121314 100644
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
@@ -30,6 +30,7 @@ static int nvram_find_and_copy(u32 base, u32 lim)
 	u32 off;
 	u32 *src, *dst;
 
+	/* TODO: when nvram is on nand flash check for bad blocks first. */
 	off = FLASH_MIN;
 	while (off <= lim) {
 		/* Windowed flash access */
@@ -88,6 +89,12 @@ static int nvram_init_bcma(void)
 	u32 base;
 	u32 lim;
 
+#ifdef CONFIG_BCMA_NFLASH
+	if (cc->nflash.boot) {
+		base = BCMA_SOC_FLASH1;
+		lim = BCMA_SOC_FLASH1_SZ;
+	} else
+#endif
 	if (cc->pflash.present) {
 		base = cc->pflash.window;
 		lim = cc->pflash.window_size;