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:
@@ -22,9 +22,9 @@
|
||||
|
||||
void protect_m29f400bt(volatile uint8_t *bios)
|
||||
{
|
||||
writeb(0xAA, bios + 0xAAA);
|
||||
writeb(0x55, bios + 0x555);
|
||||
writeb(0xA0, bios + 0xAAA);
|
||||
chip_writeb(0xAA, bios + 0xAAA);
|
||||
chip_writeb(0x55, bios + 0x555);
|
||||
chip_writeb(0xA0, bios + 0xAAA);
|
||||
|
||||
usleep(200);
|
||||
}
|
||||
@@ -35,18 +35,18 @@ void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src,
|
||||
int i;
|
||||
|
||||
for (i = 0; i < page_size; i++) {
|
||||
writeb(0xAA, bios + 0xAAA);
|
||||
writeb(0x55, bios + 0x555);
|
||||
writeb(0xA0, bios + 0xAAA);
|
||||
chip_writeb(0xAA, bios + 0xAAA);
|
||||
chip_writeb(0x55, bios + 0x555);
|
||||
chip_writeb(0xA0, bios + 0xAAA);
|
||||
|
||||
/* transfer data from source to destination */
|
||||
writeb(*src, dst);
|
||||
chip_writeb(*src, dst);
|
||||
//*(volatile char *) (bios) = 0xF0;
|
||||
//usleep(5);
|
||||
toggle_ready_jedec(dst);
|
||||
printf
|
||||
("Value in the flash at address %p = %#x, want %#x\n",
|
||||
(uint8_t *) (dst - bios), readb(dst), *src);
|
||||
(uint8_t *) (dst - bios), chip_readb(dst), *src);
|
||||
dst++;
|
||||
src++;
|
||||
}
|
||||
@@ -57,21 +57,21 @@ int probe_m29f400bt(struct flashchip *flash)
|
||||
volatile uint8_t *bios = flash->virtual_memory;
|
||||
uint8_t id1, id2;
|
||||
|
||||
writeb(0xAA, bios + 0xAAA);
|
||||
writeb(0x55, bios + 0x555);
|
||||
writeb(0x90, bios + 0xAAA);
|
||||
chip_writeb(0xAA, bios + 0xAAA);
|
||||
chip_writeb(0x55, bios + 0x555);
|
||||
chip_writeb(0x90, bios + 0xAAA);
|
||||
|
||||
myusec_delay(10);
|
||||
|
||||
id1 = readb(bios);
|
||||
id1 = chip_readb(bios);
|
||||
/* The data sheet says id2 is at (bios + 0x01) and id2 listed in
|
||||
* flash.h does not match. It should be possible to use JEDEC probe.
|
||||
*/
|
||||
id2 = readb(bios + 0x02);
|
||||
id2 = chip_readb(bios + 0x02);
|
||||
|
||||
writeb(0xAA, bios + 0xAAA);
|
||||
writeb(0x55, bios + 0x555);
|
||||
writeb(0xF0, bios + 0xAAA);
|
||||
chip_writeb(0xAA, bios + 0xAAA);
|
||||
chip_writeb(0x55, bios + 0x555);
|
||||
chip_writeb(0xF0, bios + 0xAAA);
|
||||
|
||||
myusec_delay(10);
|
||||
|
||||
@@ -87,13 +87,13 @@ int erase_m29f400bt(struct flashchip *flash)
|
||||
{
|
||||
volatile uint8_t *bios = flash->virtual_memory;
|
||||
|
||||
writeb(0xAA, bios + 0xAAA);
|
||||
writeb(0x55, bios + 0x555);
|
||||
writeb(0x80, bios + 0xAAA);
|
||||
chip_writeb(0xAA, bios + 0xAAA);
|
||||
chip_writeb(0x55, bios + 0x555);
|
||||
chip_writeb(0x80, bios + 0xAAA);
|
||||
|
||||
writeb(0xAA, bios + 0xAAA);
|
||||
writeb(0x55, bios + 0x555);
|
||||
writeb(0x10, bios + 0xAAA);
|
||||
chip_writeb(0xAA, bios + 0xAAA);
|
||||
chip_writeb(0x55, bios + 0x555);
|
||||
chip_writeb(0x10, bios + 0xAAA);
|
||||
|
||||
myusec_delay(10);
|
||||
toggle_ready_jedec(bios);
|
||||
@@ -104,14 +104,14 @@ int erase_m29f400bt(struct flashchip *flash)
|
||||
int block_erase_m29f400bt(volatile uint8_t *bios, volatile uint8_t *dst)
|
||||
{
|
||||
|
||||
writeb(0xAA, bios + 0xAAA);
|
||||
writeb(0x55, bios + 0x555);
|
||||
writeb(0x80, bios + 0xAAA);
|
||||
chip_writeb(0xAA, bios + 0xAAA);
|
||||
chip_writeb(0x55, bios + 0x555);
|
||||
chip_writeb(0x80, bios + 0xAAA);
|
||||
|
||||
writeb(0xAA, bios + 0xAAA);
|
||||
writeb(0x55, bios + 0x555);
|
||||
chip_writeb(0xAA, bios + 0xAAA);
|
||||
chip_writeb(0x55, bios + 0x555);
|
||||
//*(volatile uint8_t *) (bios + 0xAAA) = 0x10;
|
||||
writeb(0x30, dst);
|
||||
chip_writeb(0x30, dst);
|
||||
|
||||
myusec_delay(10);
|
||||
toggle_ready_jedec(bios);
|
||||
|
Reference in New Issue
Block a user