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,12 +22,12 @@
|
||||
|
||||
int erase_m29f002(struct flashchip *flash) {
|
||||
volatile uint8_t *bios = flash->virtual_memory;
|
||||
writeb(0xaa, bios + 0x555);
|
||||
writeb(0x55, bios + 0xaaa);
|
||||
writeb(0x80, bios + 0x555);
|
||||
writeb(0xaa, bios + 0x555);
|
||||
writeb(0x55, bios + 0xaaa);
|
||||
writeb(0x10, bios + 0x555);
|
||||
chip_writeb(0xaa, bios + 0x555);
|
||||
chip_writeb(0x55, bios + 0xaaa);
|
||||
chip_writeb(0x80, bios + 0x555);
|
||||
chip_writeb(0xaa, bios + 0x555);
|
||||
chip_writeb(0x55, bios + 0xaaa);
|
||||
chip_writeb(0x10, bios + 0x555);
|
||||
myusec_delay(10);
|
||||
toggle_ready_jedec(bios);
|
||||
return 0;
|
||||
@@ -35,21 +35,21 @@ int erase_m29f002(struct flashchip *flash) {
|
||||
|
||||
static void rewrite_block(volatile uint8_t *bios, uint8_t *src, volatile uint8_t *dst, int size) {
|
||||
/* erase */
|
||||
writeb(0xaa, bios + 0x555);
|
||||
writeb(0x55, bios + 0xaaa);
|
||||
writeb(0x80, bios + 0x555);
|
||||
writeb(0xaa, bios + 0x555);
|
||||
writeb(0x55, bios + 0xaaa);
|
||||
writeb(0x30, dst);
|
||||
chip_writeb(0xaa, bios + 0x555);
|
||||
chip_writeb(0x55, bios + 0xaaa);
|
||||
chip_writeb(0x80, bios + 0x555);
|
||||
chip_writeb(0xaa, bios + 0x555);
|
||||
chip_writeb(0x55, bios + 0xaaa);
|
||||
chip_writeb(0x30, dst);
|
||||
myusec_delay(10);
|
||||
toggle_ready_jedec(bios);
|
||||
|
||||
/* program */
|
||||
while (size--) {
|
||||
writeb(0xaa, bios + 0x555);
|
||||
writeb(0x55, bios + 0xaaa);
|
||||
writeb(0xa0, bios + 0x555);
|
||||
writeb(*src, dst);
|
||||
chip_writeb(0xaa, bios + 0x555);
|
||||
chip_writeb(0x55, bios + 0xaaa);
|
||||
chip_writeb(0xa0, bios + 0x555);
|
||||
chip_writeb(*src, dst);
|
||||
toggle_ready_jedec(dst);
|
||||
dst++;
|
||||
src++;
|
||||
|
Reference in New Issue
Block a user