diff options
| -rw-r--r-- | flashrom.c | 7 | ||||
| -rw-r--r-- | print_wiki.c | 3 | ||||
| -rw-r--r-- | programmer.h | 2 |
3 files changed, 8 insertions, 4 deletions
@@ -1186,11 +1186,12 @@ notfound: if (!flash || !flash->name) return NULL; - if (programmer_table[programmer].map_flash_region == physmap) { +#if CONFIG_INTERNAL == 1 + if (programmer_table[programmer].map_flash_region == physmap) snprintf(location, sizeof(location), "at physical address 0x%lx", base); - } else { + else +#endif snprintf(location, sizeof(location), "on %s", programmer_table[programmer].name); - } msg_cinfo("%s chip \"%s %s\" (%d KB, %s) %s.\n", force ? "Assuming" : "Found", diff --git a/print_wiki.c b/print_wiki.c index 7b354d9d..8b13f704 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -246,6 +246,8 @@ static void print_supported_chips_wiki(int cols) printf("\n|}\n\n|}\n"); } +/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ +#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 static void print_supported_pcidevs_wiki(const struct pcidev_status *devs) { int i = 0; @@ -262,6 +264,7 @@ static void print_supported_pcidevs_wiki(const struct pcidev_status *devs) (devs[i].status == NT) ? "?3" : "OK"); } } +#endif void print_supported_wiki(void) { diff --git a/programmer.h b/programmer.h index 47b3e4ac..fbc82cc9 100644 --- a/programmer.h +++ b/programmer.h @@ -229,7 +229,7 @@ int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data); #endif /* print.c */ -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI >= 1 +#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 void print_supported_pcidevs(const struct pcidev_status *devs); #endif |