diff options
author | Yinghai Lu <yinghai@kernel.org> | 2010-07-13 16:35:17 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-13 17:08:12 -0400 |
commit | ce0aa5dd20e44372f9617dd67c984f41fcdbed88 (patch) | |
tree | 8d418e91b8c9df1193121dc85f1864ff0195a42e /arch/x86/boot/string.c | |
parent | fa97bdf92709adaaf8b9a5164a895e262a4fcf60 (diff) |
x86, setup: Make the setup code also accept console=uart8250
Make the boot code also accept the console=uart8250,io,0x2f8,115200n
form of early console.
Also add back simple_guess_base(), otherwise those simple_strtoull(,,0)
are not going to work.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4C3CCE05.4090505@kernel.org>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/boot/string.c')
-rw-r--r-- | arch/x86/boot/string.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c index aba29df4a7bb..3cbc4058dd26 100644 --- a/arch/x86/boot/string.c +++ b/arch/x86/boot/string.c | |||
@@ -68,10 +68,32 @@ unsigned int atou(const char *s) | |||
68 | /* Works only for digits and letters, but small and fast */ | 68 | /* Works only for digits and letters, but small and fast */ |
69 | #define TOLOWER(x) ((x) | 0x20) | 69 | #define TOLOWER(x) ((x) | 0x20) |
70 | 70 | ||
71 | static unsigned int simple_guess_base(const char *cp) | ||
72 | { | ||
73 | if (cp[0] == '0') { | ||
74 | if (TOLOWER(cp[1]) == 'x' && isxdigit(cp[2])) | ||
75 | return 16; | ||
76 | else | ||
77 | return 8; | ||
78 | } else { | ||
79 | return 10; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | /** | ||
84 | * simple_strtoull - convert a string to an unsigned long long | ||
85 | * @cp: The start of the string | ||
86 | * @endp: A pointer to the end of the parsed string will be placed here | ||
87 | * @base: The number base to use | ||
88 | */ | ||
89 | |||
71 | unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base) | 90 | unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base) |
72 | { | 91 | { |
73 | unsigned long long result = 0; | 92 | unsigned long long result = 0; |
74 | 93 | ||
94 | if (!base) | ||
95 | base = simple_guess_base(cp); | ||
96 | |||
75 | if (base == 16 && cp[0] == '0' && TOLOWER(cp[1]) == 'x') | 97 | if (base == 16 && cp[0] == '0' && TOLOWER(cp[1]) == 'x') |
76 | cp += 2; | 98 | cp += 2; |
77 | 99 | ||