diff options
| author | Li-Ta Lo <ollie@lanl.gov> | 2005-11-26 21:55:36 +0000 |
|---|---|---|
| committer | Li-Ta Lo <ollie@lanl.gov> | 2005-11-26 21:55:36 +0000 |
| commit | 1a4f0707bb33836953ffe90f6216ee20210cd1fa (patch) | |
| tree | 72737cc64699dfdb0cbcee0be4db57ca859f74dd /util/flashrom/m29f400bt.c | |
| parent | f622d598db3a6fb7001b6b63e7184272eb19db72 (diff) | |
flasrom update from Stefan, resovle issue 21
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2111 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/flashrom/m29f400bt.c')
| -rw-r--r-- | util/flashrom/m29f400bt.c | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/util/flashrom/m29f400bt.c b/util/flashrom/m29f400bt.c index 842e35d7d8..aff4cd5458 100644 --- a/util/flashrom/m29f400bt.c +++ b/util/flashrom/m29f400bt.c @@ -26,28 +26,29 @@ #include "flash.h" #include "m29f400bt.h" +#include "debug.h" int probe_m29f400bt(struct flashchip *flash) { - volatile char *bios = flash->virt_addr; - unsigned char id1, id2; + volatile uint8_t *bios = flash->virt_addr; + uint8_t id1, id2; - *(volatile char *) (bios + 0xAAA) = 0xAA; - *(volatile char *) (bios + 0x555) = 0x55; - *(volatile char *) (bios + 0xAAA) = 0x90; + *(volatile uint8_t *) (bios + 0xAAA) = 0xAA; + *(volatile uint8_t *) (bios + 0x555) = 0x55; + *(volatile uint8_t *) (bios + 0xAAA) = 0x90; myusec_delay(10); - id1 = *(volatile unsigned char *) bios; - id2 = *(volatile unsigned char *) (bios + 0x02); + id1 = *(volatile uint8_t *) bios; + id2 = *(volatile uint8_t *) (bios + 0x02); - *(volatile char *) (bios + 0xAAA) = 0xAA; - *(volatile char *) (bios + 0x555) = 0x55; - *(volatile char *) (bios + 0xAAA) = 0xF0; + *(volatile uint8_t *) (bios + 0xAAA) = 0xAA; + *(volatile uint8_t *) (bios + 0x555) = 0x55; + *(volatile uint8_t *) (bios + 0xAAA) = 0xF0; myusec_delay(10); - printf("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) @@ -58,15 +59,15 @@ int probe_m29f400bt(struct flashchip *flash) int erase_m29f400bt(struct flashchip *flash) { - volatile char *bios = flash->virt_addr; + volatile uint8_t *bios = flash->virt_addr; - *(volatile char *) (bios + 0xAAA) = 0xAA; - *(volatile char *) (bios + 0x555) = 0x55; - *(volatile char *) (bios + 0xAAA) = 0x80; + *(volatile uint8_t *) (bios + 0xAAA) = 0xAA; + *(volatile uint8_t *) (bios + 0x555) = 0x55; + *(volatile uint8_t *) (bios + 0xAAA) = 0x80; - *(volatile char *) (bios + 0xAAA) = 0xAA; - *(volatile char *) (bios + 0x555) = 0x55; - *(volatile char *) (bios + 0xAAA) = 0x10; + *(volatile uint8_t *) (bios + 0xAAA) = 0xAA; + *(volatile uint8_t *) (bios + 0x555) = 0x55; + *(volatile uint8_t *) (bios + 0xAAA) = 0x10; myusec_delay(10); toggle_ready_m29f400bt(bios); @@ -74,16 +75,16 @@ int erase_m29f400bt(struct flashchip *flash) return (0); } -int block_erase_m29f400bt(volatile char *bios, volatile char *dst) +int block_erase_m29f400bt(volatile uint8_t *bios, volatile uint8_t *dst) { - *(volatile char *) (bios + 0xAAA) = 0xAA; - *(volatile char *) (bios + 0x555) = 0x55; - *(volatile char *) (bios + 0xAAA) = 0x80; + *(volatile uint8_t *) (bios + 0xAAA) = 0xAA; + *(volatile uint8_t *) (bios + 0x555) = 0x55; + *(volatile uint8_t *) (bios + 0xAAA) = 0x80; - *(volatile char *) (bios + 0xAAA) = 0xAA; - *(volatile char *) (bios + 0x555) = 0x55; - //*(volatile char *) (bios + 0xAAA) = 0x10; + *(volatile uint8_t *) (bios + 0xAAA) = 0xAA; + *(volatile uint8_t *) (bios + 0x555) = 0x55; + //*(volatile uint8_t *) (bios + 0xAAA) = 0x10; *dst = 0x30; myusec_delay(10); @@ -92,12 +93,12 @@ int block_erase_m29f400bt(volatile char *bios, volatile char *dst) return (0); } -int write_m29f400bt(struct flashchip *flash, unsigned char *buf) +int write_m29f400bt(struct flashchip *flash, uint8_t *buf) { int i; int total_size = flash->total_size * 1024, page_size = flash->page_size; - volatile char *bios = flash->virt_addr; + volatile uint8_t *bios = flash->virt_addr; //erase_m29f400bt (flash); printf("Programming Page:\n "); @@ -152,9 +153,9 @@ int write_m29f400bt(struct flashchip *flash, unsigned char *buf) return (0); } -int write_linuxbios_m29f400bt(struct flashchip *flash, unsigned char *buf) +int write_linuxbios_m29f400bt(struct flashchip *flash, uint8_t *buf) { - volatile char *bios = flash->virt_addr; + volatile uint8_t *bios = flash->virt_addr; printf("Programming Page:\n "); /********************************* |