Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-18 18:59:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

Browse source
This commit is contained in:
Wolfgang Denk 2008-04-07 23:55:47 +02:00
commit 23c5189e6c
2 changed files with 57 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
drivers/mtd/cfi_flash.c
View file

@ -239,12 +239,14 @@ static u32 flash_read32(void *addr)
return __raw_readl(addr); return __raw_readl(addr);
} }
static u64 flash_read64(void *addr) static u64 __flash_read64(void *addr)
{ {
/* No architectures currently implement __raw_readq() */ /* No architectures currently implement __raw_readq() */
return *(volatile u64 *)addr; return *(volatile u64 *)addr;
} }
u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64")));
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE) #if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
@ -364,6 +366,20 @@ static inline uchar flash_read_uchar (flash_info_t * info, uint offset)
return retval; return retval;
} }
/*-----------------------------------------------------------------------
* read a word at a port width address, assume 16bit bus
*/
static inline ushort flash_read_word (flash_info_t * info, uint offset)
{
ushort *addr, retval;
addr = flash_map (info, 0, offset);
retval = flash_read16 (addr);
flash_unmap (info, 0, offset, addr);
return retval;
}
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* read a long word by picking the least significant byte of each maximum * read a long word by picking the least significant byte of each maximum
* port size word. Swap for ppc format. * port size word. Swap for ppc format.
@ -1449,17 +1465,29 @@ static void cmdset_amd_read_jedec_ids(flash_info_t *info)
flash_unlock_seq(info, 0); flash_unlock_seq(info, 0);
flash_write_cmd(info, 0, info->addr_unlock1, FLASH_CMD_READ_ID); flash_write_cmd(info, 0, info->addr_unlock1, FLASH_CMD_READ_ID);
udelay(1000); /* some flash are slow to respond */ udelay(1000); /* some flash are slow to respond */
info->manufacturer_id = flash_read_uchar (info, info->manufacturer_id = flash_read_uchar (info,
FLASH_OFFSET_MANUFACTURER_ID); FLASH_OFFSET_MANUFACTURER_ID);
info->device_id = flash_read_uchar (info,
FLASH_OFFSET_DEVICE_ID); switch (info->chipwidth){
if (info->device_id == 0x7E) { case FLASH_CFI_8BIT:
/* AMD 3-byte (expanded) device ids */ info->device_id = flash_read_uchar (info,
info->device_id2 = flash_read_uchar (info, FLASH_OFFSET_DEVICE_ID);
FLASH_OFFSET_DEVICE_ID2); if (info->device_id == 0x7E) {
info->device_id2 <<= 8; /* AMD 3-byte (expanded) device ids */
info->device_id2 |= flash_read_uchar (info, info->device_id2 = flash_read_uchar (info,
FLASH_OFFSET_DEVICE_ID3); FLASH_OFFSET_DEVICE_ID2);
info->device_id2 <<= 8;
info->device_id2 |= flash_read_uchar (info,
FLASH_OFFSET_DEVICE_ID3);
}
break;
case FLASH_CFI_16BIT:
info->device_id = flash_read_word (info,
FLASH_OFFSET_DEVICE_ID);
break;
default:
break;
} }
flash_write_cmd(info, 0, 0, AMD_CMD_RESET); flash_write_cmd(info, 0, 0, AMD_CMD_RESET);
} }

19
drivers/mtd/jedec_flash.c
View file

@ -216,6 +216,25 @@ static const struct amd_flash_info jedec_table[] = {
} }
}, },
#endif #endif
#ifdef CFG_FLASH_LEGACY_512Kx16
{
.mfr_id = MANUFACTURER_AMD,
.dev_id = AM29LV400BB,
.name = "AMD AM29LV400BB",
.uaddr = {
[1] = MTD_UADDR_0x0555_0x02AA /* x16 */
},
.DevSize = SIZE_512KiB,
.CmdSet = CFI_CMDSET_AMD_LEGACY,
.NumEraseRegions= 4,
.regions = {
ERASEINFO(0x04000,1),
ERASEINFO(0x02000,2),
ERASEINFO(0x08000,1),
ERASEINFO(0x10000,7),
}
},
#endif
}; };
static inline void fill_info(flash_info_t *info, const struct amd_flash_info *jedec_entry, ulong base) static inline void fill_info(flash_info_t *info, const struct amd_flash_info *jedec_entry, ulong base)