openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

atavia: Fix a few problems overlooked/introduced while rebasing

Browse Source 
Corresponding to flashrom svn r1811.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Stefan Tauner 2014-06-01 22:36:30 +00:00
parent c9d8b27825
commit 4f094750fa
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -325,11 +325,6 @@ UNSUPPORTED_FEATURES += CONFIG_ATAHPT=yes
else else
override CONFIG_ATAHPT = no override CONFIG_ATAHPT = no
endif endif
ifeq ($(CONFIG_ATAVIA), yes)
UNSUPPORTED_FEATURES += CONFIG_ATAVIA=yes
else
override CONFIG_ATAVIA = no
endif
ifeq ($(CONFIG_SATAMV), yes) ifeq ($(CONFIG_SATAMV), yes)
UNSUPPORTED_FEATURES += CONFIG_SATAMV=yes UNSUPPORTED_FEATURES += CONFIG_SATAMV=yes
else else

9
atavia.c
View File

@ -72,7 +72,7 @@ static const struct par_programmer lpc_programmer_atavia = {
}; };
static void *atavia_offset = NULL; static void *atavia_offset = NULL;
struct pci_dev *dev = NULL; static struct pci_dev *dev = NULL;
static void atavia_prettyprint_access(uint8_t access) static void atavia_prettyprint_access(uint8_t access)
{ {
@ -118,7 +118,7 @@ static bool atavia_ready(struct pci_dev *pcidev_dev)
return ready; return ready;
} }
void *atavia_map(const char *descr, unsigned long phys_addr, size_t len) void *atavia_map(const char *descr, uintptr_t phys_addr, size_t len)
{ {
return (atavia_offset != 0) ? atavia_offset : (void *)phys_addr; return (atavia_offset != 0) ? atavia_offset : (void *)phys_addr;
} }
@ -146,7 +146,6 @@ int atavia_init(void)
if (rget_io_perms()) if (rget_io_perms())
return 1; return 1;
/* No need to check for errors, pcidev_init() will not return in case of errors. */
dev = pcidev_init(ata_via, PCI_ROM_ADDRESS); /* Acutally no BAR setup needed at all. */ dev = pcidev_init(ata_via, PCI_ROM_ADDRESS); /* Acutally no BAR setup needed at all. */
if (!dev) if (!dev)
return 1; return 1;
@ -172,7 +171,7 @@ int atavia_init(void)
static void atavia_chip_writeb(const struct flashctx *flash, uint8_t val, const chipaddr addr) static void atavia_chip_writeb(const struct flashctx *flash, uint8_t val, const chipaddr addr)
{ {
msg_pspew("%s: 0x%02x to 0x%08lx.\n", __func__, val, addr); msg_pspew("%s: 0x%02x to 0x%*" PRIxPTR ".\n", __func__, val, PRIxPTR_WIDTH, addr);
pci_write_long(dev, BROM_ADDR, (addr & ~3)); pci_write_long(dev, BROM_ADDR, (addr & ~3));
pci_write_long(dev, BROM_DATA, val << BYTE_OFFSET(addr)); pci_write_long(dev, BROM_DATA, val << BYTE_OFFSET(addr));
pci_write_byte(dev, BROM_ACCESS, BROM_TRIGGER | BROM_WRITE | ENABLE_BYTE(addr)); pci_write_byte(dev, BROM_ACCESS, BROM_TRIGGER | BROM_WRITE | ENABLE_BYTE(addr));
@ -192,6 +191,6 @@ static uint8_t atavia_chip_readb(const struct flashctx *flash, const chipaddr ad
} }
uint8_t val = (pci_read_long(dev, BROM_DATA) >> BYTE_OFFSET(addr)) & 0xff; uint8_t val = (pci_read_long(dev, BROM_DATA) >> BYTE_OFFSET(addr)) & 0xff;
msg_pspew("%s: 0x%02x from 0x%08lx.\n", __func__, val, addr); msg_pspew("%s: 0x%02x from 0x%*" PRIxPTR ".\n", __func__, val, PRIxPTR_WIDTH, addr);
return val; return val;
} }

2
flashrom.8.tmpl
View File

@ -192,7 +192,7 @@ cards)"
.sp .sp
.BR "* atahpt" " (for flash ROMs on Highpoint ATA/RAID controllers)" .BR "* atahpt" " (for flash ROMs on Highpoint ATA/RAID controllers)"
.sp .sp
.BR "* atavia" " (for flash ROMs on VIA VT6421A ATA controllers)" .BR "* atavia" " (for flash ROMs on VIA VT6421A SATA controllers)"
.sp .sp
.BR "* ft2232_spi" " (for SPI flash ROMs attached to an FT2232/FT4232H/FT232H family \ .BR "* ft2232_spi" " (for SPI flash ROMs attached to an FT2232/FT4232H/FT232H family \
based USB SPI programmer), including the DLP Design DLP-USB1232H, \ based USB SPI programmer), including the DLP Design DLP-USB1232H, \