diff options
| author | Scott Wood <scottwood@freescale.com> | 2012-12-14 16:03:55 -0600 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2012-12-14 16:03:55 -0600 |
| commit | 88c5c68ffa277bf01b3254cf5a059e2cbe07be97 (patch) | |
| tree | f56b444a1c85d94d6a386df090def099632489fe /arch/sparc | |
| parent | 0b38fffbe413fc0725c750d046ca62c23fca196e (diff) | |
| parent | 6e9005bd96ff0f0548a787ffafee10664a57a8e1 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/string.h | 2 | ||||
| -rw-r--r-- | arch/sparc/lib/board.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/string.h b/arch/sparc/include/asm/string.h index c6bbc203d5..af6faea234 100644 --- a/arch/sparc/include/asm/string.h +++ b/arch/sparc/include/asm/string.h @@ -40,7 +40,7 @@ */ extern int strcasecmp(const char *, const char *); -extern int strncasecmp(const char *, const char *, int); +extern int strncasecmp(const char *, const char *, __kernel_size_t); extern char *strcpy(char *, const char *); extern char *strncpy(char *, const char *, __kernel_size_t); extern __kernel_size_t strlen(const char *); diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c index 32d025a342..1b5e995b15 100644 --- a/arch/sparc/lib/board.c +++ b/arch/sparc/lib/board.c @@ -284,8 +284,7 @@ void board_init_f(ulong bootflag) * * NOTE: Maybe we should add some WATCHDOG_RESET()? XXX */ - s = getenv("flashchecksum"); - if (s && (*s == 'y')) { + if (getenv_yesno("flashchecksum") == 1) { printf(" CRC: %08lX", crc32(0, (const unsigned char *)CONFIG_SYS_FLASH_BASE, flash_size) |