diff options
| author | Rob Herring <robh@kernel.org> | 2018-03-27 21:06:59 -0500 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2018-04-23 12:43:45 +0200 |
| commit | 96f0e6fcc9add1f063984be32073fe8b1d39b664 (patch) | |
| tree | f0abd8e3f5f8a2c55e96266898b8406f1abb4900 /arch/microblaze/kernel/setup.c | |
| parent | f71044c999bf01f2875f26b0df7c0d172d257326 (diff) | |
| download | linux-rt-96f0e6fcc9add1f063984be32073fe8b1d39b664.tar.gz | |
microblaze: remove redundant early_printk support
With earlycon support now enabled, the arch specific early_printk support
can be removed.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze/kernel/setup.c')
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index be98ffe28ca8..bbd6968ce55b 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -27,13 +27,12 @@ #include <linux/param.h> #include <linux/pci.h> #include <linux/cache.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/dma-mapping.h> #include <asm/cacheflush.h> #include <asm/entry.h> #include <asm/cpuinfo.h> -#include <asm/prom.h> #include <asm/pgtable.h> DEFINE_PER_CPU(unsigned int, KSP); /* Saved kernel stack pointer */ @@ -54,6 +53,9 @@ void __init setup_arch(char **cmdline_p) { *cmdline_p = boot_command_line; + setup_memory(); + parse_early_param(); + console_verbose(); unflatten_device_tree(); @@ -62,13 +64,6 @@ void __init setup_arch(char **cmdline_p) microblaze_cache_init(); - setup_memory(); - -#ifdef CONFIG_EARLY_PRINTK - /* remap early console to virtual address */ - remap_early_printk(); -#endif - xilinx_pci_init(); #if defined(CONFIG_DUMMY_CONSOLE) @@ -133,10 +128,6 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, /* initialize device tree for usage in early_printk */ early_init_devtree(_fdt_start); -#ifdef CONFIG_EARLY_PRINTK - setup_early_printk(NULL); -#endif - /* setup kernel_tlb after BSS cleaning * Maybe worth to move to asm code */ kernel_tlb = tlb0 + tlb1; |