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

[coreboot.git] / util / flashrom / flash.h

diff --git a/util/flashrom/flash.h b/util/flashrom/flash.h
index 93628dd8c68d946b63ddc66764ae78fe3fdc381e..59c6c479be22f786d2bd25f5cbebfd93980cbd9f 100644 (file)
--- a/util/flashrom/flash.h
+++ b/util/flashrom/flash.h
@@ -285,7 +285,7 @@ extern struct flashchip flashchips[];
 #define MX_25L6405             0x2017  /* MX25L3205{,D} */
 #define MX_25L12805            0x2018  /* MX25L12805 */
 #define MX_25L1635D            0x2415
-#define MX_25L3235D            0x2416
+#define MX_25L3235D            0x5E16  /* MX25L3225D/MX25L3235D/MX25L3237D */
 #define MX_29F002B             0x34
 #define MX_29F002T             0xB0
 #define MX_29LV002CB           0x5A
@@ -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;