Author: uwe Date: 2007-08-23 15:34:59 +0200 (Thu, 23 Aug 2007) New Revision: 2746
Removed: trunk/util/flashrom/82802ab.h trunk/util/flashrom/am29f040b.h trunk/util/flashrom/debug.h trunk/util/flashrom/jedec.h trunk/util/flashrom/layout.h trunk/util/flashrom/lbtable.h trunk/util/flashrom/m29f400bt.h trunk/util/flashrom/mx29f002.h trunk/util/flashrom/pm49fl004.h trunk/util/flashrom/sharplhf00l04.h trunk/util/flashrom/sst28sf040.h trunk/util/flashrom/sst39sf020.h trunk/util/flashrom/sst49lf040.h trunk/util/flashrom/sst49lfxxxc.h trunk/util/flashrom/sst_fwhub.h trunk/util/flashrom/w49f002u.h Modified: trunk/util/flashrom/82802ab.c trunk/util/flashrom/am29f040b.c trunk/util/flashrom/board_enable.c trunk/util/flashrom/chipset_enable.c trunk/util/flashrom/flash.h trunk/util/flashrom/flashchips.c trunk/util/flashrom/flashrom.c trunk/util/flashrom/jedec.c trunk/util/flashrom/layout.c trunk/util/flashrom/lbtable.c trunk/util/flashrom/m29f400bt.c trunk/util/flashrom/msys_doc.c trunk/util/flashrom/mx29f002.c trunk/util/flashrom/pm49fl004.c trunk/util/flashrom/sharplhf00l04.c trunk/util/flashrom/sst28sf040.c trunk/util/flashrom/sst39sf020.c trunk/util/flashrom/sst49lf040.c trunk/util/flashrom/sst49lfxxxc.c trunk/util/flashrom/sst_fwhub.c trunk/util/flashrom/udelay.c trunk/util/flashrom/w49f002u.c Log: Drop a bunch of useless header files, merge them into flash.h.
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/util/flashrom/82802ab.c =================================================================== --- trunk/util/flashrom/82802ab.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/82802ab.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -25,10 +25,7 @@
#include <stdio.h> #include <stdint.h> - #include "flash.h" -#include "82802ab.h" -#include "debug.h"
void toggle_ready_82802ab(volatile uint8_t *dst) {
Deleted: trunk/util/flashrom/82802ab.h =================================================================== --- trunk/util/flashrom/82802ab.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/82802ab.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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__ */
Modified: trunk/util/flashrom/am29f040b.c =================================================================== --- trunk/util/flashrom/am29f040b.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/am29f040b.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -25,8 +25,6 @@ #include <stdio.h> #include <stdint.h> #include "flash.h" -#include "jedec.h" -#include "debug.h"
static __inline__ int erase_sector_29f040b(volatile uint8_t *bios, unsigned long address)
Deleted: trunk/util/flashrom/am29f040b.h =================================================================== --- trunk/util/flashrom/am29f040b.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/am29f040b.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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__ */
Modified: trunk/util/flashrom/board_enable.c =================================================================== --- trunk/util/flashrom/board_enable.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/board_enable.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -19,9 +19,7 @@ #include <pci/pci.h> #include <stdint.h> #include <string.h> - #include "flash.h" -#include "debug.h"
/* * Helper functions for many Winbond superIOs of the w836xx range.
Modified: trunk/util/flashrom/chipset_enable.c =================================================================== --- trunk/util/flashrom/chipset_enable.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/chipset_enable.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -14,9 +14,7 @@ #include <stdio.h> #include <pci/pci.h> #include <stdlib.h> - #include "flash.h" -#include "debug.h"
static int enable_flash_ali_m1533(struct pci_dev *dev, char *name) {
Deleted: trunk/util/flashrom/debug.h =================================================================== --- trunk/util/flashrom/debug.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/debug.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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
Modified: trunk/util/flashrom/flash.h =================================================================== --- trunk/util/flashrom/flash.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/flash.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -27,9 +27,9 @@ #if defined(__GLIBC__) #include <sys/io.h> #endif - #include <unistd.h> #include <stdint.h> +#include <stdio.h>
struct flashchip { char *name; @@ -164,6 +164,103 @@
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__ */
Modified: trunk/util/flashrom/flashchips.c =================================================================== --- trunk/util/flashrom/flashchips.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/flashchips.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -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,
Modified: trunk/util/flashrom/flashrom.c =================================================================== --- trunk/util/flashrom/flashrom.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/flashrom.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -36,7 +36,6 @@ #include <stdlib.h> #include <getopt.h> #include <pci/pci.h> - /* for iopl */ #if defined (__sun) && (defined(__i386) || defined(__amd64)) #include <strings.h> @@ -44,11 +43,7 @@ #include <sys/psw.h> #include <asm/sunddi.h> #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 */
Modified: trunk/util/flashrom/jedec.c =================================================================== --- trunk/util/flashrom/jedec.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/jedec.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -28,8 +28,6 @@ #include <stdio.h> #include <stdint.h> #include "flash.h" -#include "jedec.h" -#include "debug.h"
#define MAX_REFLASH_TRIES 0x10
Deleted: trunk/util/flashrom/jedec.h =================================================================== --- trunk/util/flashrom/jedec.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/jedec.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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__ */
Modified: trunk/util/flashrom/layout.c =================================================================== --- trunk/util/flashrom/layout.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/layout.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -2,9 +2,7 @@ #include <stdlib.h> #include <string.h> #include <stdint.h> -#include "layout.h" -#include "lbtable.h" -#include "debug.h" +#include "flash.h"
char *mainboard_vendor = NULL; char *mainboard_part = NULL;
Deleted: trunk/util/flashrom/layout.h =================================================================== --- trunk/util/flashrom/layout.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/layout.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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__ */
Modified: trunk/util/flashrom/lbtable.c =================================================================== --- trunk/util/flashrom/lbtable.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/lbtable.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -32,7 +32,6 @@ #include <sys/mman.h> #include "flash.h" #include "linuxbios_tables.h" -#include "debug.h"
char *lb_part = NULL, *lb_vendor = NULL;
Deleted: trunk/util/flashrom/lbtable.h =================================================================== --- trunk/util/flashrom/lbtable.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/lbtable.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -1,8 +0,0 @@ -#ifndef __LBTABLE_H__ -#define __LBTABLE_H__ 1 - -int linuxbios_init(void); - -extern char *lb_part, *lb_vendor; - -#endif
Modified: trunk/util/flashrom/m29f400bt.c =================================================================== --- trunk/util/flashrom/m29f400bt.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/m29f400bt.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -24,8 +24,6 @@ */
#include "flash.h" -#include "m29f400bt.h" -#include "debug.h"
void toggle_ready_m29f400bt(volatile uint8_t *dst) {
Deleted: trunk/util/flashrom/m29f400bt.h =================================================================== --- trunk/util/flashrom/m29f400bt.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/m29f400bt.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -1,19 +0,0 @@ -#ifndef __M29F400BT_H__ -#define __M29F400BT_H__ 1 - -#include <stdio.h> - -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__ */
Modified: trunk/util/flashrom/msys_doc.c =================================================================== --- trunk/util/flashrom/msys_doc.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/msys_doc.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -23,7 +23,6 @@ #include <unistd.h> #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);
Modified: trunk/util/flashrom/mx29f002.c =================================================================== --- trunk/util/flashrom/mx29f002.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/mx29f002.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -27,9 +27,6 @@ #include <stdio.h> #include <stdint.h> #include "flash.h" -#include "jedec.h" -#include "mx29f002.h" -#include "debug.h"
int probe_29f002(struct flashchip *flash) {
Deleted: trunk/util/flashrom/mx29f002.h =================================================================== --- trunk/util/flashrom/mx29f002.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/mx29f002.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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__ */
Modified: trunk/util/flashrom/pm49fl004.c =================================================================== --- trunk/util/flashrom/pm49fl004.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/pm49fl004.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -24,8 +24,6 @@
#include <stdio.h> #include "flash.h" -#include "jedec.h" -#include "pm49fl004.h"
extern int exclude_start_page, exclude_end_page;
Deleted: trunk/util/flashrom/pm49fl004.h =================================================================== --- trunk/util/flashrom/pm49fl004.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/pm49fl004.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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
Modified: trunk/util/flashrom/sharplhf00l04.c =================================================================== --- trunk/util/flashrom/sharplhf00l04.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sharplhf00l04.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -24,10 +24,7 @@
#include <stdio.h> #include <stdlib.h> - #include "flash.h" -#include "sharplhf00l04.h" -#include "debug.h"
void toggle_ready_lhf00l04(volatile uint8_t *dst) {
Deleted: trunk/util/flashrom/sharplhf00l04.h =================================================================== --- trunk/util/flashrom/sharplhf00l04.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sharplhf00l04.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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__ */
Modified: trunk/util/flashrom/sst28sf040.c =================================================================== --- trunk/util/flashrom/sst28sf040.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sst28sf040.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -28,8 +28,6 @@ #include <stdio.h> #include <stdint.h> #include "flash.h" -#include "jedec.h" -#include "debug.h"
#define AUTO_PG_ERASE1 0x20 #define AUTO_PG_ERASE2 0xD0
Deleted: trunk/util/flashrom/sst28sf040.h =================================================================== --- trunk/util/flashrom/sst28sf040.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sst28sf040.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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__ */
Modified: trunk/util/flashrom/sst39sf020.c =================================================================== --- trunk/util/flashrom/sst39sf020.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sst39sf020.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -29,8 +29,6 @@ #include <stdio.h> #include <stdint.h> #include "flash.h" -#include "jedec.h" -#include "sst39sf020.h"
#define AUTO_PG_ERASE1 0x20 #define AUTO_PG_ERASE2 0xD0
Deleted: trunk/util/flashrom/sst39sf020.h =================================================================== --- trunk/util/flashrom/sst39sf020.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sst39sf020.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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__ */
Modified: trunk/util/flashrom/sst49lf040.c =================================================================== --- trunk/util/flashrom/sst49lf040.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sst49lf040.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -26,8 +26,6 @@ */ #include <stdio.h> #include "flash.h" -#include "jedec.h" -#include "sst49lf040.h"
int erase_49lf040(struct flashchip *flash) {
Deleted: trunk/util/flashrom/sst49lf040.h =================================================================== --- trunk/util/flashrom/sst49lf040.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sst49lf040.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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__ */
Modified: trunk/util/flashrom/sst49lfxxxc.c =================================================================== --- trunk/util/flashrom/sst49lfxxxc.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sst49lfxxxc.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -32,10 +32,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdint.h> - #include "flash.h" -#include "jedec.h" -#include "debug.h"
#define SECTOR_ERASE 0x30 #define BLOCK_ERASE 0x20
Deleted: trunk/util/flashrom/sst49lfxxxc.h =================================================================== --- trunk/util/flashrom/sst49lfxxxc.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sst49lfxxxc.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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__ */
Modified: trunk/util/flashrom/sst_fwhub.c =================================================================== --- trunk/util/flashrom/sst_fwhub.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sst_fwhub.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -21,10 +21,7 @@ */
#include <stdio.h> - #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)
Deleted: trunk/util/flashrom/sst_fwhub.h =================================================================== --- trunk/util/flashrom/sst_fwhub.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/sst_fwhub.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -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__ */
Modified: trunk/util/flashrom/udelay.c =================================================================== --- trunk/util/flashrom/udelay.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/udelay.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -1,6 +1,6 @@ #include <sys/time.h> #include <stdio.h> -#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;
Modified: trunk/util/flashrom/w49f002u.c =================================================================== --- trunk/util/flashrom/w49f002u.c 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/w49f002u.c 2007-08-23 13:34:59 UTC (rev 2746) @@ -28,8 +28,6 @@
#include <stdio.h> #include "flash.h" -#include "jedec.h" -#include "w49f002u.h"
int write_49f002(struct flashchip *flash, uint8_t *buf) {
Deleted: trunk/util/flashrom/w49f002u.h =================================================================== --- trunk/util/flashrom/w49f002u.h 2007-08-23 10:20:40 UTC (rev 2745) +++ trunk/util/flashrom/w49f002u.h 2007-08-23 13:34:59 UTC (rev 2746) @@ -1,6 +0,0 @@ -#ifndef __W49F002U_H__ -#define __W49F002U_H__ 1 - -extern int write_49f002(struct flashchip *flash, uint8_t *buf); - -#endif /* !__W49F002U_H__ */