MAX may already be defined. Also, fix smaller cosmetics (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4205 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/flashrom/flash.h b/util/flashrom/flash.h
index 4888428bc1ad4f2ec281508bdc78d5314ce5fca0..59c6c479be22f786d2bd25f5cbebfd93980cbd9f 100644 (file)
--- a/util/flashrom/flash.h
+++ b/util/flashrom/flash.h
@@ -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;
 

diff --git a/util/flashrom/flashrom.c b/util/flashrom/flashrom.c
index a47bfa075411d18cb21a69bd47753a8af59638ea..8e1c3e44ede8b07656f1441d7ddd1cf268563919 100644 (file)
--- a/util/flashrom/flashrom.c
+++ b/util/flashrom/flashrom.c
@@ -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)