eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-spi

Browse Source 
This is the PR for SPI-NAND changes along with few spi changes.

[trini: Re-sync changes for ls1012afrwy_qspi*_defconfig]
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2018-10-02 13:02:22 -04:00
parent 2ba8bf2074 b3bec25256
commit 592cd5defd
104 changed files with 6002 additions and 1044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/strto.c
View File

@@ -85,22 +85,20 @@ long simple_strtol(const char *cp, char **endp, unsigned int base)
unsigned long ustrtoul(const char *cp, char **endp, unsigned int base)
{
unsigned long result = simple_strtoul(cp, endp, base);
switch (**endp) {
case 'G':
switch (tolower(**endp)) {
case 'g':
result *= 1024;
/* fall through */
case 'M':
case 'm':
result *= 1024;
/* fall through */
case 'K':
case 'k':
result *= 1024;
if ((*endp)[1] == 'i') {
if ((*endp)[2] == 'B')
(*endp) += 3;
else
(*endp) += 2;
}
(*endp)++;
if (**endp == 'i')
(*endp)++;
if (**endp == 'B')
(*endp)++;
}
return result;
}
@@ -108,22 +106,20 @@ unsigned long ustrtoul(const char *cp, char **endp, unsigned int base)
unsigned long long ustrtoull(const char *cp, char **endp, unsigned int base)
{
unsigned long long result = simple_strtoull(cp, endp, base);
switch (**endp) {
case 'G':
switch (tolower(**endp)) {
case 'g':
result *= 1024;
/* fall through */
case 'M':
case 'm':
result *= 1024;
/* fall through */
case 'K':
case 'k':
result *= 1024;
if ((*endp)[1] == 'i') {
if ((*endp)[2] == 'B')
(*endp) += 3;
else
(*endp) += 2;
}
(*endp)++;
if (**endp == 'i')
(*endp)++;
if (**endp == 'B')
(*endp)++;
}
return result;
}