diff -pNur --exclude=.svn bcm-3.12/shared/opensource/flash/cfiflash.c dev/shared/opensource/flash/cfiflash.c
--- bcm-3.12/shared/opensource/flash/cfiflash.c	2007-11-20 18:02:40.000000000 +0100
+++ dev/shared/opensource/flash/cfiflash.c	2008-01-31 09:45:00.000000000 +0100
@@ -74,6 +74,10 @@ static DECLARE_MUTEX(cfi_flash_lock);
 #define FLASH_AMD       1
 #define FLASH_INTEL     2
 #define FLASH_SST       3
+#define FLASH_EON	4
+
+/* list of flash manufacture ID */
+#define MANU_EON	0x7F
 
 /* Command codes for the flash_command routine */
 #define FLASH_RESET     0       /* reset to read mode */
@@ -104,6 +108,8 @@ static DECLARE_MUTEX(cfi_flash_lock);
 #define ID_AM29LV320B   0x22F9
 #define ID_MX29LV320AB  0x22A8
 #define ID_MX29LV640BT  0x22C9
+#define ID_STM29W640FT  0x22ED
+#define ID_STM29W640FB  0x22FD
 
 #define ID_AM29LV320M   0x227E
 #define ID_AM29LV320MB  0x2200
@@ -123,6 +129,9 @@ static DECLARE_MUTEX(cfi_flash_lock);
 #define ID_I28F320C3B   0x88C5
 #define ID_I28F640J3	0x8916
 
+/* A list of Eon device ID's - add others as needed */
+#define ID_EN29LV640	0x227E
+
 #define CFI_FLASH_DEVICES                   \
          {{ID_AM29DL800T, "AM29DL800T"},    \
           {ID_AM29DL800B, "AM29DL800B"},    \
@@ -140,6 +149,8 @@ static DECLARE_MUTEX(cfi_flash_lock);
           {ID_AM29LV320MB, "AM29LV320MB"},  \
           {ID_AM29LV320MT, "AM29LV320MT"},  \
           {ID_MX29LV640BT, "MX29LV640BT"},  \
+          {ID_STM29W640FT, "M29W640FT"},    \
+          {ID_STM29W640FB, "M29W640FB"},    \
           {ID_SST39VF200A, "SST39VF200A"},  \
           {ID_SST39VF400A, "SST39VF400A"},  \
           {ID_SST39VF800A, "SST39VF800A"},  \
@@ -214,6 +225,7 @@ static int cfi_flash_write(unsigned shor
     int nbytes);
 static int cfi_flash_wait(unsigned short sector, int offset,unsigned short data);
 static unsigned short cfi_flash_get_device_id(void);
+static unsigned short cfi_flash_get_manu_id(void);
 static int cfi_flash_get_cfi(struct cfi_query *query, unsigned short *cfi_struct,
     int flashFamily);
 
@@ -330,6 +342,7 @@ int cfi_flash_init(flash_device_info_t *
     int i=0, j=0, count=0;
     int basecount=0L;
     unsigned short device_id;
+    unsigned short manu_id;
     int flipCFIGeometry = FALSE;
 
     *flash_info = &flash_cfi_dev;
@@ -353,8 +366,48 @@ int cfi_flash_init(flash_device_info_t *
         
     cfi_flash_command(FLASH_RESET, 0, 0, 0);
 
+    manu_id = cfi_flash_get_manu_id();
     flash_cfi_dev.flash_device_id = device_id = cfi_flash_get_device_id();
     flash_cfi_dev.flash_device_name[0] = '\0';
+    
+    if((manu_id) == MANU_EON)
+    {
+#ifdef DEBUG_FLASH
+    	printk("This is EON flash.\n");
+#endif
+        flashFamily = FLASH_EON;
+	/* get cfi */
+	if (cfi_flash_get_cfi(&query, 0, flashFamily) == -1)
+	{
+		return FLASH_API_ERROR;           
+	}		
+
+	count=0;basecount=0L;
+	for (i=0; i<query.num_erase_blocks && basecount < query.device_size; i++)
+	{
+		for(j=0; j<query.erase_block[i].num_sectors; j++)
+		{
+			meminfo.sec[count].size = (int) query.erase_block[i].sector_size;
+			meminfo.sec[count].base = (int) basecount;
+			basecount += (int) query.erase_block[i].sector_size;
+			count++;
+		}
+	}
+
+	/* set device name. */
+	switch (device_id)
+	{
+		case ID_EN29LV640:
+			strcpy( flash_cfi_dev.flash_device_name, "EN29LV640" );
+			break;
+		default:
+			strcpy( flash_cfi_dev.flash_device_name, "EON FLASH" );
+			break;
+	}
+		
+    }
+    else
+    {
     switch (device_id) {
         case ID_I28F160C3B:
         case ID_I28F320C3B:
@@ -378,6 +431,8 @@ int cfi_flash_init(flash_device_info_t *
         case ID_AM29LV320MT:
         case ID_AM29LV200BT:
         case ID_MX29LV640BT:
+        case ID_STM29W640FT:
+        case ID_STM29W640FB:
             flashFamily = FLASH_AMD;
             break;
         case ID_SST39VF200A:
@@ -430,6 +485,7 @@ int cfi_flash_init(flash_device_info_t *
         case ID_SST39VF200A:
         case ID_SST39VF400A:
         case ID_SST39VF800A:
+        case ID_STM29W640FB:
             flipCFIGeometry = FALSE;
             break;
         case ID_AM29DL800T:
@@ -441,6 +497,7 @@ int cfi_flash_init(flash_device_info_t *
         case ID_AM29LV200BT:
         case ID_SST39VF1601:
         case ID_MX29LV640BT:
+        case ID_STM29W640FT:
             flipCFIGeometry = TRUE;
             break;
         default:
@@ -484,6 +543,9 @@ int cfi_flash_init(flash_device_info_t *
             }
         }
     }
+    }
+    meminfo.nsect = count;
+    totalSize = meminfo.sec[count-1].base + meminfo.sec[count-1].size;
 
     return (FLASH_API_OK);
 }
@@ -718,6 +780,7 @@ static void cfi_flash_command(int comman
             break;
         }
         break;
+    case FLASH_EON:
     case FLASH_AMD:
         switch (command) {
         case FLASH_RESET:
@@ -881,7 +944,7 @@ static int cfi_flash_wait(unsigned short
 
     flashptr = (unsigned short *) cfi_flash_get_memptr(sector);
 
-    if (flashFamily == FLASH_AMD || flashFamily == FLASH_SST) {
+    if (flashFamily == FLASH_AMD || flashFamily == FLASH_SST || flashFamily == FLASH_EON) {
 /* 6338 and 6358 for different reasons do a 'double read' when reading 16 bit from EBI */
 #if defined(_BCM96338_) || defined(CONFIG_BCM96338) || defined(_BCM96358_) || defined(CONFIG_BCM96358)
         do {
@@ -990,6 +1053,25 @@ static unsigned short cfi_flash_get_devi
 }
 
 /*********************************************************************/
+/* flash_get_manu_id() will perform an autoselect sequence on the    */
+/* flash device, and return the manufacture id of the component.     */
+/* This function automatically resets to read mode.                  */
+/*********************************************************************/
+static unsigned short cfi_flash_get_manu_id(void)
+{
+    volatile unsigned short *fwp; /* flash window */
+    unsigned short answer;
+    
+    fwp = (unsigned short *) cfi_flash_get_memptr(0);
+    
+    cfi_flash_command(FLASH_READ_ID, 0, 0, 0);
+    answer = *(fwp);
+    
+    cfi_flash_command(FLASH_RESET, 0, 0, 0);
+    return( (unsigned short) answer );
+}
+
+/*********************************************************************/
 /* flash_get_cfi() is the main CFI workhorse function.  Due to it's  */
 /* complexity and size it need only be called once upon              */
 /* initializing the flash system.  Once it is called, all operations */

diff -pNur --exclude=.svn bcm-3.12/kernel/linux/drivers/mtd/chips/cfi_cmdset_0002.c dev/kernel/linux/drivers/mtd/chips/cfi_cmdset_0002.c
--- bcm-3.12/kernel/linux/drivers/mtd/chips/cfi_cmdset_0002.c	2004-08-14 18:16:42.000000000 +0200
+++ dev/kernel/linux/drivers/mtd/chips/cfi_cmdset_0002.c	2008-01-15 18:15:51.000000000 +0100
@@ -430,6 +430,12 @@ static int get_chip(struct map_info *map
 		return 0;
 
 	case FL_ERASING:
+		/* Efixo Flash Eon support
+		 * patch for fixing LZMA error
+		 * don't use the erase-suspend feature
+		 */
+		goto sleep;
+
 		if (mode == FL_WRITING) /* FIXME: Erase-suspend-program appears broken. */
 			goto sleep;