diff options
| author | Simon Glass | 2020-04-26 09:12:55 -0600 |
|---|---|---|
| committer | Bin Meng | 2020-04-30 17:40:16 +0800 |
| commit | 526aabec2496834450f9dab06e4f62bdc0696d33 (patch) | |
| tree | 6eb8b75543577367bd753b10f2aac6b48c11286e /arch/x86/cpu/cpu.c | |
| parent | 52b9beb5276def9e261ded543e9f4ff9940a064e (diff) | |
x86: cpu: Skip init code when chain loading
When U-Boot is not the first-stage bootloader the interrupt and cache init
must be skipped, as well as init for various peripherals. Update the code
to add checks for this.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch/x86/cpu/cpu.c')
| -rw-r--r-- | arch/x86/cpu/cpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index cec04b481b9..8526e856d7d 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -239,8 +239,10 @@ int cpu_init_r(void) struct udevice *dev; int ret; - if (!ll_boot_init()) + if (!ll_boot_init()) { + uclass_first_device(UCLASS_PCI, &dev); return 0; + } ret = x86_init_cpus(); if (ret) |