diff options
| author | Nico Huber <nico.huber@secunet.com> | 2016-05-03 10:48:02 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2017-06-22 10:34:51 +0000 |
| commit | 2d62572d1dd0c37eb626fd8faa17b26690f20b15 (patch) | |
| tree | c76d5035e6fe7b8f9ca841c7030a7f44712f3d16 /flash.h | |
| parent | 8d494992176abe0877c88f06fdbc9c8d8826ae87 (diff) | |
| download | flashrom-2d62572d1dd0c37eb626fd8faa17b26690f20b15.tar.gz flashrom-2d62572d1dd0c37eb626fd8faa17b26690f20b15.tar.bz2 flashrom-2d62572d1dd0c37eb626fd8faa17b26690f20b15.zip | |
Fix linking with libpayload
o Move flashbuses_to_text() to flashrom.c, it's not a cli function.
o Guard `!defined(HAVE_STRNLEN)`. This guard was introduced in
23e10b87 (Add a bunch of new/tested stuff and various small
changes 24) to support older BSDs. It's probably completely
broken because HAVE_STRNLEN is presumably a GNU autotools
thing. But we can't fix it without retesting these older BSDs.
Change-Id: I561135209b819361d125eeaeef9ff886d6bae987
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/18738
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'flash.h')
| -rw-r--r-- | flash.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -264,13 +264,14 @@ void tolower_string(char *str); #ifdef __MINGW32__ char* strtok_r(char *str, const char *delim, char **nextp); #endif -#if defined(__DJGPP__) || !defined(HAVE_STRNLEN) +#if defined(__DJGPP__) || (!defined(__LIBPAYLOAD__) && !defined(HAVE_STRNLEN)) size_t strnlen(const char *str, size_t n); #endif /* flashrom.c */ extern const char flashrom_version[]; extern const char *chip_to_probe; +char *flashbuses_to_text(enum chipbustype bustype); int map_flash(struct flashctx *flash); void unmap_flash(struct flashctx *flash); int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); @@ -308,7 +309,6 @@ int do_verify(struct flashctx *, const char *const filename); #define ERROR_FLASHROM_LIMIT -201 /* cli_common.c */ -char *flashbuses_to_text(enum chipbustype bustype); void print_chip_support_status(const struct flashchip *chip); /* cli_output.c */ |