diff options
author | Uwe Hermann <uwe@hermann-uwe.de> | 2009-04-24 16:17:41 +0000 |
---|---|---|
committer | Uwe Hermann <uwe@hermann-uwe.de> | 2009-04-24 16:17:41 +0000 |
commit | ad216bf3a023569249069ec6dc5c93fd7bd741d7 (patch) | |
tree | 16c12a7c5a25d90047003143a6190a160f0e3e87 | |
parent | 70ea9a326ac88bfb96f3b064aaa4ed69af902faf (diff) | |
download | flashrom-ad216bf3a023569249069ec6dc5c93fd7bd741d7.tar.gz flashrom-ad216bf3a023569249069ec6dc5c93fd7bd741d7.tar.bz2 flashrom-ad216bf3a023569249069ec6dc5c93fd7bd741d7.zip |
MAX may already be defined
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>
-rw-r--r-- | flash.h | 8 | ||||
-rw-r--r-- | flashrom.c | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -512,15 +512,13 @@ typedef enum { extern flashbus_t flashbus; extern void *spibar; -/* debug.c */ -extern int verbose; -#define printf_debug(x...) { if (verbose) printf(x); } - /* physmap.c */ void *physmap(const char *descr, unsigned long phys_addr, size_t len); void physunmap(void *virt_addr, size_t len); /* flashrom.c */ +extern int verbose; +#define printf_debug(x...) { if (verbose) printf(x); } void map_flash_registers(struct flashchip *flash); /* layout.c */ @@ -529,7 +527,7 @@ int read_romlayout(char *name); int find_romentry(char *name); int handle_romentries(uint8_t *buffer, uint8_t *content); -/* lbtable.c */ +/* cbtable.c */ int coreboot_init(void); extern char *lb_part, *lb_vendor; @@ -242,7 +242,9 @@ int erase_flash(struct flashchip *flash) return 0; } +#ifndef MAX #define MAX(a, b) ((a) > (b) ? (a) : (b)) +#endif #define POS_PRINT(x) do { pos += strlen(x); printf(x); } while (0) void print_supported_chips(void) |