openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-11-03 23:00:13 +01:00
Code Issues Releases Wiki Activity

MAX may already be defined

Browse Source 
Also, fix smaller cosmetics

Corresponding to flashrom svn r442 and coreboot v2 svn r4205.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
Uwe Hermann
2009-04-24 16:17:41 +00:00
parent 70ea9a326a
commit ad216bf3a0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flash.h
View File

@@ -512,15 +512,13 @@ typedef enum {
extern flashbus_t flashbus; extern flashbus_t flashbus;
extern void *spibar; extern void *spibar;
/* debug.c */
extern int verbose;
#define printf_debug(x...) { if (verbose) printf(x); }
/* physmap.c */ /* physmap.c */
void *physmap(const char *descr, unsigned long phys_addr, size_t len); void *physmap(const char *descr, unsigned long phys_addr, size_t len);
void physunmap(void *virt_addr, size_t len); void physunmap(void *virt_addr, size_t len);
/* flashrom.c */ /* flashrom.c */
extern int verbose;
#define printf_debug(x...) { if (verbose) printf(x); }
void map_flash_registers(struct flashchip *flash); void map_flash_registers(struct flashchip *flash);
/* layout.c */ /* layout.c */
@@ -529,7 +527,7 @@ int read_romlayout(char *name);
int find_romentry(char *name); int find_romentry(char *name);
int handle_romentries(uint8_t *buffer, uint8_t *content); int handle_romentries(uint8_t *buffer, uint8_t *content);
/* lbtable.c */ /* cbtable.c */
int coreboot_init(void); int coreboot_init(void);
extern char *lb_part, *lb_vendor; extern char *lb_part, *lb_vendor;

2
flashrom.c
View File

@@ -242,7 +242,9 @@ int erase_flash(struct flashchip *flash)
return 0; return 0;
} }
#ifndef MAX
#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b))
#endif
#define POS_PRINT(x) do { pos += strlen(x); printf(x); } while (0) #define POS_PRINT(x) do { pos += strlen(x); printf(x); } while (0)
void print_supported_chips(void) void print_supported_chips(void)