diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 14:23:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 14:23:42 -0800 |
| commit | b0f0c26a2ed49eccf98a011b86fe24fb9f2b35f6 (patch) | |
| tree | ad2efaa0ab0459257948127c56d4a7747cbefa11 /arch/nios2/kernel/setup.c | |
| parent | 99fa0ad92c4fd8b529c89b3640b42323984be761 (diff) | |
| parent | d16d2be111a61baf3a4696f07bfc7a8e36697cec (diff) | |
| download | talos-op-linux-b0f0c26a2ed49eccf98a011b86fe24fb9f2b35f6.tar.gz talos-op-linux-b0f0c26a2ed49eccf98a011b86fe24fb9f2b35f6.zip | |
Merge tag 'nios2-v3.20-rc1' of git://git.rocketboards.org/linux-socfpga-next
Pull arch/nios2 update from Ley Foon Tan:
"Here is the nios2 update for 3.20:
- add early printk support
- add kgdb support
- add compressed kernel support
- bugfixes"
* tag 'nios2-v3.20-rc1' of git://git.rocketboards.org/linux-socfpga-next:
nios2: add kgdb support
MAINTAINERS: update arch/nios2 git tree
nios2: default CONFIG_NIOS2_BOOT_LINK_OFFSET to 8MB
nios2: Add support for compressed kernel
nios2: add early printk support
nios2: Port OOM changes to do_page_fault()
nios2: Remove unused prepare_to_copy()
Diffstat (limited to 'arch/nios2/kernel/setup.c')
| -rw-r--r-- | arch/nios2/kernel/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index cb3121f975d4..b101a43d3c5a 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c @@ -139,6 +139,10 @@ void __init setup_arch(char **cmdline_p) console_verbose(); +#ifdef CONFIG_EARLY_PRINTK + setup_early_printk(); +#endif + memory_start = PAGE_ALIGN((unsigned long)__pa(_end)); memory_end = (unsigned long) CONFIG_NIOS2_MEM_BASE + memory_size; |
