Fix ATC board configuration and flash driver

This commit is contained in:
wdenk 2003-05-05 17:09:41 +00:00
parent 9c62cc58b8
commit e600962991
2 changed files with 106 additions and 108 deletions

View File

@ -292,9 +292,8 @@ ulong flash_get_size (FPWV *addr, flash_info_t *info)
/* The manufacturer codes are only 1 byte, so just use 1 byte. /* The manufacturer codes are only 1 byte, so just use 1 byte.
* This works for any bus width and any FLASH device width. * This works for any bus width and any FLASH device width.
*/ */
udelay(1000000);//psl udelay(100);
//psl switch (addr[1] & 0xff) { switch (addr[0] & 0xff) {
switch (addr[0] & 0xff) {//psl
case (uchar)AMD_MANUFACT: case (uchar)AMD_MANUFACT:
info->flash_id = FLASH_MAN_AMD; info->flash_id = FLASH_MAN_AMD;
@ -312,7 +311,6 @@ ulong flash_get_size (FPWV *addr, flash_info_t *info)
} }
/* Check 16 bits or 32 bits of ID so work on 32 or 16 bit bus. */ /* Check 16 bits or 32 bits of ID so work on 32 or 16 bit bus. */
//psl if (info->flash_id != FLASH_UNKNOWN) switch (addr[0]) {
if (info->flash_id != FLASH_UNKNOWN) switch (addr[1]) { if (info->flash_id != FLASH_UNKNOWN) switch (addr[1]) {
case (FPW)AMD_ID_LV640U: /* 29LV640 and 29LV641 have same ID */ case (FPW)AMD_ID_LV640U: /* 29LV640 and 29LV641 have same ID */

View File

@ -232,7 +232,7 @@
#define CFG_SDRAM_BASE 0x00000000 #define CFG_SDRAM_BASE 0x00000000
#define CFG_SDRAM_MAX_SIZE 0x08000000 /* max. 128 MB */ #define CFG_SDRAM_MAX_SIZE 0x08000000 /* max. 128 MB */
#define CFG_MONITOR_BASE TEXT_BASE #define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CFG_MONITOR_LEN (192 << 10) /* Reserve 192 kB for Monitor */
#define CFG_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/ #define CFG_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/
#if (CFG_MONITOR_BASE < CFG_FLASH_BASE) #if (CFG_MONITOR_BASE < CFG_FLASH_BASE)
@ -242,7 +242,7 @@
#if 1 #if 1
/* environment is in Flash */ /* environment is in Flash */
#define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_IN_FLASH 1
# define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000) # define CFG_ENV_ADDR (CFG_FLASH_BASE+0x30000)
# define CFG_ENV_SIZE 0x10000 # define CFG_ENV_SIZE 0x10000
# define CFG_ENV_SECT_SIZE 0x10000 # define CFG_ENV_SECT_SIZE 0x10000
#else #else