diff options
author | Palmer Dabbelt <palmer@sifive.com> | 2017-12-08 14:23:23 -0500 |
---|---|---|
committer | Palmer Dabbelt <palmer@dabbelt.com> | 2017-12-11 10:51:09 -0500 |
commit | 27b0174525325bf18919597016483a709f3372f8 (patch) | |
tree | dc5c8acb79489fe9d1579176caf5668307d99bf1 | |
parent | 3cfa5008081db845c6c53d531ec34e9c84a9fd99 (diff) |
RISC-V: Remove unused CONFIG_HVC_RISCV_SBI code
This is code that probably should never have made it into the kernel in
the first place: it depends on a driver that hadn't been reviewed yet.
During the HVC_SBI_RISCV review process a better way of doing this was
suggested, but that means this code is defunct. It's compile-time
disabled in 4.15 because the driver isn't in, so I think it's safe to
just remove this for now.
CC: Greg KH <gregkh@linuxfoundation.org>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
-rw-r--r-- | arch/riscv/kernel/setup.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 8fbb6749910d..cb7b0c63014e 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c | |||
@@ -38,10 +38,6 @@ | |||
38 | #include <asm/tlbflush.h> | 38 | #include <asm/tlbflush.h> |
39 | #include <asm/thread_info.h> | 39 | #include <asm/thread_info.h> |
40 | 40 | ||
41 | #ifdef CONFIG_HVC_RISCV_SBI | ||
42 | #include <asm/hvc_riscv_sbi.h> | ||
43 | #endif | ||
44 | |||
45 | #ifdef CONFIG_DUMMY_CONSOLE | 41 | #ifdef CONFIG_DUMMY_CONSOLE |
46 | struct screen_info screen_info = { | 42 | struct screen_info screen_info = { |
47 | .orig_video_lines = 30, | 43 | .orig_video_lines = 30, |
@@ -212,13 +208,6 @@ static void __init setup_bootmem(void) | |||
212 | 208 | ||
213 | void __init setup_arch(char **cmdline_p) | 209 | void __init setup_arch(char **cmdline_p) |
214 | { | 210 | { |
215 | #if defined(CONFIG_HVC_RISCV_SBI) | ||
216 | if (likely(early_console == NULL)) { | ||
217 | early_console = &riscv_sbi_early_console_dev; | ||
218 | register_console(early_console); | ||
219 | } | ||
220 | #endif | ||
221 | |||
222 | #ifdef CONFIG_CMDLINE_BOOL | 211 | #ifdef CONFIG_CMDLINE_BOOL |
223 | #ifdef CONFIG_CMDLINE_OVERRIDE | 212 | #ifdef CONFIG_CMDLINE_OVERRIDE |
224 | strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); | 213 | strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); |