diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 10:29:47 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 10:29:47 -0800 |
commit | 9830afca9273787f32e236ae5d0e4d3a378ae842 (patch) | |
tree | 0215da65d6d4e2021f2543e78b7518d48f6f6ead /arch/riscv/kernel/setup.c | |
parent | 30807ef2b76e01ea209fcad66a87e534ed1edb40 (diff) | |
parent | 9b9afe4a0ef149db2472f13d6fa3c705d2867c9c (diff) |
Merge tag 'riscv-for-linus-4.21-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux
Pull RISC-V updates from Palmer Dabbelt:
"We don't have many patches for this merge window, probably because
everything has been a bit busy with the holidays and conferences. The
only big user-visible change is to move over to an SBI-based earlycon
instead of our arch-specific early printk support.
The only outstanding patch set I know of is the audit patch set, which
I've managed to make a mess of and will attempt to clean up"
* tag 'riscv-for-linus-4.21-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
RISC-V: Select GENERIC_SCHED_CLOCK for clocksource drivers
RISC-V: lib: minor asm cleanup
RISC-V: Update Kconfig to better handle CMDLINE
riscv: remove unused variable in ftrace
RISC-V: add of_node_put()
RISC-V: Fix of_node_* refcount
riscv, atomic: Add #define's for the atomic_{cmp,}xchg_*() variants
RISC-V: Remove EARLY_PRINTK support
RISC-V: defconfig: Enable RISC-V SBI earlycon support
Diffstat (limited to 'arch/riscv/kernel/setup.c')
-rw-r--r-- | arch/riscv/kernel/setup.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 2c290e6aaa6e..fc8006a042eb 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -35,31 +35,9 @@ #include <asm/sections.h> #include <asm/pgtable.h> #include <asm/smp.h> -#include <asm/sbi.h> #include <asm/tlbflush.h> #include <asm/thread_info.h> -#ifdef CONFIG_EARLY_PRINTK -static void sbi_console_write(struct console *co, const char *buf, - unsigned int n) -{ - int i; - - for (i = 0; i < n; ++i) { - if (buf[i] == '\n') - sbi_console_putchar('\r'); - sbi_console_putchar(buf[i]); - } -} - -struct console riscv_sbi_early_console_dev __initdata = { - .name = "early", - .write = sbi_console_write, - .flags = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME, - .index = -1 -}; -#endif - #ifdef CONFIG_DUMMY_CONSOLE struct screen_info screen_info = { .orig_video_lines = 30, @@ -219,12 +197,6 @@ static void __init setup_bootmem(void) void __init setup_arch(char **cmdline_p) { -#if defined(CONFIG_EARLY_PRINTK) - if (likely(early_console == NULL)) { - early_console = &riscv_sbi_early_console_dev; - register_console(early_console); - } -#endif *cmdline_p = boot_command_line; parse_early_param(); |