openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-06-30 21:52:36 +02:00
Code Issues Releases Wiki Activity

Factor out fallback_map/unmap, most external programmers don't need and special handling here

Browse Source 
Corresponding to flashrom svn r531.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
Uwe Hermann
2009-05-17 23:12:17 +00:00
parent 3def09d401
commit c6915939d9
5 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flash.h
View File

@ -629,6 +629,8 @@ void mmio_writel(uint32_t val, void *addr);
uint8_t mmio_readb(void *addr);
uint16_t mmio_readw(void *addr);
uint32_t mmio_readl(void *addr);
void *fallback_map(const char *descr, unsigned long phys_addr, size_t len);
void fallback_unmap(void *virt_addr, size_t len);
void fallback_chip_writew(uint16_t val, chipaddr addr);
void fallback_chip_writel(uint32_t val, chipaddr addr);
uint16_t fallback_chip_readw(const chipaddr addr);

8
flashrom.c
View File

@ -64,8 +64,8 @@ const struct programmer_entry programmer_table[] = {
{
.init = nic3com_init,
.shutdown = nic3com_shutdown,
.map_flash_region = nic3com_map,
.unmap_flash_region = nic3com_unmap,
.map_flash_region = fallback_map,
.unmap_flash_region = fallback_unmap,
.chip_readb = nic3com_chip_readb,
.chip_readw = fallback_chip_readw,
.chip_readl = fallback_chip_readl,
@ -77,8 +77,8 @@ const struct programmer_entry programmer_table[] = {
{
.init = satasii_init,
.shutdown = satasii_shutdown,
.map_flash_region = satasii_map,
.unmap_flash_region = satasii_unmap,
.map_flash_region = fallback_map,
.unmap_flash_region = fallback_unmap,
.chip_readb = satasii_chip_readb,
.chip_readw = fallback_chip_readw,
.chip_readl = fallback_chip_readl,

11
internal.c
View File

@ -195,6 +195,17 @@ uint32_t mmio_readl(void *addr)
return *(volatile uint32_t *) addr;
}
/* Fallback map() for programmers which don't need special handling */
void *fallback_map(const char *descr, unsigned long phys_addr, size_t len)
{
return 0;
}
/* Fallback unmap() for programmers which don't need special handling */
void fallback_unmap(void *virt_addr, size_t len)
{
}
/* Little-endian fallback for drivers not supporting 16 bit accesses */
void fallback_chip_writew(uint16_t val, chipaddr addr)
{

9
nic3com.c
View File

@ -102,15 +102,6 @@ int nic3com_shutdown(void)
return 0;
}
void *nic3com_map(const char *descr, unsigned long phys_addr, size_t len)
{
return 0;
}
void nic3com_unmap(void *virt_addr, size_t len)
{
}
void nic3com_chip_writeb(uint8_t val, chipaddr addr)
{
OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR);

9
satasii.c
View File

@ -80,15 +80,6 @@ int satasii_shutdown(void)
return 0;
}
void *satasii_map(const char *descr, unsigned long phys_addr, size_t len)
{
return 0;
}
void satasii_unmap(void *virt_addr, size_t len)
{
}
void satasii_chip_writeb(uint8_t val, chipaddr addr)
{
uint32_t ctrl_reg, data_reg;