diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2015-06-17 11:15:37 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-07-14 18:03:16 -0600 |
| commit | 61788e468ebe4a7b8c852ab4e761e084a7975a93 (patch) | |
| tree | 8dc86502e078aca895962820d8fe62b6b82f8f71 | |
| parent | 6e6f4ce4f82501e35301322872152fe28846d743 (diff) | |
| download | u-boot-imx-61788e468ebe4a7b8c852ab4e761e084a7975a93.zip u-boot-imx-61788e468ebe4a7b8c852ab4e761e084a7975a93.tar.gz u-boot-imx-61788e468ebe4a7b8c852ab4e761e084a7975a93.tar.bz2 | |
x86: Move lapic_setup() call into init_bsp()
Currently lapic_setup() is called before calling mp_init(), which
then calls init_bsp() where it calls enable_lapic(), which was
already enabled in lapic_setup(). Hence move lapic_setup() call
into init_bsp() to avoid the duplication.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/x86/cpu/cpu.c | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/mp_init.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index a6e88cf..d108ee5 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -640,8 +640,6 @@ static int x86_mp_init(void) { struct mp_params mp_params; - lapic_setup(); - mp_params.parallel_microcode_load = 0, mp_params.flight_plan = &mp_steps[0]; mp_params.num_records = ARRAY_SIZE(mp_steps); diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index 5564d84..e8bc9b6 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -418,7 +418,7 @@ static int init_bsp(struct udevice **devp) cpu_get_name(processor_name); debug("CPU: %s.\n", processor_name); - enable_lapic(); + lapic_setup(); apic_id = lapicid(); ret = find_cpu_by_apid_id(apic_id, devp); |