diff -Naur u-boot-origin/board/lpc2294/config.mk u-boot-1.1.3/board/lpc2294/config.mk--- u-boot-origin/board/lpc2294/config.mk	1970-01-01 07:00:00.000000000 +0700+++ u-boot-1.1.3/board/lpc2294/config.mk	2005-09-07 09:43:56.000000000 +0800@@ -0,0 +1,30 @@+#+# (C) Copyright 2000+# Sysgo Real-Time Solutions, GmbH <www.elinos.com>+# Marius Groeger <mgroeger@sysgo.de>+#+# (C) Copyright 2000-2004+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.+#+# See file CREDITS for list of people who contributed to this+# project.+#+# This program is free software; you can redistribute it and/or+# modify it under the terms of the GNU General Public License as+# published by the Free Software Foundation; either version 2 of+# the License, or (at your option) any later version.+#+# This program is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU General Public License+# along with this program; if not, write to the Free Software+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,+# MA 02111-1307 USA+#++TEXT_BASE = 0x81400000++PLATFORM_CPPFLAGS += -Uarmdiff -Naur u-boot-origin/board/lpc2294/flash.c u-boot-1.1.3/board/lpc2294/flash.c--- u-boot-origin/board/lpc2294/flash.c	1970-01-01 07:00:00.000000000 +0700+++ u-boot-1.1.3/board/lpc2294/flash.c	2005-09-07 09:43:56.000000000 +0800@@ -0,0 +1,770 @@+/*+ * (C) Copyright 2001+ * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com+ *+ * See file CREDITS for list of people who contributed to this+ * project.+ *+ * This program is free software; you can redistribute it and/or+ * modify it under the terms of the GNU General Public License as+ * published by the Free Software Foundation; either version 2 of+ * the License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the+ * GNU General Public License for more details.+ *+ * You should have received a copy of the GNU General Public License+ * along with this program; if not, write to the Free Software+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,+ * MA 02111-1307 USA+ */++#include <common.h>+#include <asm/processor.h>++/*-----------------------------------------------------------------------+ * Functions+ */+static ulong flash_get_size (vu_long * addr, flash_info_t * info);+static void flash_get_offsets (ulong base, flash_info_t * info);+flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/+/*-----------------------------------------------------------------------+ */++unsigned long flash_init (void)+{+#ifdef __DEBUG_START_FROM_SRAM__+	return CFG_DUMMY_FLASH_SIZE;+#else+	unsigned long size_b0;+	int i;++	/* Init: no FLASHes known */+	for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {+		flash_info[i].flash_id = FLASH_UNKNOWN;+	}++	/* Static FLASH Bank configuration here - FIXME XXX */++	size_b0 = flash_get_size((vu_long *)CFG_FLASH_BASE, &flash_info[0]);++	if (flash_info[0].flash_id == FLASH_UNKNOWN) {+		printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",+			size_b0, size_b0<<20);+	}++	/* Setup offsets */+	flash_get_offsets ((vu_long *)CFG_FLASH_BASE, &flash_info[0]);+++	/* Monitor protection ON by default */+	(void)flash_protect(FLAG_PROTECT_SET,+			    -CFG_MONITOR_LEN,+			    0xffffffff,+			    &flash_info[0]);++	flash_info[0].size = size_b0;++	return (size_b0);+#endif+}++++/*-----------------------------------------------------------------------+ * Functions+ */+static int write_word (flash_info_t *info, ulong dest, ulong data);++/*-----------------------------------------------------------------------+ */+static void flash_get_offsets (ulong base, flash_info_t *info)+{+	int i;+	short n;++	/* set up sector start address table */+	if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||+	    ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM640U)) {+	    for (i = 0; i < info->sector_count; i++){+#ifdef CONFIG_LPC+		info->start[i] = base + (i * 0x00020000);+#else+    info->start[i] = base + (i * 0x00010000);+#endif+}+	} else if (((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL322B) ||+		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL323B) ||+		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM320B) ||+		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL324B)) {+		/* set sector offsets for bottom boot block type	*/+		for (i=0; i<8; ++i) {		/*  8 x 8k boot sectors	*/+			info->start[i] = base;+			base += 8 << 10;+		}+		while (i < info->sector_count) {	/* 64k regular sectors	*/+			info->start[i] = base;+			base += 64 << 10;+			++i;+		}+	} else if (((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL322T) ||+		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL323T) ||+		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM320T) ||+		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL324T)) {+		/* set sector offsets for top boot block type		*/+		base += info->size;+		i = info->sector_count;+		for (n=0; n<8; ++n) {		/*  8 x 8k boot sectors	*/+			base -= 8 << 10;+			--i;+			info->start[i] = base;+		}+		while (i > 0) {			/* 64k regular sectors	*/+			base -= 64 << 10;+			--i;+			info->start[i] = base;+		}+	} else {+	    if (info->flash_id & FLASH_BTYPE) {+		/* set sector offsets for bottom boot block type	*/+		info->start[0] = base + 0x00000000;+		info->start[1] = base + 0x00004000;+		info->start[2] = base + 0x00006000;+		info->start[3] = base + 0x00008000;+		for (i = 4; i < info->sector_count; i++) {+			info->start[i] = base + (i * 0x00010000) - 0x00030000;+		}+	    } else {+		/* set sector offsets for top boot block type		*/+		i = info->sector_count - 1;+		info->start[i--] = base + info->size - 0x00004000;+		info->start[i--] = base + info->size - 0x00006000;+		info->start[i--] = base + info->size - 0x00008000;+		for (; i >= 0; i--) {+			info->start[i] = base + i * 0x00010000;+		}+	    }+	}+}++/*-----------------------------------------------------------------------+ */+void flash_print_info  (flash_info_t *info)+{+	int i;+	int k;+	int size;+	int erased;+	volatile unsigned long *flash;++	if (info->flash_id == FLASH_UNKNOWN) {+		printf ("missing or unknown FLASH type\n");+		return;+	}++	switch (info->flash_id & FLASH_VENDMASK) {+	case FLASH_MAN_AMD:	printf ("AMD ");		break;+	case FLASH_MAN_FUJ:	printf ("FUJITSU ");		break;+	case FLASH_MAN_SST:	printf ("SST ");		break;+	case FLASH_MAN_STM:	printf ("ST  ");		break;+	default:		printf ("Unknown Vendor ");	break;+	}++	switch (info->flash_id & FLASH_TYPEMASK) {+	case FLASH_AM400B:	printf ("AM29LV400B (4 Mbit, bottom boot sect)\n");+				break;+	case FLASH_AM400T:	printf ("AM29LV400T (4 Mbit, top boot sector)\n");+				break;+	case FLASH_AM800B:	printf ("AM29LV800B (8 Mbit, bottom boot sect)\n");+				break;+	case FLASH_AM800T:	printf ("AM29LV800T (8 Mbit, top boot sector)\n");+				break;+	case FLASH_AM160B:	printf ("AM29LV160B (16 Mbit, bottom boot sect)\n");+				break;+	case FLASH_AM160T:	printf ("AM29LV160T (16 Mbit, top boot sector)\n");+				break;+	case FLASH_AM320T:	printf ("AM29LV320T (32 M, top sector)\n");+				break;+	case FLASH_AM320B:	printf ("AM29LV320B (32 M, bottom sector)\n");+				break;+	case FLASH_AMDL322T:	printf ("AM29DL322T (32 M, top sector)\n");+				break;+	case FLASH_AMDL322B:	printf ("AM29DL322B (32 M, bottom sector)\n");+				break;+	case FLASH_AMDL323T:	printf ("AM29DL323T (32 M, top sector)\n");+				break;+	case FLASH_AMDL323B:	printf ("AM29DL323B (32 M, bottom sector)\n");+				break;+	case FLASH_AM640U:	printf ("AM29LV640D (64 M, uniform sector)\n");+				break;+	case FLASH_SST800A:	printf ("SST39LF/VF800 (8 Mbit, uniform sector size)\n");+				break;+	case FLASH_SST160A:	printf ("SST39LF/VF160 (16 Mbit, uniform sector size)\n");+				break;+	case FLASH_STMW320DT:	printf ("M29W320DT (32 M, top sector)\n");+				break;+	default:		printf ("Unknown Chip Type\n");+				break;+	}++++	printf ("  Size: %ld MB in %d Sectors\n",+		info->size >> 20, info->sector_count);++	printf ("  Sector Start Addresses:");+	for (i=0; i<info->sector_count; ++i) {+#ifdef CFG_FLASH_EMPTY_INFO+		/*+		 * Check if whole sector is erased+		 */+		if (i != (info->sector_count-1))+		  size = info->start[i+1] - info->start[i];+		else+		  size = info->start[0] + info->size - info->start[i];+		erased = 1;+		flash = (volatile unsigned long *)info->start[i];+		size = size >> 2;        /* divide by 4 for longword access */+		for (k=0; k<size; k++)+		  {+		    if (*flash++ != 0xffffffff)+		      {+			erased = 0;+			break;+		      }+		  }++		if ((i % 5) == 0)+			printf ("\n   ");+		/* print empty and read-only info */+		printf (" %08lX%s%s",+			info->start[i],+			erased ? " E" : "  ",+			info->protect[i] ? "RO " : "   ");+#else+		if ((i % 5) == 0)+			printf ("\n   ");+		printf (" %08lX%s",+			info->start[i],+			info->protect[i] ? " (RO)" : "     ");+#endif++	}+	printf ("\n");+	return;+}++/*-----------------------------------------------------------------------+ */+++/*-----------------------------------------------------------------------+ */++/*+ * The following code cannot be run from FLASH!+ */+static ulong flash_get_size (vu_long *addr, flash_info_t *info)+{+	short i;+	short n;+	CFG_FLASH_WORD_SIZE value;+	ulong base = (ulong)addr;+	volatile CFG_FLASH_WORD_SIZE *addr2 = (CFG_FLASH_WORD_SIZE *)addr;++	debug("[%s, %d] Entering ...\n", __FUNCTION__, __LINE__);++	/* Write auto select command: read Manufacturer ID */+	addr2[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00AA00AA;+	addr2[CFG_FLASH_ADDR1] = (CFG_FLASH_WORD_SIZE)0x00550055;+	addr2[CFG_FLASH_ADDR0] = (CFG_FLASH_WORD_SIZE)0x00900090;++	value = addr2[CFG_FLASH_READ0];++	switch (value) {+	case (CFG_FLASH_WORD_SIZE)AMD_MANUFACT:+		info->flash_id = FLASH_MAN_AMD;+		break;+	case (CFG_FLASH_WORD_SIZE)FUJ_MANUFACT:+		info->flash_id = FLASH_MAN_FUJ;+		break;+	case (CFG_FLASH_WORD_SIZE)SST_MANUFACT:+		info->flash_id = FLASH_MAN_SST;+		break;+	case (CFG_FLASH_WORD_SIZE)STM_MANUFACT:+		info->flash_id = FLASH_MAN_STM;+		break;+	default:+		info->flash_id = FLASH_UNKNOWN;+		info->sector_count = 0;+		info->size = 0;+		return (0);			/* no or unknown flash	*/+	}++	value = addr2[CFG_FLASH_READ1];		/* device ID		*/++	switch (value) {+	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV400T:+		info->flash_id += FLASH_AM400T;+		info->sector_count = 11;+		info->size = 0x00080000;+		break;				/* => 0.5 MB		*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV400B:+		info->flash_id += FLASH_AM400B;+		info->sector_count = 11;+		info->size = 0x00080000;+		break;				/* => 0.5 MB		*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV800T:+		info->flash_id += FLASH_AM800T;+		info->sector_count = 19;+		info->size = 0x00100000;+		break;				/* => 1 MB		*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV800B:+		info->flash_id += FLASH_AM800B;+		info->sector_count = 19;+		info->size = 0x00100000;+		break;				/* => 1 MB		*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV160T:+		info->flash_id += FLASH_AM160T;+		info->sector_count = 35;+		info->size = 0x00200000;+		break;				/* => 2 MB		*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV160B:+		info->flash_id += FLASH_AM160B;+		info->sector_count = 35;+		info->size = 0x00200000;+		break;				/* => 2 MB		*/++	case (CFG_FLASH_WORD_SIZE)STM_ID_29W320DT:+		info->flash_id += FLASH_STMW320DT;+		info->sector_count = 67;+		info->size = 0x00400000;  break;	/* => 4 MB	*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV320T:+		info->flash_id += FLASH_AM320T;+		info->sector_count = 71;+		info->size = 0x00400000;  break;	/* => 4 MB	*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV320B:+		info->flash_id += FLASH_AM320B;+		info->sector_count = 71;+		info->size = 0x00400000;  break;	/* => 4 MB	*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_DL322T:+		info->flash_id += FLASH_AMDL322T;+		info->sector_count = 71;+		info->size = 0x00400000;  break;	/* => 4 MB	*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_DL322B:+		info->flash_id += FLASH_AMDL322B;+		info->sector_count = 71;+		info->size = 0x00400000;  break;	/* => 4 MB	*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_DL323T:+		info->flash_id += FLASH_AMDL323T;+		info->sector_count = 71;+		info->size = 0x00400000;  break;	/* => 4 MB	*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_DL323B:+		info->flash_id += FLASH_AMDL323B;+		info->sector_count = 71;+		info->size = 0x00400000;  break;	/* => 4 MB	*/++	case (CFG_FLASH_WORD_SIZE)AMD_ID_LV640U:+		info->flash_id += FLASH_AM640U;+		info->sector_count = 128;+		info->size = 0x00800000;  break;	/* => 8 MB	*/++	case (CFG_FLASH_WORD_SIZE)SST_ID_xF800A:+		info->flash_id += FLASH_SST800A;+		info->sector_count = 16;+		info->size = 0x00100000;+		break;				/* => 1 MB		*/++	case (CFG_FLASH_WORD_SIZE)SST_ID_xF160A:+		info->flash_id += FLASH_SST160A;+		info->sector_count = 32;+#ifdef CONFIG_LPC+		info->size = 0x00400000;+#else+    info->size = 0x00200000;+#endif+		break;				/* => 2 MB		*/++	default:+		info->flash_id = FLASH_UNKNOWN;+		return (0);			/* => no or unknown flash */++	}++	/* set up sector start address table */+	if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||+	    ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM640U)) {+	    for (i = 0; i < info->sector_count; i++){+#ifdef CONFIG_LPC+		info->start[i] = base + (i * 0x00020000);++#else+    info->start[i] = base + (i * 0x00010000);+#endif+}+	} else if (((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL322B) ||+		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL323B) ||+		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM320B) ||+		   ((info->flash_id & FLASH_TYPEMASK) == FLASH_AMDL324B)) {+		/* set sector offsets for bottom boot block type	*/+		for (i=0; i<8; ++i) {		/*  8 x 8k boot sectors	*/+			info->start[i] = base;+			base += 8 << 10;+		}+		while (i < info->sector_count) {	/* 64k regular sectors	*/+			info->start[i] = base;