From c26e454dfc6650428854fa2db3b1ed7f19e0ba0e Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 18 Apr 2004 10:13:26 +0000
Subject: Patches by Pantelis Antoniou, 16 Apr 2004: - add support for a new
 version of an Intracom board and fix   various other things on others. - add
 verify support to the crc32 command (define   CONFIG_CRC32_VERIFY to enable
 it) - fix FEC driver for MPC8xx systems:   1. fix compilation problems for
 boards that use dynamic      allocation of DPRAM   2. shut down FEC after
 network transfers - HUSH parser fixes:   1. A new test command was added.
 This is a simplified version of      the one in the bourne shell.   2. A new
 exit command was added which terminates the current      executing script.  
 3. Fixed handing of $? (exit code of last executed command)

---
 board/netphone/flash.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'board/netphone/flash.c')

diff --git a/board/netphone/flash.c b/board/netphone/flash.c
index a1c87f5131..adbc28e101 100644
--- a/board/netphone/flash.c
+++ b/board/netphone/flash.c
@@ -41,6 +41,9 @@ unsigned long flash_init(void)
 	volatile immap_t *immap = (immap_t *) CFG_IMMR;
 	volatile memctl8xx_t *memctl = &immap->im_memctl;
 	unsigned long size;
+#if CONFIG_NETPHONE_VERSION == 2
+	unsigned long size1;
+#endif
 	int i;
 
 	/* Init: no FLASHes known */
@@ -82,6 +85,25 @@ unsigned long flash_init(void)
 
 	flash_info[0].size = size;
 
+#if CONFIG_NETPHONE_VERSION == 2
+	size1 = flash_get_size((vu_long *) FLASH_BASE4_PRELIM, &flash_info[1]);
+
+	if (flash_info[1].flash_id == FLASH_UNKNOWN && size1 > 0) {
+		printf("## Unknown FLASH on Bank 1 - Size = 0x%08lx = %ld MB\n", size1, size1 << 20);
+	}
+
+	/* Remap FLASH according to real size */
+	memctl->memc_or4 = CFG_OR_TIMING_FLASH | (-size1 & 0xFFFF8000);
+	memctl->memc_br4 = (CFG_FLASH_BASE4 & BR_BA_MSK) | (memctl->memc_br4 & ~(BR_BA_MSK));
+
+	/* Re-do sizing to get full correct info */
+	size1 = flash_get_size((vu_long *) CFG_FLASH_BASE4, &flash_info[1]);
+
+	flash_get_offsets(CFG_FLASH_BASE4, &flash_info[1]);
+
+	size += size1;
+#endif
+
 	return (size);
 }
 
-- 
cgit v1.2.3