summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/flash_and_burn/jedec.c7
-rw-r--r--util/flash_and_burn/jedec.h1
-rw-r--r--util/flash_and_burn/pm49fl004.c5
-rw-r--r--util/flash_and_burn/sst39sf020.c4
-rw-r--r--util/flash_and_burn/sst49lf040.c8
-rw-r--r--util/flash_and_burn/sst49lf040.h2
-rw-r--r--util/flash_and_burn/w49f002u.h2
7 files changed, 4 insertions, 25 deletions
diff --git a/util/flash_and_burn/jedec.c b/util/flash_and_burn/jedec.c
index d7f2bef1f6..bae1ddc439 100644
--- a/util/flash_and_burn/jedec.c
+++ b/util/flash_and_burn/jedec.c
@@ -141,15 +141,16 @@ void write_page_jedec(volatile char *bios, char *src, volatile char *dst,
int write_sector_jedec(volatile char *bios,
unsigned char *src,
- volatile unsigned char *dst, unsigned int page_size)
+ volatile unsigned char *dst,
+ unsigned int page_size)
{
int i;
volatile char *Temp;
for (i = 0; i < page_size; i++) {
if (*dst != 0xff) {
- printf("FATAL: dst %p not erased (val 0x%x\n", dst,
- *dst);
+ printf("FATAL: dst %p not erased (val 0x%x)\n",
+ dst, *dst);
return (-1);
}
/* transfer data from source to destination */
diff --git a/util/flash_and_burn/jedec.h b/util/flash_and_burn/jedec.h
index b62223b1c1..1751b296de 100644
--- a/util/flash_and_burn/jedec.h
+++ b/util/flash_and_burn/jedec.h
@@ -62,5 +62,4 @@ extern __inline__ void protect_jedec(volatile char *bios)
usleep(200);
}
-
#endif /* !__JEDEC_H__ */
diff --git a/util/flash_and_burn/pm49fl004.c b/util/flash_and_burn/pm49fl004.c
index e0bd6aaa55..4cffc14b25 100644
--- a/util/flash_and_burn/pm49fl004.c
+++ b/util/flash_and_burn/pm49fl004.c
@@ -26,11 +26,6 @@
#include "jedec.h"
#include "pm49fl004.h"
-#define AUTO_PGRM 0x10
-#define CHIP_ERASE 0x30
-#define RESET 0xFF
-#define READ_ID 0x90
-
static __inline__ int erase_block_49fl004(volatile unsigned char *bios,
unsigned long address)
{
diff --git a/util/flash_and_burn/sst39sf020.c b/util/flash_and_burn/sst39sf020.c
index 25d141a358..401247a6df 100644
--- a/util/flash_and_burn/sst39sf020.c
+++ b/util/flash_and_burn/sst39sf020.c
@@ -34,10 +34,6 @@
#define AUTO_PG_ERASE1 0x20
#define AUTO_PG_ERASE2 0xD0
-#define AUTO_PGRM 0x10
-#define CHIP_ERASE 0x30
-#define RESET 0xFF
-#define READ_ID 0x90
static __inline__ int erase_sector_39sf020(volatile char *bios,
unsigned long address)
diff --git a/util/flash_and_burn/sst49lf040.c b/util/flash_and_burn/sst49lf040.c
index ace2f1ae33..f18e733e7a 100644
--- a/util/flash_and_burn/sst49lf040.c
+++ b/util/flash_and_burn/sst49lf040.c
@@ -30,14 +30,6 @@
#include "jedec.h"
#include "sst49lf040.h"
-#define AUTO_PG_ERASE1 0x20
-#define AUTO_PG_ERASE2 0xD0
-#define AUTO_PGRM 0x10
-#define CHIP_ERASE 0x30
-#define RESET 0xFF
-#define READ_ID 0x90
-
-
int write_49lf040(struct flashchip *flash, unsigned char *buf)
{
int i;
diff --git a/util/flash_and_burn/sst49lf040.h b/util/flash_and_burn/sst49lf040.h
index a66501506b..9e3cfa4236 100644
--- a/util/flash_and_burn/sst49lf040.h
+++ b/util/flash_and_burn/sst49lf040.h
@@ -1,8 +1,6 @@
#ifndef __SST49LF040_H__
#define __SST49LF040_H__ 1
-extern int probe_49lf040(struct flashchip *flash);
-extern int erase_49lf040(struct flashchip *flash);
extern int write_49lf040(struct flashchip *flash, unsigned char *buf);
#endif /* !__SST49LF040_H__ */
diff --git a/util/flash_and_burn/w49f002u.h b/util/flash_and_burn/w49f002u.h
index 4863ea5a4f..29320b7cef 100644
--- a/util/flash_and_burn/w49f002u.h
+++ b/util/flash_and_burn/w49f002u.h
@@ -1,8 +1,6 @@
#ifndef __W49F002U_H__
#define __W49F002U_H__ 1
-extern int probe_49f002(struct flashchip *flash);
-extern int erase_49f002(struct flashchip *flash);
extern int write_49f002(struct flashchip *flash, unsigned char *buf);
#endif /* !__W49F002U_H__ */