From 2fe239134cf3f8b74267d1472c03a99d9ab13bcc Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Thu, 23 Aug 2007 13:34:59 +0000 Subject: [PATCH] Drop a bunch of useless header files, merge them into flash.h. Signed-off-by: Uwe Hermann Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2746 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/flashrom/82802ab.c | 3 - util/flashrom/82802ab.h | 8 --- util/flashrom/am29f040b.c | 2 - util/flashrom/am29f040b.h | 8 --- util/flashrom/board_enable.c | 2 - util/flashrom/chipset_enable.c | 2 - util/flashrom/debug.h | 10 ---- util/flashrom/flash.h | 101 ++++++++++++++++++++++++++++++++- util/flashrom/flashchips.c | 13 ----- util/flashrom/flashrom.c | 5 -- util/flashrom/jedec.c | 2 - util/flashrom/jedec.h | 18 ------ util/flashrom/layout.c | 4 +- util/flashrom/layout.h | 9 --- util/flashrom/lbtable.c | 1 - util/flashrom/lbtable.h | 8 --- util/flashrom/m29f400bt.c | 2 - util/flashrom/m29f400bt.h | 19 ------- util/flashrom/msys_doc.c | 1 - util/flashrom/mx29f002.c | 3 - util/flashrom/mx29f002.h | 8 --- util/flashrom/pm49fl004.c | 2 - util/flashrom/pm49fl004.h | 8 --- util/flashrom/sharplhf00l04.c | 3 - util/flashrom/sharplhf00l04.h | 11 ---- util/flashrom/sst28sf040.c | 2 - util/flashrom/sst28sf040.h | 8 --- util/flashrom/sst39sf020.c | 2 - util/flashrom/sst39sf020.h | 7 --- util/flashrom/sst49lf040.c | 2 - util/flashrom/sst49lf040.h | 7 --- util/flashrom/sst49lfxxxc.c | 3 - util/flashrom/sst49lfxxxc.h | 8 --- util/flashrom/sst_fwhub.c | 3 - util/flashrom/sst_fwhub.h | 8 --- util/flashrom/udelay.c | 2 +- util/flashrom/w49f002u.c | 2 - util/flashrom/w49f002u.h | 6 -- 38 files changed, 101 insertions(+), 212 deletions(-) delete mode 100644 util/flashrom/82802ab.h delete mode 100644 util/flashrom/am29f040b.h delete mode 100644 util/flashrom/debug.h delete mode 100644 util/flashrom/jedec.h delete mode 100644 util/flashrom/layout.h delete mode 100644 util/flashrom/lbtable.h delete mode 100644 util/flashrom/m29f400bt.h delete mode 100644 util/flashrom/mx29f002.h delete mode 100644 util/flashrom/pm49fl004.h delete mode 100644 util/flashrom/sharplhf00l04.h delete mode 100644 util/flashrom/sst28sf040.h delete mode 100644 util/flashrom/sst39sf020.h delete mode 100644 util/flashrom/sst49lf040.h delete mode 100644 util/flashrom/sst49lfxxxc.h delete mode 100644 util/flashrom/sst_fwhub.h delete mode 100644 util/flashrom/w49f002u.h diff --git a/util/flashrom/82802ab.c b/util/flashrom/82802ab.c index dc6ffbe1b8..a8598d534a 100644 --- a/util/flashrom/82802ab.c +++ b/util/flashrom/82802ab.c @@ -25,10 +25,7 @@ #include #include - #include "flash.h" -#include "82802ab.h" -#include "debug.h" void toggle_ready_82802ab(volatile uint8_t *dst) { diff --git a/util/flashrom/82802ab.h b/util/flashrom/82802ab.h deleted file mode 100644 index cc7eb50987..0000000000 --- a/util/flashrom/82802ab.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __82802AB_H__ -#define __82802AB_H__ 1 - -extern int probe_82802ab(struct flashchip *flash); -extern int erase_82802ab(struct flashchip *flash); -extern int write_82802ab(struct flashchip *flash, uint8_t *buf); - -#endif /* !__82802AB_H__ */ diff --git a/util/flashrom/am29f040b.c b/util/flashrom/am29f040b.c index cba4a289a6..e7f318bfb4 100644 --- a/util/flashrom/am29f040b.c +++ b/util/flashrom/am29f040b.c @@ -25,8 +25,6 @@ #include #include #include "flash.h" -#include "jedec.h" -#include "debug.h" static __inline__ int erase_sector_29f040b(volatile uint8_t *bios, unsigned long address) diff --git a/util/flashrom/am29f040b.h b/util/flashrom/am29f040b.h deleted file mode 100644 index 99efb67400..0000000000 --- a/util/flashrom/am29f040b.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __AM29F040B_H__ -#define __AM29F040B_H__ 1 - -extern int probe_29f040b(struct flashchip *flash); -extern int erase_29f040b(struct flashchip *flash); -extern int write_29f040b(struct flashchip *flash, uint8_t *buf); - -#endif /* !__AM29F040B_H__ */ diff --git a/util/flashrom/board_enable.c b/util/flashrom/board_enable.c index 429c86b1f4..983fd18ec6 100644 --- a/util/flashrom/board_enable.c +++ b/util/flashrom/board_enable.c @@ -19,9 +19,7 @@ #include #include #include - #include "flash.h" -#include "debug.h" /* * Helper functions for many Winbond superIOs of the w836xx range. diff --git a/util/flashrom/chipset_enable.c b/util/flashrom/chipset_enable.c index e20e561b86..e3b0250521 100644 --- a/util/flashrom/chipset_enable.c +++ b/util/flashrom/chipset_enable.c @@ -14,9 +14,7 @@ #include #include #include - #include "flash.h" -#include "debug.h" static int enable_flash_ali_m1533(struct pci_dev *dev, char *name) { diff --git a/util/flashrom/debug.h b/util/flashrom/debug.h deleted file mode 100644 index 0614747ba8..0000000000 --- a/util/flashrom/debug.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __DEBUG_H__ -#define __DEBUG_H__ 1 - -//#define printf_debug(x...) printf(x) - -extern int verbose; - -#define printf_debug(x...) { if(verbose) printf(x); } - -#endif diff --git a/util/flashrom/flash.h b/util/flashrom/flash.h index 62d3f40a95..b4c5cf4156 100644 --- a/util/flashrom/flash.h +++ b/util/flashrom/flash.h @@ -27,9 +27,9 @@ #if defined(__GLIBC__) #include #endif - #include #include +#include struct flashchip { char *name; @@ -164,6 +164,103 @@ int chipset_flash_enable(void); /* chipset_enable.c */ extern int fd_mem; -int map_flash_registers(struct flashchip *flash); /* flashrom.c */ +/* debug.c */ +extern int verbose; +#define printf_debug(x...) { if (verbose) printf(x); } + +/* flashrom.c */ +int map_flash_registers(struct flashchip *flash); + +/* layout.c */ +int show_id(uint8_t *bios, int size); +int read_romlayout(char *name); +int find_romentry(char *name); +int handle_romentries(uint8_t *buffer, uint8_t *content); + +/* lbtable.c */ +int linuxbios_init(void); +extern char *lb_part, *lb_vendor; + +/* 82802ab.c */ +extern int probe_82802ab(struct flashchip *flash); +extern int erase_82802ab(struct flashchip *flash); +extern int write_82802ab(struct flashchip *flash, uint8_t *buf); + +/* am29f040b.c */ +extern int probe_29f040b(struct flashchip *flash); +extern int erase_29f040b(struct flashchip *flash); +extern int write_29f040b(struct flashchip *flash, uint8_t *buf); + +/* jedec.c */ +extern void toggle_ready_jedec(volatile uint8_t *dst); +extern void data_polling_jedec(volatile uint8_t *dst, uint8_t data); +extern void unprotect_jedec(volatile uint8_t *bios); +extern void protect_jedec(volatile uint8_t *bios); +int write_byte_program_jedec(volatile uint8_t *bios, uint8_t *src, + volatile uint8_t *dst); +extern int probe_jedec(struct flashchip *flash); +extern int erase_chip_jedec(struct flashchip *flash); +extern int write_jedec(struct flashchip *flash, uint8_t *buf); +extern int erase_sector_jedec(volatile uint8_t *bios, unsigned int page); +extern int erase_block_jedec(volatile uint8_t *bios, unsigned int page); +extern int write_sector_jedec(volatile uint8_t *bios, uint8_t *src, + volatile uint8_t *dst, unsigned int page_size); + +/* m29f400bt.c */ +extern int probe_m29f400bt(struct flashchip *flash); +extern int erase_m29f400bt(struct flashchip *flash); +extern int block_erase_m29f400bt(volatile uint8_t *bios, + volatile uint8_t *dst); +extern int write_m29f400bt(struct flashchip *flash, uint8_t *buf); +extern int write_linuxbios_m29f400bt(struct flashchip *flash, uint8_t *buf); +extern void toggle_ready_m29f400bt(volatile uint8_t *dst); +extern void data_polling_m29f400bt(volatile uint8_t *dst, uint8_t data); +extern void protect_m29f400bt(volatile uint8_t *bios); +extern void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src, + volatile uint8_t *dst, int page_size); + +/* mx29f002.c */ +extern int probe_29f002(struct flashchip *flash); +extern int erase_29f002(struct flashchip *flash); +extern int write_29f002(struct flashchip *flash, uint8_t *buf); + +/* pm49fl004.c */ +extern int probe_49fl004(struct flashchip *flash); +extern int erase_49fl004(struct flashchip *flash); +extern int write_49fl004(struct flashchip *flash, uint8_t *buf); + +/* sharplhf00l04.c */ +extern int probe_lhf00l04(struct flashchip *flash); +extern int erase_lhf00l04(struct flashchip *flash); +extern int write_lhf00l04(struct flashchip *flash, uint8_t *buf); +extern void toggle_ready_lhf00l04(volatile uint8_t *dst); +extern void data_polling_lhf00l04(volatile uint8_t *dst, uint8_t data); +extern void protect_lhf00l04(volatile uint8_t *bios); + +/* sst28sf040.c */ +extern int probe_28sf040(struct flashchip *flash); +extern int erase_28sf040(struct flashchip *flash); +extern int write_28sf040(struct flashchip *flash, uint8_t *buf); + +/* sst39sf020.c */ +extern int probe_39sf020(struct flashchip *flash); +extern int write_39sf020(struct flashchip *flash, uint8_t *buf); + +/* sst49lf040.c */ +extern int erase_49lf040(struct flashchip *flash); +extern int write_49lf040(struct flashchip *flash, uint8_t *buf); + +/* sst49lfxxxc.c */ +extern int probe_49lfxxxc(struct flashchip *flash); +extern int erase_49lfxxxc(struct flashchip *flash); +extern int write_49lfxxxc(struct flashchip *flash, uint8_t *buf); + +/* sst_fwhub.c */ +extern int probe_sst_fwhub(struct flashchip *flash); +extern int erase_sst_fwhub(struct flashchip *flash); +extern int write_sst_fwhub(struct flashchip *flash, uint8_t *buf); + +/* w49f002u.c */ +extern int write_49f002(struct flashchip *flash, uint8_t *buf); #endif /* !__FLASH_H__ */ diff --git a/util/flashrom/flashchips.c b/util/flashrom/flashchips.c index 2deca021d9..2b486bef01 100644 --- a/util/flashrom/flashchips.c +++ b/util/flashrom/flashchips.c @@ -22,22 +22,9 @@ */ #include "flash.h" -#include "jedec.h" -#include "m29f400bt.h" -#include "82802ab.h" #ifndef DISABLE_DOC #include "msys_doc.h" #endif -#include "am29f040b.h" -#include "sst28sf040.h" -#include "sst49lfxxxc.h" -#include "w49f002u.h" -#include "sst39sf020.h" -#include "sst49lf040.h" -#include "pm49fl004.h" -#include "mx29f002.h" -#include "sharplhf00l04.h" -#include "sst_fwhub.h" struct flashchip flashchips[] = { {"Am29F040B", AMD_ID, AM_29F040B, 512, 64 * 1024, diff --git a/util/flashrom/flashrom.c b/util/flashrom/flashrom.c index 751c19c384..8423523410 100644 --- a/util/flashrom/flashrom.c +++ b/util/flashrom/flashrom.c @@ -36,7 +36,6 @@ #include #include #include - /* for iopl */ #if defined (__sun) && (defined(__i386) || defined(__amd64)) #include @@ -44,11 +43,7 @@ #include #include #endif - #include "flash.h" -#include "lbtable.h" -#include "layout.h" -#include "debug.h" char *chip_to_probe = NULL; struct pci_access *pacc; /* For board and chipset_enable */ diff --git a/util/flashrom/jedec.c b/util/flashrom/jedec.c index 0c34e17a58..0a27edad6a 100644 --- a/util/flashrom/jedec.c +++ b/util/flashrom/jedec.c @@ -28,8 +28,6 @@ #include #include #include "flash.h" -#include "jedec.h" -#include "debug.h" #define MAX_REFLASH_TRIES 0x10 diff --git a/util/flashrom/jedec.h b/util/flashrom/jedec.h deleted file mode 100644 index 53135a5a10..0000000000 --- a/util/flashrom/jedec.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef __JEDEC_H__ -#define __JEDEC_H__ 1 - -extern void toggle_ready_jedec(volatile uint8_t *dst); -extern void data_polling_jedec(volatile uint8_t *dst, uint8_t data); -extern void unprotect_jedec(volatile uint8_t *bios); -extern void protect_jedec(volatile uint8_t *bios); -int write_byte_program_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst); -extern int probe_jedec(struct flashchip *flash); -extern int erase_chip_jedec(struct flashchip *flash); -extern int write_jedec(struct flashchip *flash, uint8_t *buf); -extern int erase_sector_jedec(volatile uint8_t *bios, unsigned int page); -extern int erase_block_jedec(volatile uint8_t *bios, unsigned int page); -extern int write_sector_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, unsigned int page_size); - -#endif /* !__JEDEC_H__ */ diff --git a/util/flashrom/layout.c b/util/flashrom/layout.c index 6dbbd9c0d7..62715bd3f9 100644 --- a/util/flashrom/layout.c +++ b/util/flashrom/layout.c @@ -2,9 +2,7 @@ #include #include #include -#include "layout.h" -#include "lbtable.h" -#include "debug.h" +#include "flash.h" char *mainboard_vendor = NULL; char *mainboard_part = NULL; diff --git a/util/flashrom/layout.h b/util/flashrom/layout.h deleted file mode 100644 index b717d34c12..0000000000 --- a/util/flashrom/layout.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef __LAYOUT_H__ -#define __LAYOUT_H__ 1 - -int show_id(uint8_t *bios, int size); -int read_romlayout(char *name); -int find_romentry(char *name); -int handle_romentries(uint8_t *buffer, uint8_t *content); - -#endif /* !__LAYOUT_H__ */ diff --git a/util/flashrom/lbtable.c b/util/flashrom/lbtable.c index dd005e249c..004e61cd9d 100644 --- a/util/flashrom/lbtable.c +++ b/util/flashrom/lbtable.c @@ -32,7 +32,6 @@ #include #include "flash.h" #include "linuxbios_tables.h" -#include "debug.h" char *lb_part = NULL, *lb_vendor = NULL; diff --git a/util/flashrom/lbtable.h b/util/flashrom/lbtable.h deleted file mode 100644 index ed9768ce19..0000000000 --- a/util/flashrom/lbtable.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __LBTABLE_H__ -#define __LBTABLE_H__ 1 - -int linuxbios_init(void); - -extern char *lb_part, *lb_vendor; - -#endif diff --git a/util/flashrom/m29f400bt.c b/util/flashrom/m29f400bt.c index 809f33cb3a..e33c1068b3 100644 --- a/util/flashrom/m29f400bt.c +++ b/util/flashrom/m29f400bt.c @@ -24,8 +24,6 @@ */ #include "flash.h" -#include "m29f400bt.h" -#include "debug.h" void toggle_ready_m29f400bt(volatile uint8_t *dst) { diff --git a/util/flashrom/m29f400bt.h b/util/flashrom/m29f400bt.h deleted file mode 100644 index 04589bb998..0000000000 --- a/util/flashrom/m29f400bt.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __M29F400BT_H__ -#define __M29F400BT_H__ 1 - -#include - -extern int probe_m29f400bt(struct flashchip *flash); -extern int erase_m29f400bt(struct flashchip *flash); -extern int block_erase_m29f400bt(volatile uint8_t *bios, - volatile uint8_t *dst); -extern int write_m29f400bt(struct flashchip *flash, uint8_t *buf); -extern int write_linuxbios_m29f400bt(struct flashchip *flash, uint8_t *buf); - -extern void toggle_ready_m29f400bt(volatile uint8_t *dst); -extern void data_polling_m29f400bt(volatile uint8_t *dst, uint8_t data); -extern void protect_m29f400bt(volatile uint8_t *bios); -extern void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size); - -#endif /* !__M29F400BT_H__ */ diff --git a/util/flashrom/msys_doc.c b/util/flashrom/msys_doc.c index 64bc87e3f2..b91c73a115 100644 --- a/util/flashrom/msys_doc.c +++ b/util/flashrom/msys_doc.c @@ -23,7 +23,6 @@ #include #include "flash.h" #include "msys_doc.h" -#include "debug.h" static int doc_wait(volatile uint8_t *bios, int timeout); static uint8_t doc_read_chipid(volatile uint8_t *bios); diff --git a/util/flashrom/mx29f002.c b/util/flashrom/mx29f002.c index db5f31b773..31e924adbd 100644 --- a/util/flashrom/mx29f002.c +++ b/util/flashrom/mx29f002.c @@ -27,9 +27,6 @@ #include #include #include "flash.h" -#include "jedec.h" -#include "mx29f002.h" -#include "debug.h" int probe_29f002(struct flashchip *flash) { diff --git a/util/flashrom/mx29f002.h b/util/flashrom/mx29f002.h deleted file mode 100644 index d180fae413..0000000000 --- a/util/flashrom/mx29f002.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __MX29F002_H__ -#define __MX29F002_H__ 1 - -extern int probe_29f002(struct flashchip *flash); -extern int erase_29f002(struct flashchip *flash); -extern int write_29f002(struct flashchip *flash, uint8_t *buf); - -#endif /* !__MX29F002_H__ */ diff --git a/util/flashrom/pm49fl004.c b/util/flashrom/pm49fl004.c index b50fa252a0..42442cfdd2 100644 --- a/util/flashrom/pm49fl004.c +++ b/util/flashrom/pm49fl004.c @@ -24,8 +24,6 @@ #include #include "flash.h" -#include "jedec.h" -#include "pm49fl004.h" extern int exclude_start_page, exclude_end_page; diff --git a/util/flashrom/pm49fl004.h b/util/flashrom/pm49fl004.h deleted file mode 100644 index 2abd7deddf..0000000000 --- a/util/flashrom/pm49fl004.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __PM49FL004_H__ -#define __PM49FL004_H__ 1 - -extern int probe_49fl004(struct flashchip *flash); -extern int erase_49fl004(struct flashchip *flash); -extern int write_49fl004(struct flashchip *flash, uint8_t *buf); - -#endif diff --git a/util/flashrom/sharplhf00l04.c b/util/flashrom/sharplhf00l04.c index 660142d82c..2616611153 100644 --- a/util/flashrom/sharplhf00l04.c +++ b/util/flashrom/sharplhf00l04.c @@ -24,10 +24,7 @@ #include #include - #include "flash.h" -#include "sharplhf00l04.h" -#include "debug.h" void toggle_ready_lhf00l04(volatile uint8_t *dst) { diff --git a/util/flashrom/sharplhf00l04.h b/util/flashrom/sharplhf00l04.h deleted file mode 100644 index b76b4ae2fc..0000000000 --- a/util/flashrom/sharplhf00l04.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef __SHARPLHF00L04_H__ -#define __SHARPLHF00L04_H__ 1 - -extern int probe_lhf00l04(struct flashchip *flash); -extern int erase_lhf00l04(struct flashchip *flash); -extern int write_lhf00l04(struct flashchip *flash, uint8_t *buf); -extern void toggle_ready_lhf00l04(volatile uint8_t *dst); -extern void data_polling_lhf00l04(volatile uint8_t *dst, uint8_t data); -extern void protect_lhf00l04(volatile uint8_t *bios); - -#endif /* !__SHARPLHF00L04_H__ */ diff --git a/util/flashrom/sst28sf040.c b/util/flashrom/sst28sf040.c index c8f71f814e..80412c5fd5 100644 --- a/util/flashrom/sst28sf040.c +++ b/util/flashrom/sst28sf040.c @@ -28,8 +28,6 @@ #include #include #include "flash.h" -#include "jedec.h" -#include "debug.h" #define AUTO_PG_ERASE1 0x20 #define AUTO_PG_ERASE2 0xD0 diff --git a/util/flashrom/sst28sf040.h b/util/flashrom/sst28sf040.h deleted file mode 100644 index 027e845044..0000000000 --- a/util/flashrom/sst28sf040.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __SST28SF040_H__ -#define __SST28SF040_H__ - -extern int probe_28sf040(struct flashchip *flash); -extern int erase_28sf040(struct flashchip *flash); -extern int write_28sf040(struct flashchip *flash, uint8_t *buf); - -#endif /* !__SST28SF040_H__ */ diff --git a/util/flashrom/sst39sf020.c b/util/flashrom/sst39sf020.c index 1277f10c24..bfcead6c6c 100644 --- a/util/flashrom/sst39sf020.c +++ b/util/flashrom/sst39sf020.c @@ -29,8 +29,6 @@ #include #include #include "flash.h" -#include "jedec.h" -#include "sst39sf020.h" #define AUTO_PG_ERASE1 0x20 #define AUTO_PG_ERASE2 0xD0 diff --git a/util/flashrom/sst39sf020.h b/util/flashrom/sst39sf020.h deleted file mode 100644 index aea62cc969..0000000000 --- a/util/flashrom/sst39sf020.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __SST39SF020_H__ -#define __SST39SF020_H__ 1 - -extern int probe_39sf020(struct flashchip *flash); -extern int write_39sf020(struct flashchip *flash, uint8_t *buf); - -#endif /* !__SST39SF020_H__ */ diff --git a/util/flashrom/sst49lf040.c b/util/flashrom/sst49lf040.c index 682c2fe3b9..884895e383 100644 --- a/util/flashrom/sst49lf040.c +++ b/util/flashrom/sst49lf040.c @@ -26,8 +26,6 @@ */ #include #include "flash.h" -#include "jedec.h" -#include "sst49lf040.h" int erase_49lf040(struct flashchip *flash) { diff --git a/util/flashrom/sst49lf040.h b/util/flashrom/sst49lf040.h deleted file mode 100644 index 3fefe57281..0000000000 --- a/util/flashrom/sst49lf040.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __SST49LF040_H__ -#define __SST49LF040_H__ 1 - -extern int erase_49lf040(struct flashchip *flash); -extern int write_49lf040(struct flashchip *flash, uint8_t *buf); - -#endif /* !__SST49LF040_H__ */ diff --git a/util/flashrom/sst49lfxxxc.c b/util/flashrom/sst49lfxxxc.c index edb5493b5d..8480877105 100644 --- a/util/flashrom/sst49lfxxxc.c +++ b/util/flashrom/sst49lfxxxc.c @@ -32,10 +32,7 @@ #include #include #include - #include "flash.h" -#include "jedec.h" -#include "debug.h" #define SECTOR_ERASE 0x30 #define BLOCK_ERASE 0x20 diff --git a/util/flashrom/sst49lfxxxc.h b/util/flashrom/sst49lfxxxc.h deleted file mode 100644 index 8768b1fe66..0000000000 --- a/util/flashrom/sst49lfxxxc.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __SST49LFXXXC_H__ -#define __SST49LFXXXC_H__ - -extern int probe_49lfxxxc(struct flashchip *flash); -extern int erase_49lfxxxc(struct flashchip *flash); -extern int write_49lfxxxc(struct flashchip *flash, uint8_t *buf); - -#endif /* !__SST49LFXXXC_H__ */ diff --git a/util/flashrom/sst_fwhub.c b/util/flashrom/sst_fwhub.c index e9d0104665..9e4539bf53 100644 --- a/util/flashrom/sst_fwhub.c +++ b/util/flashrom/sst_fwhub.c @@ -21,10 +21,7 @@ */ #include - #include "flash.h" -#include "jedec.h" -#include "sst_fwhub.h" // I need that Berkeley bit-map printer void print_sst_fwhub_status(uint8_t status) diff --git a/util/flashrom/sst_fwhub.h b/util/flashrom/sst_fwhub.h deleted file mode 100644 index 66979bc082..0000000000 --- a/util/flashrom/sst_fwhub.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __SST_FWHUB_H__ -#define __SST_FWHUB_H__ 1 - -extern int probe_sst_fwhub(struct flashchip *flash); -extern int erase_sst_fwhub(struct flashchip *flash); -extern int write_sst_fwhub(struct flashchip *flash, uint8_t *buf); - -#endif /* !__SST_FWHUB_H__ */ diff --git a/util/flashrom/udelay.c b/util/flashrom/udelay.c index 1d0b42f039..2f032dfdec 100644 --- a/util/flashrom/udelay.c +++ b/util/flashrom/udelay.c @@ -1,6 +1,6 @@ #include #include -#include "debug.h" +#include "flash.h" // count to a billion. Time it. If it's < 1 sec, count to 10B, etc. unsigned long micro = 1; diff --git a/util/flashrom/w49f002u.c b/util/flashrom/w49f002u.c index 2549501a3b..66111fd0aa 100644 --- a/util/flashrom/w49f002u.c +++ b/util/flashrom/w49f002u.c @@ -28,8 +28,6 @@ #include #include "flash.h" -#include "jedec.h" -#include "w49f002u.h" int write_49f002(struct flashchip *flash, uint8_t *buf) { diff --git a/util/flashrom/w49f002u.h b/util/flashrom/w49f002u.h deleted file mode 100644 index 1ea8377c66..0000000000 --- a/util/flashrom/w49f002u.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __W49F002U_H__ -#define __W49F002U_H__ 1 - -extern int write_49f002(struct flashchip *flash, uint8_t *buf); - -#endif /* !__W49F002U_H__ */