Author: uwe Date: 2009-04-24 18:17:41 +0200 (Fri, 24 Apr 2009) New Revision: 4205
Modified: trunk/util/flashrom/flash.h trunk/util/flashrom/flashrom.c Log: 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
Modified: trunk/util/flashrom/flash.h =================================================================== --- trunk/util/flashrom/flash.h 2009-04-24 10:23:56 UTC (rev 4204) +++ trunk/util/flashrom/flash.h 2009-04-24 16:17:41 UTC (rev 4205) @@ -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;
Modified: trunk/util/flashrom/flashrom.c =================================================================== --- trunk/util/flashrom/flashrom.c 2009-04-24 10:23:56 UTC (rev 4204) +++ trunk/util/flashrom/flashrom.c 2009-04-24 16:17:41 UTC (rev 4205) @@ -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)