diff options
| author | Jayachandran C <jchandra@broadcom.com> | 2013-06-10 08:41:02 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-06-13 17:46:42 +0200 |
| commit | 571886b2a52395f030d439c6259663a033e11e6a (patch) | |
| tree | 5e386eaa6465785dc16d3dc2693fe8b23e557f1c /arch/mips/netlogic/xlr | |
| parent | MIPS: Netlogic: Split reset code out of smpboot.S (diff) | |
| download | linux-571886b2a52395f030d439c6259663a033e11e6a.tar.xz linux-571886b2a52395f030d439c6259663a033e11e6a.zip | |
MIPS: Netlogic: Initialization when !CONFIG_SMP
The core initialization and reset vector setup needs to be done
even when booting uniprocessor. Move this code from smp.c to setup.c
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5428/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/netlogic/xlr')
| -rw-r--r-- | arch/mips/netlogic/xlr/setup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c index 89c8c1066632..7e27f8591867 100644 --- a/arch/mips/netlogic/xlr/setup.c +++ b/arch/mips/netlogic/xlr/setup.c @@ -196,6 +196,7 @@ void __init prom_init(void) { int *argv, *envp; /* passed as 32 bit ptrs */ struct psb_info *prom_infop; + void *reset_vec; #ifdef CONFIG_SMP int i; #endif @@ -208,6 +209,11 @@ void __init prom_init(void) nlm_prom_info = *prom_infop; nlm_init_node(); + /* Update reset entry point with CPU init code */ + reset_vec = (void *)CKSEG1ADDR(RESET_VEC_PHYS); + memcpy(reset_vec, (void *)nlm_reset_entry, + (nlm_reset_entry_end - nlm_reset_entry)); + nlm_early_serial_setup(); build_arcs_cmdline(argv); prom_add_memory(); |