From subversion@balloonboard.org Wed Mar 10 14:53:34 2010
Received: from cmjones by stoneboat.aleph1.co.uk with local (Exim 4.69)
	(envelope-from <subversion@balloonboard.org>) id 1NpNHy-0004EM-IC
	for balloon-svn@balloonboard.org; Wed, 10 Mar 2010 14:53:34 +0000
Date: Wed, 10 Mar 2010 14:53:34 +0000
To: balloon-svn@balloonboard.org
From: subversion@balloonboard.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <E1NpNHy-0004EM-IC@stoneboat.aleph1.co.uk>
X-SA-Exim-Connect-IP: <locally generated>
X-SA-Exim-Mail-From: subversion@balloonboard.org
X-SA-Exim-Scanned: No (on stoneboat.aleph1.co.uk);
	SAEximRunCond expanded to false
Subject: [Balloon-svn] r1013 - balloon/branches/novlio/bootldr
X-BeenThere: balloon-svn@balloonboard.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: <balloon-svn.balloonboard.org>
List-Unsubscribe: <http://balloonboard.org/cgi-bin/mailman/options/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=unsubscribe>
List-Archive: <http://balloonboard.org/lurker/list/balloon-svn.html>
List-Post: <mailto:balloon-svn@balloonboard.org>
List-Help: <mailto:balloon-svn-request@balloonboard.org?subject=help>
List-Subscribe: <http://balloonboard.org/cgi-bin/mailman/listinfo/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Mar 2010 14:53:34 -0000

Author: cmjones
Date: 2010-03-10 14:53:34 +0000 (Wed, 10 Mar 2010)
New Revision: 1013

Modified:
   balloon/branches/novlio/bootldr/btflash.c
Log:
Added support for M29W640G NOR Flash chip on M3 build boards


Modified: balloon/branches/novlio/bootldr/btflash.c
===================================================================
--- balloon/branches/novlio/bootldr/btflash.c	2010-03-08 15:09:56 UTC (rev 1012)
+++ balloon/branches/novlio/bootldr/btflash.c	2010-03-10 14:53:34 UTC (rev 1013)
@@ -343,7 +343,32 @@
 #endif
 };
 
+// M29W640G has the same sector and partition layout as 29LV650
+static struct FlashDescriptor flashDescriptor_S29GL064A_1x16=  {
+   "M29W640G_1x16", 
+   0x20, 0x227e, 
+   &amdFlashAlgorithm_1x16,
+   sizeof(flashSectors_MBM29LV650UE_1x16)/sizeof(dword) - 1, flashSectors_MBM29LV650UE_1x16,
+   { "bootldr",   0x00000000, BOOTLDR_SIZE, LFR_BOOTLDR },
+#if  defined(CONFIG_MACH_BALLOON) && defined(CONFIG_PXA)
+#if defined(CONFIG_BALLOON_FPGA)
+#define FPGA_IMAGE_SIZE 0x100000L
+   { "fpga",      FPGA_IMAGE_ADDRESS, FPGA_IMAGE_SIZE, 0 },
 #else
+#define FPGA__IMAGE_ADDRESS BOOTLDR_SIZE
+#define FPGA_IMAGE_SIZE 0
+#endif
+   { "kernel",      FPGA_IMAGE_ADDRESS+FPGA_IMAGE_SIZE, BOOT_SIZE, 0 },
+#endif
+#if defined(CONFIG_NAND) && defined(CONFIG_YAFFS_BOOTLDR)
+   { "boot",      0x00000000, BOOT_SIZE, LFR_NAND | LFR_NAND_YAFFS },   
+   { "root",      BOOT_SIZE, NAND_SIZE-BOOT_SIZE, LFR_NAND | LFR_NAND_YAFFS }
+#else
+//   { "boot",      BOOTLDR_SIZE, BOOT_SIZE, 0 },   
+   { "root",      BOOTLDR_SIZE+BOOT_SIZE, 0, 0 }
+#endif
+};
+#else
 static struct FlashDescriptor flashDescriptor_Am29LV160BB = {
    "Am29LV160BB",
    bothbanks(1), bothbanks(0x2249),