diff options
author | Jayachandran C <jchandra@broadcom.com> | 2013-06-10 02:41:02 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-06-13 11:46:42 -0400 |
commit | 571886b2a52395f030d439c6259663a033e11e6a (patch) | |
tree | 5e386eaa6465785dc16d3dc2693fe8b23e557f1c /arch/mips/netlogic/xlr/setup.c | |
parent | 9584c55a5cc0db82329dd1142ca570e2d64ea491 (diff) |
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/setup.c')
-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) | |||
196 | { | 196 | { |
197 | int *argv, *envp; /* passed as 32 bit ptrs */ | 197 | int *argv, *envp; /* passed as 32 bit ptrs */ |
198 | struct psb_info *prom_infop; | 198 | struct psb_info *prom_infop; |
199 | void *reset_vec; | ||
199 | #ifdef CONFIG_SMP | 200 | #ifdef CONFIG_SMP |
200 | int i; | 201 | int i; |
201 | #endif | 202 | #endif |
@@ -208,6 +209,11 @@ void __init prom_init(void) | |||
208 | nlm_prom_info = *prom_infop; | 209 | nlm_prom_info = *prom_infop; |
209 | nlm_init_node(); | 210 | nlm_init_node(); |
210 | 211 | ||
212 | /* Update reset entry point with CPU init code */ | ||
213 | reset_vec = (void *)CKSEG1ADDR(RESET_VEC_PHYS); | ||
214 | memcpy(reset_vec, (void *)nlm_reset_entry, | ||
215 | (nlm_reset_entry_end - nlm_reset_entry)); | ||
216 | |||
211 | nlm_early_serial_setup(); | 217 | nlm_early_serial_setup(); |
212 | build_arcs_cmdline(argv); | 218 | build_arcs_cmdline(argv); |
213 | prom_add_memory(); | 219 | prom_add_memory(); |