openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

Fix compilation if CONFIG_INTERNAL=no

Browse Source 
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>
This commit is contained in:
Carl-Daniel Hailfinger 2011-03-08 00:09:11 +00:00
parent 7913fb425f
commit d95355880a
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flashrom.c
View File

@ -1186,11 +1186,12 @@ notfound:
if (!flash || !flash->name) if (!flash || !flash->name)
return NULL; 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); snprintf(location, sizeof(location), "at physical address 0x%lx", base);
} else { else
#endif
snprintf(location, sizeof(location), "on %s", programmer_table[programmer].name); snprintf(location, sizeof(location), "on %s", programmer_table[programmer].name);
}
msg_cinfo("%s chip \"%s %s\" (%d KB, %s) %s.\n", msg_cinfo("%s chip \"%s %s\" (%d KB, %s) %s.\n",
force ? "Assuming" : "Found", force ? "Assuming" : "Found",

3
print_wiki.c
View File

@ -246,6 +246,8 @@ static void print_supported_chips_wiki(int cols)
printf("\n|}\n\n|}\n"); 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) static void print_supported_pcidevs_wiki(const struct pcidev_status *devs)
{ {
int i = 0; int i = 0;
@ -262,6 +264,7 @@ static void print_supported_pcidevs_wiki(const struct pcidev_status *devs)
(devs[i].status == NT) ? "?3" : "OK"); (devs[i].status == NT) ? "?3" : "OK");
} }
} }
#endif
void print_supported_wiki(void) void print_supported_wiki(void)
{ {

2
programmer.h
View File

@ -229,7 +229,7 @@ int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data);
#endif #endif
/* print.c */ /* 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); void print_supported_pcidevs(const struct pcidev_status *devs);
#endif #endif