diff options
Diffstat (limited to 'board/snmc')
| -rw-r--r-- | board/snmc/qs850/Makefile | 40 | ||||
| -rw-r--r-- | board/snmc/qs850/config.mk | 29 | ||||
| -rw-r--r-- | board/snmc/qs850/flash.c | 617 | ||||
| -rw-r--r-- | board/snmc/qs850/qs850.c | 253 | ||||
| -rw-r--r-- | board/snmc/qs850/u-boot.lds | 141 | ||||
| -rw-r--r-- | board/snmc/qs860t/Makefile | 40 | ||||
| -rw-r--r-- | board/snmc/qs860t/config.mk | 29 | ||||
| -rw-r--r-- | board/snmc/qs860t/flash.c | 1121 | ||||
| -rw-r--r-- | board/snmc/qs860t/qs860t.c | 259 | ||||
| -rw-r--r-- | board/snmc/qs860t/u-boot.lds | 141 | 
10 files changed, 2670 insertions, 0 deletions
| diff --git a/board/snmc/qs850/Makefile b/board/snmc/qs850/Makefile new file mode 100644 index 000000000..e5d844631 --- /dev/null +++ b/board/snmc/qs850/Makefile @@ -0,0 +1,40 @@ +# +# (C) Copyright 2000-2003 +# 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 +# + +include $(TOPDIR)/config.mk + +LIB	= lib$(BOARD).a + +OBJS	= $(BOARD).o flash.o + +$(LIB):	.depend $(OBJS) +	$(AR) crv $@ $(OBJS) + +######################################################################### + +.depend:	Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) +		$(CC) -M $(CFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ + +sinclude .depend + +######################################################################### diff --git a/board/snmc/qs850/config.mk b/board/snmc/qs850/config.mk new file mode 100644 index 000000000..905f69269 --- /dev/null +++ b/board/snmc/qs850/config.mk @@ -0,0 +1,29 @@ +# +# (C) Copyright 2002-2003 +# Simple Network Magic Corporation, dnevil@snmc.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 +# + +# +# QS850 +# Start address of Bootloader in Flash +# + +TEXT_BASE = 0xFFF00000 diff --git a/board/snmc/qs850/flash.c b/board/snmc/qs850/flash.c new file mode 100644 index 000000000..d4e2cbb2c --- /dev/null +++ b/board/snmc/qs850/flash.c @@ -0,0 +1,617 @@ +/* + * (C) Copyright 2003 + * MuLogic B.V. + * + * (C) Copyright 2001 + * 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 + */ + +#include <common.h> +#include <ppc4xx.h> +#include <asm/u-boot.h> +#include <asm/processor.h> + +flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ + + +#define FLASH_WORD_SIZE unsigned long +#define FLASH_ID_MASK 0xFFFFFFFF + +/*----------------------------------------------------------------------- + * Functions + */ +/* stolen from esteem192e/flash.c */ +ulong flash_get_size (volatile FLASH_WORD_SIZE *addr, flash_info_t *info); + +static int write_word (flash_info_t *info, ulong dest, ulong data); +static void flash_get_offsets (ulong base, flash_info_t *info); + + +/*----------------------------------------------------------------------- + */ + +unsigned long flash_init (void) +{ +	unsigned long size_b0, size_b1; +	int i; +	uint pbcr; +	unsigned long base_b0, base_b1; +	volatile FLASH_WORD_SIZE* flash_base; + +	/* 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 */ +	/* Test for 8M Flash first */ +	debug ("\n## Get flash bank 1 size @ 0x%08x\n",FLASH_BASE0_8M_PRELIM); +	flash_base = (volatile FLASH_WORD_SIZE*)(FLASH_BASE0_8M_PRELIM); +	size_b0 = flash_get_size(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); +		return 0; +	} + +	if (size_b0 < 8*1024*1024) { +		/* Not quite 8M, try 4M Flash base address */ +		debug ("\n## Get flash bank 1 size @ 0x%08x\n",FLASH_BASE0_4M_PRELIM); +		flash_base = (volatile FLASH_WORD_SIZE*)(FLASH_BASE0_4M_PRELIM); +		size_b0 = flash_get_size(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); +		return 0; +	} + +	/* Only one bank */ +	if (CFG_MAX_FLASH_BANKS == 1) { +		/* Setup offsets */ +		flash_get_offsets ((ulong)flash_base, &flash_info[0]); + +		/* Monitor protection ON by default */ +		(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, +			CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, &flash_info[0]); +		size_b1 = 0 ; +		flash_info[0].size = size_b0; +		return(size_b0); +	} + +	/* We have 2 banks */ +	size_b1 = flash_get_size(flash_base, &flash_info[1]); + +	/* Re-do sizing to get full correct info */ +	if (size_b1) { +		mtdcr(ebccfga, pb0cr); +		pbcr = mfdcr(ebccfgd); +		mtdcr(ebccfga, pb0cr); +		base_b1 = -size_b1; +		pbcr = (pbcr & 0x0001ffff) | base_b1 | (((size_b1/1024/1024)-1)<<17); +		mtdcr(ebccfgd, pbcr); +	} + +	if (size_b0) { +		mtdcr(ebccfga, pb1cr); +		pbcr = mfdcr(ebccfgd); +		mtdcr(ebccfga, pb1cr); +		base_b0 = base_b1 - size_b0; +		pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17); +		mtdcr(ebccfgd, pbcr); +	} + +	size_b0 = flash_get_size((volatile FLASH_WORD_SIZE *)base_b0, &flash_info[0]); +	flash_get_offsets (base_b0, &flash_info[0]); + +	/* monitor protection ON by default */ +	(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, +		CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, &flash_info[0]); + +	if (size_b1) { +		/* Re-do sizing to get full correct info */ +		size_b1 = flash_get_size((volatile FLASH_WORD_SIZE *)base_b1, &flash_info[1]); +		flash_get_offsets (base_b1, &flash_info[1]); + +		/* monitor protection ON by default */ +		(void)flash_protect(FLAG_PROTECT_SET, base_b1+size_b1-CFG_MONITOR_LEN, +			base_b1+size_b1-1, &flash_info[1]); + +		/* monitor protection OFF by default (one is enough) */ +		(void)flash_protect(FLAG_PROTECT_CLEAR, base_b0+size_b0-CFG_MONITOR_LEN, +			base_b0+size_b0-1, &flash_info[0]); +	} else { +		flash_info[1].flash_id = FLASH_UNKNOWN; +		flash_info[1].sector_count = -1; +	} + +	flash_info[0].size = size_b0; +	flash_info[1].size = size_b1; +	return (size_b0 + size_b1); +} + + + +/*----------------------------------------------------------------------- + This code is specific to the AM29DL163/AM29DL232 for the QS850/QS823. + */ + +static void flash_get_offsets (ulong base, flash_info_t *info) +{ +	int i; +	long large_sect_size; +	long small_sect_size; + +	/* set up sector start adress table */ +	large_sect_size = info->size / (info->sector_count - 8 + 1); +	small_sect_size = large_sect_size / 8; + +	if (info->flash_id & FLASH_BTYPE) { + +		/* set sector offsets for bottom boot block type */ +		for (i = 0; i < 7; i++) { +			info->start[i] = base; +			base += small_sect_size; +		} + +		for (; i < info->sector_count; i++) { +			info->start[i] = base; +			base += large_sect_size; +		} +	} +	else +	{ +		/* set sector offsets for top boot block type */ +		for (i = 0; i < (info->sector_count - 8); i++) { +			info->start[i] = base; +			base += large_sect_size; +		} + +		for (; i < info->sector_count; i++) { +			info->start[i] = base; +			base += small_sect_size; +		} +	} +} + +/*----------------------------------------------------------------------- + */ + +void flash_print_info  (flash_info_t *info) +{ +	int i; +	uchar *boottype; +	uchar botboot[]=", bottom boot sect)\n"; +	uchar topboot[]=", top boot sector)\n"; + +	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 ("STM "); +			break; +		case FLASH_MAN_INTEL: +			printf ("INTEL "); +			break; +		default: +			printf ("Unknown Vendor "); +			break; +	} + +	if (info->flash_id & 0x0001 ) { +		boottype = botboot; +	} else { +		boottype = topboot; +	} + +	switch (info->flash_id & FLASH_TYPEMASK) { +		case FLASH_AM160B: +			printf ("AM29LV160B (16 Mbit%s",boottype); +			break; +		case FLASH_AM160T: +			printf ("AM29LV160T (16 Mbit%s",boottype); +			break; +		case FLASH_AMDL163T: +			printf ("AM29DL163T (16 Mbit%s",boottype); +			break; +		case FLASH_AMDL163B: +			printf ("AM29DL163B (16 Mbit%s",boottype); +			break; +		case FLASH_AM320B: +			printf ("AM29LV320B (32 Mbit%s",boottype); +			break; +		case FLASH_AM320T: +			printf ("AM29LV320T (32 Mbit%s",boottype); +			break; +		case FLASH_AMDL323T: +			printf ("AM29DL323T (32 Mbit%s",boottype); +			break; +		case FLASH_AMDL323B: +			printf ("AM29DL323B (32 Mbit%s",boottype); +			break; +		case FLASH_AMDL322T: +			printf ("AM29DL322T (32 Mbit%s",boottype); +			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) { +		if ((i % 5) == 0) +			printf ("\n   "); +		printf (" %08lX%s", info->start[i], +			info->protect[i] ? " (RO)" : "     "); +	} +	printf ("\n"); +	return; +} + + +/*----------------------------------------------------------------------- + * The following code cannot be run from FLASH! + */ +ulong flash_get_size (volatile FLASH_WORD_SIZE *addr, flash_info_t *info) +{ +	short i; +	ulong base = (ulong)addr; +	FLASH_WORD_SIZE value; + +	/* Write auto select command: read Manufacturer ID */ + +	/* +	 * Note: if it is an AMD flash and the word at addr[0000] +	 * is 0x00890089 this routine will think it is an Intel +	 * flash device and may(most likely) cause trouble. +	 */ + +	addr[0x0000] = 0x00900090; +	if(addr[0x0000] != 0x00890089){ +		addr[0x0555] = 0x00AA00AA; +		addr[0x02AA] = 0x00550055; +		addr[0x0555] = 0x00900090; +	} +	value = addr[0]; + +	switch (value) { +		case (AMD_MANUFACT & FLASH_ID_MASK): +			info->flash_id = FLASH_MAN_AMD; +			break; +		case (FUJ_MANUFACT & FLASH_ID_MASK): +			info->flash_id = FLASH_MAN_FUJ; +			break; +		case (STM_MANUFACT & FLASH_ID_MASK): +			info->flash_id = FLASH_MAN_STM; +			break; +		case (SST_MANUFACT & FLASH_ID_MASK): +			info->flash_id = FLASH_MAN_SST; +			break; +		case (INTEL_MANUFACT & FLASH_ID_MASK): +			info->flash_id = FLASH_MAN_INTEL; +			break; +		default: +			info->flash_id = FLASH_UNKNOWN; +			info->sector_count = 0; +			info->size = 0; +			return (0); /* no or unknown flash */ +	} + +	value = addr[1]; /* device ID */ + +	switch (value) { +		case (AMD_ID_LV160T & FLASH_ID_MASK): +			info->flash_id += FLASH_AM160T; +			info->sector_count = 35; +			info->size = 0x00400000; +			break; /* => 4 MB */ + +		case (AMD_ID_LV160B & FLASH_ID_MASK): +			info->flash_id += FLASH_AM160B; +			info->sector_count = 35; +			info->size = 0x00400000; +			break; /* => 4 MB */ + +		case (AMD_ID_DL163T & FLASH_ID_MASK): +			info->flash_id += FLASH_AMDL163T; +			info->sector_count = 39; +			info->size = 0x00400000; +			break; /* => 4 MB */ + +		case (AMD_ID_DL163B & FLASH_ID_MASK): +			info->flash_id += FLASH_AMDL163B; +			info->sector_count = 39; +			info->size = 0x00400000; +			break; /* => 4 MB */ + +		case (AMD_ID_DL323T & FLASH_ID_MASK): +			info->flash_id += FLASH_AMDL323T; +			info->sector_count = 71; +			info->size = 0x00800000; +			break; /* => 8 MB */ + +		case (AMD_ID_DL323B & FLASH_ID_MASK): +			info->flash_id += FLASH_AMDL323B; +			info->sector_count = 71; +			info->size = 0x00800000; +			break; /* => 8 MB */ + +		case (AMD_ID_DL322T & FLASH_ID_MASK): +			info->flash_id += FLASH_AMDL322T; +			info->sector_count = 71; +			info->size = 0x00800000; +			break; /* => 8 MB */ + +		default: +			/* FIXME*/ +			info->flash_id = FLASH_UNKNOWN; +			return (0); /* => no or unknown flash */ +	} + +	flash_get_offsets(base, info); + +	/* check for protected sectors */ +	for (i = 0; i < info->sector_count; i++) { +		/* read sector protection at sector address, (A7 .. A0) = 0x02 */ +		/* D0 = 1 if protected */ +		addr = (volatile FLASH_WORD_SIZE *)(info->start[i]); +		info->protect[i] = addr[2] & 1; +	} + +	/* +	 * Prevent writes to uninitialized FLASH. +	 */ +	if (info->flash_id != FLASH_UNKNOWN) { +		addr = (volatile FLASH_WORD_SIZE *)info->start[0]; +		*addr = (0x00FF00FF & FLASH_ID_MASK);	/* reset bank */ +	} + +	return (info->size); +} + + +/*----------------------------------------------------------------------- + */ + +int flash_erase (flash_info_t *info, int s_first, int s_last) +{ +	volatile FLASH_WORD_SIZE *addr=(volatile FLASH_WORD_SIZE*)(info->start[0]); +	int flag, prot, sect, l_sect; +	ulong start, now, last; +	int rcode = 0; + +	if ((s_first < 0) || (s_first > s_last)) { +		if (info->flash_id == FLASH_UNKNOWN) { +			printf ("- missing\n"); +		} else { +			printf ("- no sectors to erase\n"); +		} +		return 1; +	} + +	if ((info->flash_id == FLASH_UNKNOWN) || +		(info->flash_id > FLASH_AMD_COMP) ) { +		printf ("Can't erase unknown flash type - aborted\n"); +		return 1; +	} + +	prot = 0; +	for (sect=s_first; sect<=s_last; ++sect) { +		if (info->protect[sect]) { +			prot++; +		} +	} + +	if (prot) { +		printf ("- Warning: %d protected sectors will not be erased!\n", +			prot); +	} else { +		printf ("\n"); +	} + +	l_sect = -1; + +	/* Disable interrupts which might cause a timeout here */ +	flag = disable_interrupts(); +	addr[0x0555] = 0x00AA00AA; +	addr[0x02AA] = 0x00550055; +	addr[0x0555] = 0x00800080; +	addr[0x0555] = 0x00AA00AA; +	addr[0x02AA] = 0x00550055; +	/* Start erase on unprotected sectors */ +	for (sect = s_first; sect<=s_last; sect++) { +		if (info->protect[sect] == 0) { /* not protected */ +			addr = (volatile FLASH_WORD_SIZE *)(info->start[sect]); +			addr[0] = (0x00300030 & FLASH_ID_MASK); +			l_sect = sect; +		} +	} + +	/* re-enable interrupts if necessary */ +	if (flag) +		enable_interrupts(); + +	/* wait at least 80us - let's wait 1 ms */ +	udelay (1000); + +	/* +	 * We wait for the last triggered sector +	 */ +	if (l_sect < 0) +		goto DONE; + +	start = get_timer (0); +	last  = start; +	addr = (volatile FLASH_WORD_SIZE*)(info->start[l_sect]); +	while ((addr[0] & (0x00800080&FLASH_ID_MASK)) != +			(0x00800080&FLASH_ID_MASK)  ) +	{ +		if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) { +			printf ("Timeout\n"); +			return 1; +		} +		/* show that we're waiting */ +		if ((now - last) > 1000) { /* every second */ +			serial_putc ('.'); +			last = now; +		} +	} + +DONE: +	/* reset to read mode */ +	addr = (volatile FLASH_WORD_SIZE *)info->start[0]; +	addr[0] = (0x00F000F0 & FLASH_ID_MASK); /* reset bank */ + +	printf (" done\n"); +	return rcode; +} + +/*----------------------------------------------------------------------- + * Copy memory to flash, returns: + * 0 - OK + * 1 - write timeout + * 2 - Flash not erased + */ + +int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) +{ +	ulong cp, wp, data; +	int l; +	int i, rc; + +	wp = (addr & ~3); /* get lower word aligned address */ + +	/* +	 * handle unaligned start bytes +	 */ +	if ((l = addr - wp) != 0) { +		data = 0; +		for (i=0, cp=wp; i<l; ++i, ++cp) { +			data = (data << 8) | (*(uchar *)cp); +		} +		for (; i<4 && cnt>0; ++i) { +			data = (data << 8) | *src++; +			--cnt; +			++cp; +		} +		for (; cnt==0 && i<4; ++i, ++cp) { +			data = (data << 8) | (*(uchar *)cp); +		} + +		if ((rc = write_word(info, wp, data)) != 0) { +			return (rc); +		} +		wp += 4; +	} + +	/* +	 * handle word aligned part +	 */ +	while (cnt >= 4) { +		data = 0; +		for (i=0; i<4; ++i) { +			data = (data << 8) | *src++; +		} +		if ((rc = write_word(info, wp, data)) != 0) { +			return (rc); +		} +		wp  += 4; +		cnt -= 4; +	} + +	if (cnt == 0) { +		return (0); +	} + +	/* +	 * handle unaligned tail bytes +	 */ +	data = 0; +	for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) { +		data = (data << 8) | *src++; +		--cnt; +	} +	for (; i<4; ++i, ++cp) { +		data = (data << 8) | (*(uchar *)cp); +	} + +	return (write_word(info, wp, data)); +} + +/*----------------------------------------------------------------------- + * Write a word to Flash, returns: + * 0 - OK + * 1 - write timeout + * 2 - Flash not erased + */ +static int write_word (flash_info_t *info, ulong dest, ulong data) +{ +	vu_long *addr = (vu_long*)(info->start[0]); +	ulong start; +	int flag; + +	/* Check if Flash is (sufficiently) erased */ +	if ((*((vu_long *)dest) & data) != data) { +		return (2); +	} + +	/* Disable interrupts which might cause a timeout here */ +	flag = disable_interrupts(); + +	/* AMD stuff */ +	addr[0x0555] = 0x00AA00AA; +	addr[0x02AA] = 0x00550055; +	addr[0x0555] = 0x00A000A0; + +	*((vu_long *)dest) = data; + +	/* re-enable interrupts if necessary */ +	if (flag) +		enable_interrupts(); + +	/* data polling for D7 */ +	start = get_timer(0); + +	while ((*((vu_long *)dest) & 0x00800080) != (data & 0x00800080)) { +		if (get_timer(start) > CFG_FLASH_WRITE_TOUT) { +			return (1); +		} +	} + +	return (0); +} diff --git a/board/snmc/qs850/qs850.c b/board/snmc/qs850/qs850.c new file mode 100644 index 000000000..7448eb112 --- /dev/null +++ b/board/snmc/qs850/qs850.c @@ -0,0 +1,253 @@ +/* + * (C) Copyright 2003 + * MuLogic B.V. + * + * (C) Copyright 2002 + * Simple Network Magic Corporation, dnevil@snmc.com + * + * (C) Copyright 2000 + * 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 + */ + +#include <common.h> +#include <asm/u-boot.h> +#include <commproc.h> +#include "mpc8xx.h" + +/* ------------------------------------------------------------------------- */ + +static long  int dram_size (long int, long int *, long int); + +/* ------------------------------------------------------------------------- */ + +const uint sdram_table[] = +{ +	/* +	 * Single Read. (Offset 0 in UPMA RAM) +	 */ +	0x0f07cc04,  0x00adcc04,  0x00a74c00,  0x00bfcc04, +	0x1fffcc05,  0xffffcc05,  0xffffcc05,  0xffffcc05, +	/* +	 * Burst Read. (Offset 8 in UPMA RAM) +	 */ +	0x0ff7fc04,  0x0ffffc04,  0x00bdfc04,  0x00fffc00, +	0x00fffc00,  0x00fffc00,  0x0ff77c00,  0x1ffffc05, +	0x1ffffc05,  0x1ffffc05,  0x1ffffc05,  0x1ffffc05, +	0x1ffffc05,  0x1ffffc05,  0x1ffffc05,  0x1ffffc05, +	/* +	 * Single Write. (Offset 18 in UPMA RAM) +	 */ +	0x0f07cc04,  0x0fafcc00,  0x01ad0c04,  0x1ff74c07, +	0xffffcc05,  0xffffcc05,  0xffffcc05,  0xffffcc05, +	/* +	 * Burst Write. (Offset 20 in UPMA RAM) +	 */ +	0x0ff7fc04,  0x0ffffc00,  0x00bd7c00,  0x00fffc00, +	0x00fffc00,  0x00fffc00,  0x0ffffc04,  0x0ff77c04, +	0x1ffffc05,  0x1ffffc05,  0x1ffffc05,  0x1ffffc05, +	0x1ffffc05,  0x1ffffc05,  0x1ffffc05,  0x1ffffc05, +	/* +	 * Refresh  (Offset 30 in UPMA RAM) +	 */ +	0xffffcc04,  0x1ff5cc84,  0xffffcc04,  0xffffcc04, +	0xffffcc84,  0xffffcc05,  0xffffcc04,  0xffffcc04, +	0xffffcc04,  0xffffcc04,  0xffffcc04,  0xffffcc04, +	/* +	 * Exception. (Offset 3c in UPMA RAM) +	 */ +	0x1ff74c04,  0xffffcc07,  0xffffaa34,  0x1fb54a37 +}; + +/* ------------------------------------------------------------------------- */ + + +/* + * Check Board Identity: + * + * Test ID string (QS850, QS823, ...) + * + * Always return 1 + */ + +int checkboard (void) +{ +	unsigned char *s, *e; +	unsigned char buf[64]; +	int i; + +	i = getenv_r("serial#", buf, sizeof(buf)); +	s = (i>0) ? buf : NULL; + +#ifdef CONFIG_QS850 +	if (!s || strncmp(s, "QS850", 5)) { +		puts ("### No HW ID - assuming QS850"); +#endif +#ifdef CONFIG_QS823 +	if (!s || strncmp(s, "QS823", 5)) { +		puts ("### No HW ID - assuming QS823"); +#endif +	} else { +		for (e=s; *e; ++e) { +		if (*e == ' ') +		break; +	} + +	for ( ; s<e; ++s) { +		putc (*s); +		} +	} +	putc ('\n'); + +	return (0); +} + +/* ------------------------------------------------------------------------- */ +/* SDRAM Mode Register Definitions */ + +/* Set SDRAM Burst Length to 4 (010) */ +/* See Motorola MPC850 User Manual, Page 13-14 */ +#define SDRAM_BURST_LENGTH      (2) + +/* Set Wrap Type to Sequential (0) */ +/* See Motorola MPC850 User Manual, Page 13-14 */ +#define SDRAM_WRAP_TYPE         (0 << 3) + +/* Set /CAS Latentcy to 2 clocks */ +#define SDRAM_CAS_LATENTCY      (2 << 4) + +/* The Mode Register value must be shifted left by 2, since it is */ +/* placed on the address bus, and the 2 LSBs are ignored for 32-bit accesses */ +#define SDRAM_MODE_REG  ((SDRAM_BURST_LENGTH|SDRAM_WRAP_TYPE|SDRAM_CAS_LATENTCY) << 2) + +#define UPMA_RUN(loops,index)   (0x80002000 + (loops<<8) + index) + +/* Please note a value of zero = 16 loops */ +#define REFRESH_INIT_LOOPS (0) + + +long int initdram (int board_type) +{ +	volatile immap_t     *immap  = (immap_t *)CFG_IMMR; +	volatile memctl8xx_t *memctl = &immap->im_memctl; +	long int size; + +	upmconfig(UPMA, (uint *)sdram_table, sizeof(sdram_table)/sizeof(uint)); + +	/* +	* Prescaler for refresh +	*/ +	memctl->memc_mptpr = CFG_MPTPR; + +	/* +	* Map controller bank 1 to the SDRAM address +	*/ +	memctl->memc_or1 = CFG_OR1; +	memctl->memc_br1 = CFG_BR1; +	udelay(1000); + +	/* perform SDRAM initialization sequence */ +	memctl->memc_mamr = CFG_16M_MAMR; +	udelay(100); + +	/* Program the SDRAM's Mode Register */ +	memctl->memc_mar  = SDRAM_MODE_REG; + +	/* Run the Prechard Pattern at 0x3C */ +	memctl->memc_mcr  = UPMA_RUN(1,0x3c); +	udelay(1); + +	/* Run the Refresh program residing at MAD index 0x30 */ +	/* This contains the CBR Refresh command with a loop */ +	/* The SDRAM must be refreshed at least 2 times */ +	/* Please note a value of zero = 16 loops */ +	memctl->memc_mcr  = UPMA_RUN(REFRESH_INIT_LOOPS,0x30); +	udelay(1); + +	/* Run the Exception program residing at MAD index 0x3E */ +	/* This contains the Write Mode Register command */ +	/* The Write Mode Register command uses the value written to MAR */ +	memctl->memc_mcr  = UPMA_RUN(1,0x3e); + +	udelay (1000); + +	/* +	* Check for 32M SDRAM Memory Size +	*/ +	size = dram_size(CFG_32M_MAMR|MAMR_PTAE, +	(ulong *)SDRAM_BASE, SDRAM_32M_MAX_SIZE); +	udelay (1000); + +	/* +	* Check for 16M SDRAM Memory Size +	*/ +	if (size != SDRAM_32M_MAX_SIZE) { +	size = dram_size(CFG_16M_MAMR|MAMR_PTAE, +	(ulong *)SDRAM_BASE, SDRAM_16M_MAX_SIZE); +	udelay (1000); +	} + +	udelay(10000); +	return (size); +} + +/* ------------------------------------------------------------------------- */ + +/* + * Check memory range for valid RAM. A simple memory test determines + * the actually available RAM size between addresses `base' and + * `base + maxsize'. Some (not all) hardware errors are detected: + * - short between address lines + * - short between data lines + */ + +static long int dram_size (long int mamr_value, long int *base, long int maxsize) +{ +	volatile immap_t *immap = (immap_t *)CFG_IMMR; +	volatile memctl8xx_t *memctl = &immap->im_memctl; +	volatile long int *addr; +	long int cnt, val; + +	memctl->memc_mamr = mamr_value; + +	for (cnt = maxsize/sizeof(long); cnt > 0; cnt >>= 1) { +		addr = base + cnt; /* pointer arith! */ +		*addr = ~cnt; +	} + +	/* write 0 to base address */ +	addr = base; +	*addr = 0; + +	/* check at base address */ +	if ((val = *addr) != 0) { +		return (0); +	} + +	for (cnt = 1; ; cnt <<= 1) { +		addr = base + cnt; /* pointer arith! */ +		val = *addr; + +		if (val != (~cnt)) { +			return (cnt * sizeof(long)); +		} +	} +	/* NOTREACHED */ +} diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds new file mode 100644 index 000000000..61e10849e --- /dev/null +++ b/board/snmc/qs850/u-boot.lds @@ -0,0 +1,141 @@ +/* + * (C) Copyright 2000 + * 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 + */ + +OUTPUT_ARCH(powerpc) +SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib); +/* Do we need any of these for elf? +   __DYNAMIC = 0;    */ +SECTIONS +{ +  /* Read-only sections, merged into text segment: */ +  . = + SIZEOF_HEADERS; +  .interp : { *(.interp) } +  .hash          : { *(.hash)		} +  .dynsym        : { *(.dynsym)		} +  .dynstr        : { *(.dynstr)		} +  .rel.text      : { *(.rel.text)	} +  .rela.text     : { *(.rela.text) 	} +  .rel.data      : { *(.rel.data)	} +  .rela.data     : { *(.rela.data) 	} +  .rel.rodata    : { *(.rel.rodata) 	} +  .rela.rodata   : { *(.rela.rodata) 	} +  .rel.got       : { *(.rel.got)	} +  .rela.got      : { *(.rela.got)	} +  .rel.ctors     : { *(.rel.ctors)	} +  .rela.ctors    : { *(.rela.ctors)	} +  .rel.dtors     : { *(.rel.dtors)	} +  .rela.dtors    : { *(.rela.dtors)	} +  .rel.bss       : { *(.rel.bss)	} +  .rela.bss      : { *(.rela.bss)	} +  .rel.plt       : { *(.rel.plt)	} +  .rela.plt      : { *(.rela.plt)	} +  .init          : { *(.init)		} +  .plt : { *(.plt) } +  .text      : +  { +    /* WARNING - the following is hand-optimized to fit within	*/ +    /* the sector layout of our flash chips!	XXX FIXME XXX	*/ + +	cpu/mpc8xx/start.o		(.text) +	cpu/mpc8xx/traps.o		(.text) +	common/dlmalloc.o		(.text) +	lib_ppc/ppcstring.o		(.text) +	lib_generic/vsprintf.o	(.text) +	lib_generic/crc32.o		(.text) +	lib_generic/zlib.o		(.text) +	lib_ppc/cache.o		(.text) +	lib_ppc/time.o		(.text) + +    . = DEFINED(env_offset) ? env_offset : .; +	common/environment.o	(.ppcenv) + +    *(.text) +    *(.fixup) +    *(.got1) +  } +  _etext = .; +  PROVIDE (etext = .); +  .rodata    : +  { +    *(.rodata) +    *(.rodata1) +    *(.rodata.str1.4) +  } +  .fini      : { *(.fini)    } =0 +  .ctors     : { *(.ctors)   } +  .dtors     : { *(.dtors)   } + +  /* Read-write section, merged into data segment: */ +  . = (. + 0x00FF) & 0xFFFFFF00; +  _erotext = .; +  PROVIDE (erotext = .); +  .reloc   : +  { +    *(.got) +    _GOT2_TABLE_ = .; +    *(.got2) +    _FIXUP_TABLE_ = .; +    *(.fixup) +  } +  __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2; +  __fixup_entries = (. - _FIXUP_TABLE_)>>2; + +  .data    : +  { +    *(.data) +    *(.data1) +    *(.sdata) +    *(.sdata2) +    *(.dynamic) +    CONSTRUCTORS +  } +  _edata  =  .; +  PROVIDE (edata = .); + +  __u_boot_cmd_start = .; +  .u_boot_cmd : { *(.u_boot_cmd) } +  __u_boot_cmd_end = .; + + +  __start___ex_table = .; +  __ex_table : { *(__ex_table) } +  __stop___ex_table = .; + +  . = ALIGN(256); +  __init_begin = .; +  .text.init : { *(.text.init) } +  .data.init : { *(.data.init) } +  . = ALIGN(256); +  __init_end = .; + +  __bss_start = .; +  .bss       : +  { +   *(.sbss) *(.scommon) +   *(.dynbss) +   *(.bss) +   *(COMMON) +  } +  _end = . ; +  PROVIDE (end = .); +} diff --git a/board/snmc/qs860t/Makefile b/board/snmc/qs860t/Makefile new file mode 100644 index 000000000..13ce9fc9d --- /dev/null +++ b/board/snmc/qs860t/Makefile @@ -0,0 +1,40 @@ +# +# (C) Copyright 2000 +# 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 +# + +include $(TOPDIR)/config.mk + +LIB	= lib$(BOARD).a + +OBJS	= $(BOARD).o flash.o + +$(LIB):	.depend $(OBJS) +	$(AR) crv $@ $(OBJS) + +######################################################################### + +.depend:	Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) +		$(CC) -M $(CFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ + +sinclude .depend + +######################################################################### diff --git a/board/snmc/qs860t/config.mk b/board/snmc/qs860t/config.mk new file mode 100644 index 000000000..f6ab2607b --- /dev/null +++ b/board/snmc/qs860t/config.mk @@ -0,0 +1,29 @@ +# +# (C) Copyright 2002 +# Simple Network Magic Corporation, dnevil@snmc.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 +# + +# +# QS860T +# Start address of 512K Socketed Flash +# + +TEXT_BASE = 0xFFF00000 diff --git a/board/snmc/qs860t/flash.c b/board/snmc/qs860t/flash.c new file mode 100644 index 000000000..ab7c8a19a --- /dev/null +++ b/board/snmc/qs860t/flash.c @@ -0,0 +1,1121 @@ +/* + * (C) Copyright 2003 + * MuLogic B.V. + * + * (C) Copyright 2001 + * 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 + */ + +#include <common.h> +#include <ppc4xx.h> +#include <asm/u-boot.h> +#include <asm/processor.h> + +flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ + + +#ifdef CFG_FLASH_16BIT +#define FLASH_WORD_SIZE	unsigned short +#define FLASH_ID_MASK	0xFFFF +#else +#define FLASH_WORD_SIZE unsigned long +#define FLASH_ID_MASK	0xFFFFFFFF +#endif + +/*----------------------------------------------------------------------- + * Functions + */ +/* stolen from esteem192e/flash.c */ +ulong flash_get_size (volatile FLASH_WORD_SIZE *addr, flash_info_t *info); + +#ifndef CFG_FLASH_16BIT +static int write_word (flash_info_t *info, ulong dest, ulong data); +#else +static int write_short (flash_info_t *info, ulong dest, ushort data); +#endif +static void flash_get_offsets (ulong base, flash_info_t *info); + + +/*----------------------------------------------------------------------- + */ + +unsigned long flash_init (void) +{ +	unsigned long size_b0, size_b1; +	int i; +	uint pbcr; +	unsigned long base_b0, base_b1; + +	/* 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((volatile FLASH_WORD_SIZE *)FLASH_BASE1_PRELIM, &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); +	} + +	/* Only one bank */ +	if (CFG_MAX_FLASH_BANKS == 1) +	{ +		/* Setup offsets */ +		flash_get_offsets (FLASH_BASE1_PRELIM, &flash_info[0]); + +		/* Monitor protection ON by default */ +#if 0	/* sand: */ +		(void)flash_protect(FLAG_PROTECT_SET, +			FLASH_BASE1_PRELIM-CFG_MONITOR_LEN+size_b0, +			FLASH_BASE1_PRELIM-1+size_b0, +			&flash_info[0]); +#else +		(void)flash_protect(FLAG_PROTECT_SET, +			CFG_MONITOR_BASE, +			CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, +			&flash_info[0]); +#endif +		size_b1 = 0 ; +		flash_info[0].size = size_b0; +	} +	/* 2 banks */ +	else +	{ +		size_b1 = flash_get_size((volatile FLASH_WORD_SIZE *)FLASH_BASE1_PRELIM, &flash_info[1]); + +		/* Re-do sizing to get full correct info */ +		if (size_b1) +		{ +			mtdcr(ebccfga, pb0cr); +			pbcr = mfdcr(ebccfgd); +			mtdcr(ebccfga, pb0cr); +			base_b1 = -size_b1; +			pbcr = (pbcr & 0x0001ffff) | base_b1 | (((size_b1/1024/1024)-1)<<17); +			mtdcr(ebccfgd, pbcr); +		} + +		if (size_b0) +		{ +			mtdcr(ebccfga, pb1cr); +			pbcr = mfdcr(ebccfgd); +			mtdcr(ebccfga, pb1cr); +			base_b0 = base_b1 - size_b0; +			pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17); +			mtdcr(ebccfgd, pbcr); +		} + +		size_b0 = flash_get_size((volatile FLASH_WORD_SIZE *)base_b0, &flash_info[0]); + +		flash_get_offsets (base_b0, &flash_info[0]); + +		/* monitor protection ON by default */ +#if 0	/* sand: */ +		(void)flash_protect(FLAG_PROTECT_SET, +			FLASH_BASE1_PRELIM-CFG_MONITOR_LEN+size_b0, +			FLASH_BASE1_PRELIM-1+size_b0, +			&flash_info[0]); +#else +		(void)flash_protect(FLAG_PROTECT_SET, +			CFG_MONITOR_BASE, +			CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, +			&flash_info[0]); +#endif + +		if (size_b1) { +			/* Re-do sizing to get full correct info */ +			size_b1 = flash_get_size((volatile FLASH_WORD_SIZE *)base_b1, &flash_info[1]); + +			flash_get_offsets (base_b1, &flash_info[1]); + +			/* monitor protection ON by default */ +			(void)flash_protect(FLAG_PROTECT_SET, +				base_b1+size_b1-CFG_MONITOR_LEN, +				base_b1+size_b1-1, +				&flash_info[1]); +			/* monitor protection OFF by default (one is enough) */ +			(void)flash_protect(FLAG_PROTECT_CLEAR, +				base_b0+size_b0-CFG_MONITOR_LEN, +				base_b0+size_b0-1, +				&flash_info[0]); +		} else { +			flash_info[1].flash_id = FLASH_UNKNOWN; +			flash_info[1].sector_count = -1; +		} + +		flash_info[0].size = size_b0; +		flash_info[1].size = size_b1; +	}/* else 2 banks */ +	return (size_b0 + size_b1); +} + + + +/*----------------------------------------------------------------------- + */ + +static void flash_get_offsets (ulong base, flash_info_t *info) +{ +	int i; + +	/* set up sector start adress table */ +	if ((info->flash_id & FLASH_TYPEMASK) == INTEL_ID_28F320J3A || +		(info->flash_id & FLASH_TYPEMASK) == INTEL_ID_28F640J3A || +		(info->flash_id & FLASH_TYPEMASK) == INTEL_ID_28F128J3A) { +		for (i = 0; i < info->sector_count; i++) { +			info->start[i] = base + (i * info->size/info->sector_count); +		} +	} +	else if (info->flash_id & FLASH_BTYPE) { +		if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) { + +#ifndef CFG_FLASH_16BIT +			/* set sector offsets for bottom boot block type */ +			info->start[0] = base + 0x00000000; +			info->start[1] = base + 0x00004000; +			info->start[2] = base + 0x00008000; +			info->start[3] = base + 0x0000C000; +			info->start[4] = base + 0x00010000; +			info->start[5] = base + 0x00014000; +			info->start[6] = base + 0x00018000; +			info->start[7] = base + 0x0001C000; +			for (i = 8; i < info->sector_count; i++) { +				info->start[i] = base + (i * 0x00020000) - 0x000E0000; +			} +		} else { +			/* set sector offsets for bottom boot block type */ +			info->start[0] = base + 0x00000000; +			info->start[1] = base + 0x00008000; +			info->start[2] = base + 0x0000C000; +			info->start[3] = base + 0x00010000; +			for (i = 4; i < info->sector_count; i++) { +				info->start[i] = base + (i * 0x00020000) - 0x00060000; +			} +		} +#else +			/* set sector offsets for bottom boot block type */ +			info->start[0] = base + 0x00000000; +			info->start[1] = base + 0x00002000; +			info->start[2] = base + 0x00004000; +			info->start[3] = base + 0x00006000; +			info->start[4] = base + 0x00008000; +			info->start[5] = base + 0x0000A000; +			info->start[6] = base + 0x0000C000; +			info->start[7] = base + 0x0000E000; +			for (i = 8; i < info->sector_count; i++) { +				info->start[i] = base + (i * 0x00010000) - 0x00070000; +			} +		} else { +			/* 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; +			} +		} +#endif +	} else { +		/* set sector offsets for top boot block type */ +		i = info->sector_count - 1; +		if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) { + +#ifndef CFG_FLASH_16BIT +			info->start[i--] = base + info->size - 0x00004000; +			info->start[i--] = base + info->size - 0x00008000; +			info->start[i--] = base + info->size - 0x0000C000; +			info->start[i--] = base + info->size - 0x00010000; +			info->start[i--] = base + info->size - 0x00014000; +			info->start[i--] = base + info->size - 0x00018000; +			info->start[i--] = base + info->size - 0x0001C000; +			for (; i >= 0; i--) { +				info->start[i] = base + i * 0x00020000; +			} +		} else { + +			info->start[i--] = base + info->size - 0x00008000; +			info->start[i--] = base + info->size - 0x0000C000; +			info->start[i--] = base + info->size - 0x00010000; +			for (; i >= 0; i--) { +				info->start[i] = base + i * 0x00020000; +			} +		} +#else +			info->start[i--] = base + info->size - 0x00002000; +			info->start[i--] = base + info->size - 0x00004000; +			info->start[i--] = base + info->size - 0x00006000; +			info->start[i--] = base + info->size - 0x00008000; +			info->start[i--] = base + info->size - 0x0000A000; +			info->start[i--] = base + info->size - 0x0000C000; +			info->start[i--] = base + info->size - 0x0000E000; +			for (; i >= 0; i--) { +				info->start[i] = base + i * 0x00010000; +			} +		} else { +			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; +			} +		} +#endif +	} +} + +/*----------------------------------------------------------------------- + */ + +void flash_print_info  (flash_info_t *info) +{ +	int i; +	uchar *boottype; +	uchar botboot[]=", bottom boot sect)\n"; +	uchar topboot[]=", top boot sector)\n"; + +	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 ("STM ");		break; +	case FLASH_MAN_INTEL:	printf ("INTEL ");		break; +	default:		printf ("Unknown Vendor ");	break; +	} + +	if (info->flash_id & 0x0001 ) { +		boottype = botboot; +	} else { +		boottype = topboot; +	} + +	switch (info->flash_id & FLASH_TYPEMASK) { +	case FLASH_AM400B:	printf ("AM29LV400B (4 Mbit%s",boottype); +				break; +	case FLASH_AM400T:	printf ("AM29LV400T (4 Mbit%s",boottype); +				break; +	case FLASH_AM800B:	printf ("AM29LV800B (8 Mbit%s",boottype); +				break; +	case FLASH_AM800T:	printf ("AM29LV800T (8 Mbit%s",boottype); +				break; +	case FLASH_AM160B:	printf ("AM29LV160B (16 Mbit%s",boottype); +				break; +	case FLASH_AM160T:	printf ("AM29LV160T (16 Mbit%s",boottype); +				break; +	case FLASH_AM320B:	printf ("AM29LV320B (32 Mbit%s",boottype); +				break; +	case FLASH_AM320T:	printf ("AM29LV320T (32 Mbit%s",boottype); +				break; +	case FLASH_INTEL800B:	printf ("INTEL28F800B (8 Mbit%s",boottype); +				break; +	case FLASH_INTEL800T:	printf ("INTEL28F800T (8 Mbit%s",boottype); +				break; +	case FLASH_INTEL160B:	printf ("INTEL28F160B (16 Mbit%s",boottype); +				break; +	case FLASH_INTEL160T:	printf ("INTEL28F160T (16 Mbit%s",boottype); +				break; +	case FLASH_INTEL320B:	printf ("INTEL28F320B (32 Mbit%s",boottype); +				break; +	case FLASH_INTEL320T:	printf ("INTEL28F320T (32 Mbit%s",boottype); +				break; +	case FLASH_AMDL322T:	printf ("AM29DL322T (32 Mbit%s",boottype); +				break; + +#if 0 /* enable when devices are available */ + +	case FLASH_INTEL640B:	printf ("INTEL28F640B (64 Mbit%s",boottype); +				break; +	case FLASH_INTEL640T:	printf ("INTEL28F640T (64 Mbit%s",boottype); +				break; +#endif +	case INTEL_ID_28F320J3A:	printf ("INTEL28F320JA3 (32 Mbit%s",boottype); +				break; +	case INTEL_ID_28F640J3A:	printf ("INTEL28F640JA3 (64 Mbit%s",boottype); +				break; +	case INTEL_ID_28F128J3A:	printf ("INTEL28F128JA3 (128 Mbit%s",boottype); +				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) { +		if ((i % 5) == 0) +			printf ("\n   "); +		printf (" %08lX%s", +			info->start[i], +			info->protect[i] ? " (RO)" : "     " +		); +	} +	printf ("\n"); +	return; +} + + +/*----------------------------------------------------------------------- + */ + + +/*----------------------------------------------------------------------- + */ + +/* + * The following code cannot be run from FLASH! + */ +ulong flash_get_size (volatile FLASH_WORD_SIZE *addr, flash_info_t *info) +{ +	short i; +	ulong base = (ulong)addr; +	FLASH_WORD_SIZE value; + +	/* Write auto select command: read Manufacturer ID */ + + +#ifndef CFG_FLASH_16BIT + +	/* +	 * Note: if it is an AMD flash and the word at addr[0000] +	 * is 0x00890089 this routine will think it is an Intel +	 * flash device and may(most likely) cause trouble. +	 */ + +	addr[0x0000] = 0x00900090; +	if(addr[0x0000] != 0x00890089){ +		addr[0x0555] = 0x00AA00AA; +		addr[0x02AA] = 0x00550055; +		addr[0x0555] = 0x00900090; +#else + +	/* +	 * Note: if it is an AMD flash and the word at addr[0000] +	 * is 0x0089 this routine will think it is an Intel +	 * flash device and may(most likely) cause trouble. +	 */ + +	addr[0x0000] = 0x0090; + +	if(addr[0x0000] != 0x0089){ +		addr[0x0555] = 0x00AA; +		addr[0x02AA] = 0x0055; +		addr[0x0555] = 0x0090; +#endif +	} +	value = addr[0]; + +	switch (value) { +	case (AMD_MANUFACT & FLASH_ID_MASK): +		info->flash_id = FLASH_MAN_AMD; +		break; +	case (FUJ_MANUFACT & FLASH_ID_MASK): +		info->flash_id = FLASH_MAN_FUJ; +		break; +	case (STM_MANUFACT & FLASH_ID_MASK): +		info->flash_id = FLASH_MAN_STM; +		break; +	case (SST_MANUFACT & FLASH_ID_MASK): +		info->flash_id = FLASH_MAN_SST; +		break; +	case (INTEL_MANUFACT & FLASH_ID_MASK): +		info->flash_id = FLASH_MAN_INTEL; +		break; +	default: +		info->flash_id = FLASH_UNKNOWN; +		info->sector_count = 0; +		info->size = 0; +		return (0); /* no or unknown flash */ + +	} + +	value = addr[1];			/* device ID		*/ + +	switch (value) { + +	case (AMD_ID_LV400T & FLASH_ID_MASK): +		info->flash_id += FLASH_AM400T; +		info->sector_count = 11; +		info->size = 0x00100000; +		break;				/* => 1 MB		*/ + +	case (AMD_ID_LV400B & FLASH_ID_MASK): +		info->flash_id += FLASH_AM400B; +		info->sector_count = 11; +		info->size = 0x00100000; +		break;				/* => 1 MB		*/ + +	case (AMD_ID_LV800T & FLASH_ID_MASK): +		info->flash_id += FLASH_AM800T; +		info->sector_count = 19; +		info->size = 0x00200000; +		break;				/* => 2 MB		*/ + +	case (AMD_ID_LV800B & FLASH_ID_MASK): +		info->flash_id += FLASH_AM800B; +		info->sector_count = 19; +		info->size = 0x00200000; +		break;				/* => 2 MB		*/ + +	case (AMD_ID_LV160T & FLASH_ID_MASK): +		info->flash_id += FLASH_AM160T; +		info->sector_count = 35; +		info->size = 0x00400000; +		break;				/* => 4 MB		*/ + +	case (AMD_ID_LV160B & FLASH_ID_MASK): +		info->flash_id += FLASH_AM160B; +		info->sector_count = 35; +		info->size = 0x00400000; +		break;				/* => 4 MB		*/ +#if 0	/* enable when device IDs are available */ +	case (AMD_ID_LV320T & FLASH_ID_MASK): +		info->flash_id += FLASH_AM320T; +		info->sector_count = 67; +		info->size = 0x00800000; +		break;				/* => 8 MB		*/ + +	case (AMD_ID_LV320B & FLASH_ID_MASK): +		info->flash_id += FLASH_AM320B; +		info->sector_count = 67; +		info->size = 0x00800000; +		break;				/* => 8 MB		*/ +#endif + +	case (AMD_ID_DL322T & FLASH_ID_MASK): +		info->flash_id += FLASH_AMDL322T; +		info->sector_count = 71; +		info->size = 0x00800000; +		break;				/* => 8 MB		*/ + +	case (INTEL_ID_28F800B3T & FLASH_ID_MASK): +		info->flash_id += FLASH_INTEL800T; +		info->sector_count = 23; +		info->size = 0x00200000; +		break;				/* => 2 MB		*/ + +	case (INTEL_ID_28F800B3B & FLASH_ID_MASK): +		info->flash_id += FLASH_INTEL800B; +		info->sector_count = 23; +		info->size = 0x00200000; +		break;				/* => 2 MB		*/ + +	case (INTEL_ID_28F160B3T & FLASH_ID_MASK): +		info->flash_id += FLASH_INTEL160T; +		info->sector_count = 39; +		info->size = 0x00400000; +		break;				/* => 4 MB		*/ + +	case (INTEL_ID_28F160B3B & FLASH_ID_MASK): +		info->flash_id += FLASH_INTEL160B; +		info->sector_count = 39; +		info->size = 0x00400000; +		break;				/* => 4 MB		*/ + +	case (INTEL_ID_28F320B3T & FLASH_ID_MASK): +		info->flash_id += FLASH_INTEL320T; +		info->sector_count = 71; +		info->size = 0x00800000; +		break;				/* => 8 MB		*/ + +	case (INTEL_ID_28F320B3B & FLASH_ID_MASK): +		info->flash_id += FLASH_AM320B; +		info->sector_count = 71; +		info->size = 0x00800000; +		break;				/* => 8 MB		*/ + +#if 0 /* enable when devices are available */ +	case (INTEL_ID_28F320B3T & FLASH_ID_MASK): +		info->flash_id += FLASH_INTEL320T; +		info->sector_count = 135; +		info->size = 0x01000000; +		break;				/* => 16 MB		*/ + +	case (INTEL_ID_28F320B3B & FLASH_ID_MASK): +		info->flash_id += FLASH_AM320B; +		info->sector_count = 135; +		info->size = 0x01000000; +		break;				/* => 16 MB		*/ +#endif +	case (INTEL_ID_28F320J3A & FLASH_ID_MASK): +		info->flash_id += FLASH_28F320J3A; +		info->sector_count = 32; +		info->size = 0x00400000; +		break;				/* => 32 MBit  	*/ +	case (INTEL_ID_28F640J3A & FLASH_ID_MASK): +		info->flash_id += FLASH_28F640J3A; +		info->sector_count = 64; +		info->size = 0x00800000; +		break;				/* => 64 MBit  	*/ +	case (INTEL_ID_28F128J3A & FLASH_ID_MASK): +		info->flash_id += FLASH_28F128J3A; +		info->sector_count = 128; +		info->size = 0x01000000; +		break;				/* => 128 MBit  	*/ + +	default: +		/* FIXME*/ +		info->flash_id = FLASH_UNKNOWN; +		return (0);			/* => no or unknown flash */ +	} + +	flash_get_offsets(base, info); + +	/* check for protected sectors */ +	for (i = 0; i < info->sector_count; i++) { +		/* read sector protection at sector address, (A7 .. A0) = 0x02 */ +		/* D0 = 1 if protected */ +		addr = (volatile FLASH_WORD_SIZE *)(info->start[i]); +		info->protect[i] = addr[2] & 1; +	} + +	/* +	 * Prevent writes to uninitialized FLASH. +	 */ +	if (info->flash_id != FLASH_UNKNOWN) { +		addr = (volatile FLASH_WORD_SIZE *)info->start[0]; +		if( (info->flash_id & 0xFF00) == FLASH_MAN_INTEL){ +			*addr = (0x00F000F0 & FLASH_ID_MASK);	/* reset bank */ +		} else { +			*addr = (0x00FF00FF & FLASH_ID_MASK);	/* reset bank */ +		} +	} + +	return (info->size); +} + + +/*----------------------------------------------------------------------- + */ + +int flash_erase (flash_info_t *info, int s_first, int s_last) +{ + +	volatile FLASH_WORD_SIZE *addr=(volatile FLASH_WORD_SIZE*)(info->start[0]); +	int flag, prot, sect, l_sect, barf; +	ulong start, now, last; +	int rcode = 0; + +	if ((s_first < 0) || (s_first > s_last)) { +		if (info->flash_id == FLASH_UNKNOWN) { +			printf ("- missing\n"); +		} else { +			printf ("- no sectors to erase\n"); +		} +		return 1; +	} + +	if ((info->flash_id == FLASH_UNKNOWN) || +		((info->flash_id > FLASH_AMD_COMP) && +		( (info->flash_id & FLASH_VENDMASK) != FLASH_MAN_INTEL ) ) ){ +		printf ("Can't erase unknown flash type - aborted\n"); +		return 1; +	} + +	prot = 0; +	for (sect=s_first; sect<=s_last; ++sect) { +		if (info->protect[sect]) { +			prot++; +		} +	} + +	if (prot) { +		printf ("- Warning: %d protected sectors will not be erased!\n", +			prot); +	} else { +		printf ("\n"); +	} + +	l_sect = -1; + +	/* Disable interrupts which might cause a timeout here */ +	flag = disable_interrupts(); +    if(info->flash_id < FLASH_AMD_COMP) { +#ifndef CFG_FLASH_16BIT +	addr[0x0555] = 0x00AA00AA; +	addr[0x02AA] = 0x00550055; +	addr[0x0555] = 0x00800080; +	addr[0x0555] = 0x00AA00AA; +	addr[0x02AA] = 0x00550055; +#else +	addr[0x0555] = 0x00AA; +	addr[0x02AA] = 0x0055; +	addr[0x0555] = 0x0080; +	addr[0x0555] = 0x00AA; +	addr[0x02AA] = 0x0055; +#endif +	/* Start erase on unprotected sectors */ +	for (sect = s_first; sect<=s_last; sect++) { +		if (info->protect[sect] == 0) {	/* not protected */ +			addr = (volatile FLASH_WORD_SIZE *)(info->start[sect]); +			addr[0] = (0x00300030 & FLASH_ID_MASK); +			l_sect = sect; +		} +	} + +	/* re-enable interrupts if necessary */ +	if (flag) +		enable_interrupts(); + +	/* wait at least 80us - let's wait 1 ms */ +	udelay (1000); + +	/* +	 * We wait for the last triggered sector +	 */ +	if (l_sect < 0) +		goto DONE; + +	start = get_timer (0); +	last  = start; +	addr = (volatile FLASH_WORD_SIZE*)(info->start[l_sect]); +	while ((addr[0] & (0x00800080&FLASH_ID_MASK)) != +		(0x00800080&FLASH_ID_MASK)  ) +	{ +		if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) { +			printf ("Timeout\n"); +			return 1; +		} +		/* show that we're waiting */ +		if ((now - last) > 1000) {	/* every second */ +			serial_putc ('.'); +			last = now; +		} +	} + +DONE: +	/* reset to read mode */ +	addr = (volatile FLASH_WORD_SIZE *)info->start[0]; +	addr[0] = (0x00F000F0 & FLASH_ID_MASK);	/* reset bank */ +    } else { + + +	for (sect = s_first; sect<=s_last; sect++) { +		if (info->protect[sect] == 0) {	/* not protected */ +			barf = 0; +#ifndef CFG_FLASH_16BIT +			addr = (vu_long*)(info->start[sect]); +			addr[0] = 0x00200020; +			addr[0] = 0x00D000D0; +			while(!(addr[0] & 0x00800080));	/* wait for error or finish */ +			if( addr[0] & 0x003A003A) {	/* check for error */ +				barf = addr[0] & 0x003A0000; +				if( barf ) { +					barf >>=16; +				} else { +					barf = addr[0] & 0x0000003A; +				} +			} +#else +			addr = (vu_short*)(info->start[sect]); +			addr[0] = 0x0020; +			addr[0] = 0x00D0; +			while(!(addr[0] & 0x0080));	/* wait for error or finish */ +			if( addr[0] & 0x003A)	/* check for error */ +				barf = addr[0] & 0x003A; +#endif +			if(barf) { +				printf("\nFlash error in sector at %lx\n",(unsigned long)addr); +				if(barf & 0x0002) printf("Block locked, not erased.\n"); +				if((barf & 0x0030) == 0x0030) +					printf("Command Sequence error.\n"); +				if((barf & 0x0030) == 0x0020) +					printf("Block Erase error.\n"); +				if(barf & 0x0008) printf("Vpp Low error.\n"); +				rcode = 1; +			} else printf("."); +			l_sect = sect; +		} +	addr = (volatile FLASH_WORD_SIZE *)info->start[0]; +	addr[0] = (0x00FF00FF & FLASH_ID_MASK);	/* reset bank */ + +	} + +    } +	printf (" done\n"); +	return rcode; +} + +/*----------------------------------------------------------------------- + */ + +/*flash_info_t *addr2info (ulong addr) +{ +	flash_info_t *info; +	int i; + +	for (i=0, info=&flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) { +		if ((addr >= info->start[0]) && +		    (addr < (info->start[0] + info->size)) ) { +			return (info); +		} +	} + +	return (NULL); +} +*/ +/*----------------------------------------------------------------------- + * Copy memory to flash. + * Make sure all target addresses are within Flash bounds, + * and no protected sectors are hit. + * Returns: + * 0 - OK + * 1 - write timeout + * 2 - Flash not erased + * 4 - target range includes protected sectors + * 8 - target address not in Flash memory + */ + +/*int flash_write (uchar *src, ulong addr, ulong cnt) +{ +	int i; +	ulong         end        = addr + cnt - 1; +	flash_info_t *info_first = addr2info (addr); +	flash_info_t *info_last  = addr2info (end ); +	flash_info_t *info; + +	if (cnt == 0) { +		return (0); +	} + +	if (!info_first || !info_last) { +		return (8); +	} + +	for (info = info_first; info <= info_last; ++info) { +		ulong b_end = info->start[0] + info->size;*/	/* bank end addr */ +/*		short s_end = info->sector_count - 1; +		for (i=0; i<info->sector_count; ++i) { +			ulong e_addr = (i == s_end) ? b_end : info->start[i + 1]; + +			if ((end >= info->start[i]) && (addr < e_addr) && +			    (info->protect[i] != 0) ) { +				return (4); +			} +		} +	} + +*/	/* finally write data to flash */ +/*	for (info = info_first; info <= info_last && cnt>0; ++info) { +		ulong len; + +		len = info->start[0] + info->size - addr; +		if (len > cnt) +			len = cnt; +		if ((i = write_buff(info, src, addr, len)) != 0) { +			return (i); +		} +		cnt  -= len; +		addr += len; +		src  += len; +	} +	return (0); +} +*/ +/*----------------------------------------------------------------------- + * Copy memory to flash, returns: + * 0 - OK + * 1 - write timeout + * 2 - Flash not erased + */ + +int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) +{ +#ifndef CFG_FLASH_16BIT +	ulong cp, wp, data; +	int l; +#else +	ulong cp, wp; +	ushort data; +#endif +	int i, rc; + +#ifndef CFG_FLASH_16BIT + + +	wp = (addr & ~3);	/* get lower word aligned address */ + +	/* +	 * handle unaligned start bytes +	 */ +	if ((l = addr - wp) != 0) { +		data = 0; +		for (i=0, cp=wp; i<l; ++i, ++cp) { +			data = (data << 8) | (*(uchar *)cp); +		} +		for (; i<4 && cnt>0; ++i) { +			data = (data << 8) | *src++; +			--cnt; +			++cp; +		} +		for (; cnt==0 && i<4; ++i, ++cp) { +			data = (data << 8) | (*(uchar *)cp); +		} + +		if ((rc = write_word(info, wp, data)) != 0) { +			return (rc); +		} +		wp += 4; +	} + +	/* +	 * handle word aligned part +	 */ +	while (cnt >= 4) { +		data = 0; +		for (i=0; i<4; ++i) { +			data = (data << 8) | *src++; +		} +		if ((rc = write_word(info, wp, data)) != 0) { +			return (rc); +		} +		wp  += 4; +		cnt -= 4; +	} + +	if (cnt == 0) { +		return (0); +	} + +	/* +	 * handle unaligned tail bytes +	 */ +	data = 0; +	for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) { +		data = (data << 8) | *src++; +		--cnt; +	} +	for (; i<4; ++i, ++cp) { +		data = (data << 8) | (*(uchar *)cp); +	} + +	return (write_word(info, wp, data)); + +#else +	wp = (addr & ~1);	/* get lower word aligned address */ + +	/* +	 * handle unaligned start byte +	 */ +	if (addr - wp) { +		data = 0; +		data = (data << 8) | *src++; +		--cnt; +		if ((rc = write_short(info, wp, data)) != 0) { +			return (rc); +		} +		wp += 2; +	} + +	/* +	 * handle word aligned part +	 */ +/*	l = 0; used for debuging  */ +	while (cnt >= 2) { +		data = 0; +		for (i=0; i<2; ++i) { +			data = (data << 8) | *src++; +		} + +/*		if(!l){ +			printf("%x",data); +			l = 1; +		}  used for debuging */ + +		if ((rc = write_short(info, wp, data)) != 0) { +			return (rc); +		} +		wp  += 2; +		cnt -= 2; +	} + +	if (cnt == 0) { +		return (0); +	} + +	/* +	 * handle unaligned tail bytes +	 */ +	data = 0; +	for (i=0, cp=wp; i<2 && cnt>0; ++i, ++cp) { +		data = (data << 8) | *src++; +		--cnt; +	} +	for (; i<2; ++i, ++cp) { +		data = (data << 8) | (*(uchar *)cp); +	} + +	return (write_short(info, wp, data)); + + +#endif +} + +/*----------------------------------------------------------------------- + * Write a word to Flash, returns: + * 0 - OK + * 1 - write timeout + * 2 - Flash not erased + */ +#ifndef CFG_FLASH_16BIT +static int write_word (flash_info_t *info, ulong dest, ulong data) +{ +	vu_long *addr = (vu_long*)(info->start[0]); +	ulong start,barf; +	int flag; + + +	/* Check if Flash is (sufficiently) erased */ +	if ((*((vu_long *)dest) & data) != data) { +		return (2); +	} + +	/* Disable interrupts which might cause a timeout here */ +	flag = disable_interrupts(); + +	if(info->flash_id > FLASH_AMD_COMP) { +		/* AMD stuff */ +		addr[0x0555] = 0x00AA00AA; +		addr[0x02AA] = 0x00550055; +		addr[0x0555] = 0x00A000A0; +	} else { +		/* intel stuff */ +		*addr = 0x00400040; +	} +	*((vu_long *)dest) = data; + +	/* re-enable interrupts if necessary */ +	if (flag) +		enable_interrupts(); + +	/* data polling for D7 */ +	start = get_timer (0); + +	if(info->flash_id > FLASH_AMD_COMP) { +		while ((*((vu_long *)dest) & 0x00800080) != (data & 0x00800080)) { +			if (get_timer(start) > CFG_FLASH_WRITE_TOUT) { +				return (1); +			} +		} +	} else { +		while(!(addr[0] & 0x00800080)) {  	/* wait for error or finish */ +			if (get_timer(start) > CFG_FLASH_WRITE_TOUT) { +				return (1); +			} + +		if( addr[0] & 0x003A003A) {	/* check for error */ +			barf = addr[0] & 0x003A0000; +			if( barf ) { +				barf >>=16; +			} else { +				barf = addr[0] & 0x0000003A; +			} +			printf("\nFlash write error at address %lx\n",(unsigned long)dest); +			if(barf & 0x0002) printf("Block locked, not erased.\n"); +			if(barf & 0x0010) printf("Programming error.\n"); +			if(barf & 0x0008) printf("Vpp Low error.\n"); +			return(2); +		} +	} + +	return (0); +} + +#else + +static int write_short (flash_info_t *info, ulong dest, ushort data) +{ +	vu_short *addr = (vu_short*)(info->start[0]); +	ulong start,barf; +	int flag; + +	/* Check if Flash is (sufficiently) erased */ +	if ((*((vu_short *)dest) & data) != data) { +		return (2); +	} + +	/* Disable interrupts which might cause a timeout here */ +	flag = disable_interrupts(); + +	if(info->flash_id < FLASH_AMD_COMP) { +		/* AMD stuff */ +		addr[0x0555] = 0x00AA; +		addr[0x02AA] = 0x0055; +		addr[0x0555] = 0x00A0; +	} else { +		/* intel stuff */ +		*addr = 0x00D0; +		*addr = 0x0040; +	} +	*((vu_short *)dest) = data; + +	/* re-enable interrupts if necessary */ +	if (flag) +		enable_interrupts(); + +	/* data polling for D7 */ +	start = get_timer (0); + +	if(info->flash_id < FLASH_AMD_COMP) { +		/* AMD stuff */ +		while ((*((vu_short *)dest) & 0x0080) != (data & 0x0080)) { +			if (get_timer(start) > CFG_FLASH_WRITE_TOUT) { +				return (1); +			} +		} + +	} else { +		/* intel stuff */ +		while(!(addr[0] & 0x0080)){  	/* wait for error or finish */ +			if (get_timer(start) > CFG_FLASH_WRITE_TOUT) return (1); +		} + +		if( addr[0] & 0x003A) {	/* check for error */ +			barf = addr[0] & 0x003A; +			printf("\nFlash write error at address %lx\n",(unsigned long)dest); +			if(barf & 0x0002) printf("Block locked, not erased.\n"); +			if(barf & 0x0010) printf("Programming error.\n"); +			if(barf & 0x0008) printf("Vpp Low error.\n"); +			return(2); +		} +		*addr = 0x00B0; +		*addr = 0x0070; +		while(!(addr[0] & 0x0080)){  	/* wait for error or finish */ +			if (get_timer(start) > CFG_FLASH_WRITE_TOUT) return (1); +		} +		*addr = 0x00FF; +	} +	return (0); +} + + +#endif + +/*----------------------------------------------------------------------- + */ diff --git a/board/snmc/qs860t/qs860t.c b/board/snmc/qs860t/qs860t.c new file mode 100644 index 000000000..c4ab758d3 --- /dev/null +++ b/board/snmc/qs860t/qs860t.c @@ -0,0 +1,259 @@ +/* + * (C) Copyright 2003 + * MuLogic B.V. + * + * (C) Copyright 2002 + * Simple Network Magic Corporation, dnevil@snmc.com + * + * (C) Copyright 2000 + * 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 + */ + +#include <common.h> +#include <asm/u-boot.h> +#include <commproc.h> +#include "mpc8xx.h" + +/* ------------------------------------------------------------------------- */ + +static long  int dram_size (long int, long int *, long int); + +/* ------------------------------------------------------------------------- */ + +const uint sdram_table[] = +{ +	/* +	 * Single Read. (Offset 0 in UPMA RAM) +	 */ +	0x1F07FC04, 0xEEAEFC04, 0x11ADFC04, 0xEFBBBC00, +	0x1FF77C47, 0x1FF77C35, 0xEFEABC34, 0x1FB57C35, +	/* +	 * Burst Read. (Offset 8 in UPMA RAM) +	 */ +	0x1F07FC04, 0xEEAEFC04, 0x10ADFC04, 0xF0AFFC00, +	0xF0AFFC00, 0xF1AFFC00, 0xEFBBBC00, 0x1FF77C47, +	0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, +	0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, +	/* +	 * Single Write. (Offset 18 in UPMA RAM) +	 */ +	0x1F27FC04, 0xEEAEBC00, 0x01B93C04, 0x1FF77C47, +	0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, +	/* +	 * Burst Write. (Offset 20 in UPMA RAM) +	 */ +	0x1F07FC04, 0xEEAEBC00, 0x10AD7C00, 0xF0AFFC00, +	0xF0AFFC00, 0xE1BBBC04, 0x1FF77C47, 0xFFFFEC04, +	0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, +	0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, +	/* +	 * Refresh  (Offset 30 in UPMA RAM) +	 */ +	0x1FF5FC84, 0xFFFFFC04, 0xFFFFFC04, 0xFFFFFC04, +	0xFFFFFC84, 0xFFFFFC07, 0xFFFFEC04, 0xFFFFEC04, +	0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04, +	/* +	 * Exception. (Offset 3c in UPMA RAM) +	 */ +	0x7FFFFC07, 0xFFFFEC04, 0xFFFFEC04, 0xFFFFEC04 +}; + +/* ------------------------------------------------------------------------- */ + + +/* + * Check Board Identity: + * + * Test ID string (QS860T...) + * + * Always return 1 + */ + +int checkboard (void) +{ +	unsigned char *s, *e; +	unsigned char buf[64]; +	int i; + +	i = getenv_r("serial#", buf, sizeof(buf)); +	s = (i>0) ? buf : NULL; + +	if (!s || strncmp(s, "QS860T", 6)) { +		puts ("### No HW ID - assuming QS860T"); +	} else { +		for (e=s; *e; ++e) { +			if (*e == ' ') +			break; +		} + +		for ( ; s<e; ++s) { +			putc (*s); +		} +	} +	putc ('\n'); + +	return (0); +} + +/* ------------------------------------------------------------------------- */ + +long int initdram (int board_type) +{ +	volatile immap_t     *immap  = (immap_t *)CFG_IMMR; +	volatile memctl8xx_t *memctl = &immap->im_memctl; +	long int size; + +	upmconfig(UPMB, (uint *)sdram_table, sizeof(sdram_table)/sizeof(uint)); + +	/* +	* Prescaler for refresh +	*/ +	memctl->memc_mptpr = 0x0400; + +	/* +	* Map controller bank 2 to the SDRAM address +	*/ +	memctl->memc_or2 = CFG_OR2; +	memctl->memc_br2 = CFG_BR2; +	udelay(200); + +	/* perform SDRAM initialization sequence */ +	memctl->memc_mbmr = CFG_16M_MBMR; +	udelay(100); + +	memctl->memc_mar  = 0x00000088; +	memctl->memc_mcr  = 0x80804105;	/* run precharge pattern */ +	udelay(1); + +	/* Run two refresh cycles on SDRAM */ +	memctl->memc_mbmr = 0x18802118; +	memctl->memc_mcr  = 0x80804130; +	memctl->memc_mbmr = 0x18802114; +	memctl->memc_mcr  = 0x80804106; + +	udelay (1000); + +#if 0 +	/* +	* Check for 64M SDRAM Memory Size +	*/ +	size = dram_size (CFG_64M_MBMR, (ulong *)SDRAM_BASE, SDRAM_64M_MAX_SIZE); +	udelay (1000); + +	/* +	* Check for 16M SDRAM Memory Size +	*/ +	if (size != SDRAM_64M_MAX_SIZE) { +#endif +	size = dram_size (CFG_16M_MBMR, (ulong *)SDRAM_BASE, SDRAM_16M_MAX_SIZE); +	udelay (1000); +#if 0 +	} + +	memctl->memc_or2 = ((-size) & 0xFFFF0000) | SDRAM_TIMING; +#endif + + +	udelay(10000); + + +#if 0 + +	/* +	* Also, map other memory to correct position +	*/ + +	/* +	* Map the 8M Intel Flash device to chip select 1 +	*/ +	memctl->memc_or1 = CFG_OR1; +	memctl->memc_br1 = CFG_BR1; + + +	/* +	* Map 64K NVRAM, Sipex Device, NAND Ctl Reg, and LED Ctl Reg +	* to chip select 3 +	*/ +	memctl->memc_or3 = CFG_OR3; +	memctl->memc_br3 = CFG_BR3; + +	/* +	* Map chip selects 4, 5, 6, & 7 for external expansion connector +	*/ +	memctl->memc_or4 = CFG_OR4; +	memctl->memc_br4 = CFG_BR4; + +	memctl->memc_or5 = CFG_OR5; +	memctl->memc_br5 = CFG_BR5; + +	memctl->memc_or6 = CFG_OR6; +	memctl->memc_br6 = CFG_BR6; + +	memctl->memc_or7 = CFG_OR7; +	memctl->memc_br7 = CFG_BR7; + +#endif + +	return (size); +} + +/* ------------------------------------------------------------------------- */ + +/* + * Check memory range for valid RAM. A simple memory test determines + * the actually available RAM size between addresses `base' and + * `base + maxsize'. Some (not all) hardware errors are detected: + * - short between address lines + * - short between data lines + */ + +static long int dram_size (long int mbmr_value, long int *base, long int maxsize) +{ +	volatile immap_t *immap  = (immap_t *)CFG_IMMR; +	volatile memctl8xx_t *memctl = &immap->im_memctl; +	volatile long int *addr; +	long int cnt, val; + +	memctl->memc_mbmr = mbmr_value; + +	for (cnt = maxsize/sizeof(long); cnt > 0; cnt >>= 1) { +		addr = base + cnt;	/* pointer arith! */ +		*addr = ~cnt; +	} + +	/* write 0 to base address */ +	addr = base; +	*addr = 0; + +	/* check at base address */ +	if ((val = *addr) != 0) { +		return (0); +	} + +	for (cnt = 1; ; cnt <<= 1) { +		addr = base + cnt;	/* pointer arith! */ +		val = *addr; +		if (val != (~cnt)) { +			return (cnt * sizeof(long)); +		} +	} +	/* NOTREACHED */ +} diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds new file mode 100644 index 000000000..61e10849e --- /dev/null +++ b/board/snmc/qs860t/u-boot.lds @@ -0,0 +1,141 @@ +/* + * (C) Copyright 2000 + * 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 + */ + +OUTPUT_ARCH(powerpc) +SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib); +/* Do we need any of these for elf? +   __DYNAMIC = 0;    */ +SECTIONS +{ +  /* Read-only sections, merged into text segment: */ +  . = + SIZEOF_HEADERS; +  .interp : { *(.interp) } +  .hash          : { *(.hash)		} +  .dynsym        : { *(.dynsym)		} +  .dynstr        : { *(.dynstr)		} +  .rel.text      : { *(.rel.text)	} +  .rela.text     : { *(.rela.text) 	} +  .rel.data      : { *(.rel.data)	} +  .rela.data     : { *(.rela.data) 	} +  .rel.rodata    : { *(.rel.rodata) 	} +  .rela.rodata   : { *(.rela.rodata) 	} +  .rel.got       : { *(.rel.got)	} +  .rela.got      : { *(.rela.got)	} +  .rel.ctors     : { *(.rel.ctors)	} +  .rela.ctors    : { *(.rela.ctors)	} +  .rel.dtors     : { *(.rel.dtors)	} +  .rela.dtors    : { *(.rela.dtors)	} +  .rel.bss       : { *(.rel.bss)	} +  .rela.bss      : { *(.rela.bss)	} +  .rel.plt       : { *(.rel.plt)	} +  .rela.plt      : { *(.rela.plt)	} +  .init          : { *(.init)		} +  .plt : { *(.plt) } +  .text      : +  { +    /* WARNING - the following is hand-optimized to fit within	*/ +    /* the sector layout of our flash chips!	XXX FIXME XXX	*/ + +	cpu/mpc8xx/start.o		(.text) +	cpu/mpc8xx/traps.o		(.text) +	common/dlmalloc.o		(.text) +	lib_ppc/ppcstring.o		(.text) +	lib_generic/vsprintf.o	(.text) +	lib_generic/crc32.o		(.text) +	lib_generic/zlib.o		(.text) +	lib_ppc/cache.o		(.text) +	lib_ppc/time.o		(.text) + +    . = DEFINED(env_offset) ? env_offset : .; +	common/environment.o	(.ppcenv) + +    *(.text) +    *(.fixup) +    *(.got1) +  } +  _etext = .; +  PROVIDE (etext = .); +  .rodata    : +  { +    *(.rodata) +    *(.rodata1) +    *(.rodata.str1.4) +  } +  .fini      : { *(.fini)    } =0 +  .ctors     : { *(.ctors)   } +  .dtors     : { *(.dtors)   } + +  /* Read-write section, merged into data segment: */ +  . = (. + 0x00FF) & 0xFFFFFF00; +  _erotext = .; +  PROVIDE (erotext = .); +  .reloc   : +  { +    *(.got) +    _GOT2_TABLE_ = .; +    *(.got2) +    _FIXUP_TABLE_ = .; +    *(.fixup) +  } +  __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2; +  __fixup_entries = (. - _FIXUP_TABLE_)>>2; + +  .data    : +  { +    *(.data) +    *(.data1) +    *(.sdata) +    *(.sdata2) +    *(.dynamic) +    CONSTRUCTORS +  } +  _edata  =  .; +  PROVIDE (edata = .); + +  __u_boot_cmd_start = .; +  .u_boot_cmd : { *(.u_boot_cmd) } +  __u_boot_cmd_end = .; + + +  __start___ex_table = .; +  __ex_table : { *(__ex_table) } +  __stop___ex_table = .; + +  . = ALIGN(256); +  __init_begin = .; +  .text.init : { *(.text.init) } +  .data.init : { *(.data.init) } +  . = ALIGN(256); +  __init_end = .; + +  __bss_start = .; +  .bss       : +  { +   *(.sbss) *(.scommon) +   *(.dynbss) +   *(.bss) +   *(COMMON) +  } +  _end = . ; +  PROVIDE (end = .); +} |