FreeBSD definitions of (read|write)[bwl] collide with our own. Before we
attempt trickery, we can simply rename the accessor functions. Patch created with the help of Coccinelle. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Idwer Vollering <idwer_v@hotmail.com> Acked-by: Patrick Georgi <patrick@georgi-clan.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3984 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@@ -25,12 +25,12 @@
|
||||
static __inline__ int erase_sector_29f040b(volatile uint8_t *bios,
|
||||
unsigned long address)
|
||||
{
|
||||
writeb(0xAA, bios + 0x555);
|
||||
writeb(0x55, bios + 0x2AA);
|
||||
writeb(0x80, bios + 0x555);
|
||||
writeb(0xAA, bios + 0x555);
|
||||
writeb(0x55, bios + 0x2AA);
|
||||
writeb(0x30, bios + address);
|
||||
chip_writeb(0xAA, bios + 0x555);
|
||||
chip_writeb(0x55, bios + 0x2AA);
|
||||
chip_writeb(0x80, bios + 0x555);
|
||||
chip_writeb(0xAA, bios + 0x555);
|
||||
chip_writeb(0x55, bios + 0x2AA);
|
||||
chip_writeb(0x30, bios + address);
|
||||
|
||||
sleep(2);
|
||||
|
||||
@@ -52,10 +52,10 @@ static __inline__ int write_sector_29f040b(volatile uint8_t *bios,
|
||||
printf("0x%08lx", (unsigned long)dst -
|
||||
(unsigned long)bios);
|
||||
|
||||
writeb(0xAA, bios + 0x555);
|
||||
writeb(0x55, bios + 0x2AA);
|
||||
writeb(0xA0, bios + 0x555);
|
||||
writeb(*src++, dst++);
|
||||
chip_writeb(0xAA, bios + 0x555);
|
||||
chip_writeb(0x55, bios + 0x2AA);
|
||||
chip_writeb(0xA0, bios + 0x555);
|
||||
chip_writeb(*src++, dst++);
|
||||
|
||||
/* wait for Toggle bit ready */
|
||||
toggle_ready_jedec(bios);
|
||||
@@ -72,14 +72,14 @@ int probe_29f040b(struct flashchip *flash)
|
||||
volatile uint8_t *bios = flash->virtual_memory;
|
||||
uint8_t id1, id2;
|
||||
|
||||
writeb(0xAA, bios + 0x555);
|
||||
writeb(0x55, bios + 0x2AA);
|
||||
writeb(0x90, bios + 0x555);
|
||||
chip_writeb(0xAA, bios + 0x555);
|
||||
chip_writeb(0x55, bios + 0x2AA);
|
||||
chip_writeb(0x90, bios + 0x555);
|
||||
|
||||
id1 = readb(bios);
|
||||
id2 = readb(bios + 0x01);
|
||||
id1 = chip_readb(bios);
|
||||
id2 = chip_readb(bios + 0x01);
|
||||
|
||||
writeb(0xF0, bios);
|
||||
chip_writeb(0xF0, bios);
|
||||
|
||||
myusec_delay(10);
|
||||
|
||||
@@ -94,12 +94,12 @@ int erase_29f040b(struct flashchip *flash)
|
||||
{
|
||||
volatile uint8_t *bios = flash->virtual_memory;
|
||||
|
||||
writeb(0xAA, bios + 0x555);
|
||||
writeb(0x55, bios + 0x2AA);
|
||||
writeb(0x80, bios + 0x555);
|
||||
writeb(0xAA, bios + 0x555);
|
||||
writeb(0x55, bios + 0x2AA);
|
||||
writeb(0x10, bios + 0x555);
|
||||
chip_writeb(0xAA, bios + 0x555);
|
||||
chip_writeb(0x55, bios + 0x2AA);
|
||||
chip_writeb(0x80, bios + 0x555);
|
||||
chip_writeb(0xAA, bios + 0x555);
|
||||
chip_writeb(0x55, bios + 0x2AA);
|
||||
chip_writeb(0x10, bios + 0x555);
|
||||
|
||||
myusec_delay(10);
|
||||
toggle_ready_jedec(bios);
|
||||
|
Reference in New Issue
Block a user