diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-03-08 00:09:11 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-03-08 00:09:11 +0000 |
| commit | d95355880a66fcbdb056031425288d29a9e6691f (patch) | |
| tree | af6f2f08a9143e40a5b7862426ca644d8985e65a | |
| parent | 7913fb425fd94056627665c0c5704729ca64e0f0 (diff) | |
| download | flashrom-d95355880a66fcbdb056031425288d29a9e6691f.tar.gz flashrom-d95355880a66fcbdb056031425288d29a9e6691f.tar.bz2 flashrom-d95355880a66fcbdb056031425288d29a9e6691f.zip | |
Fix compilation if CONFIG_INTERNAL=no
Fix compilation if everything except CONFIG_SATAMV is no.
Do not compile in PCI support for wiki printing if no PCI devices are
supported.
Corresponding to flashrom svn r1278.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
| -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
diff --git a/flashrom.c b/flashrom.c index cfb8e5ff2..34248ed73 100644 --- a/flashrom.c +++ b/flashrom.c @@ -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 7b354d9d6..8b13f7043 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 47b3e4acf..fbc82cc98 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 |