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>
diff --git a/flash.h b/flash.h
index 4888428..59c6c47 100644
--- a/flash.h
+++ b/flash.h
@@ -512,15 +512,13 @@
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 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;
diff --git a/flashrom.c b/flashrom.c
index a47bfa0..8e1c3e4 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -242,7 +242,9 @@
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)