diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-05 14:12:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-05 14:12:37 -0400 |
| commit | 1a2728ae4faf12874173de156b8a7e66cfbbeae5 (patch) | |
| tree | 9aba8e6c915b341df8ec6077d8ecb28f1eb32b0b /arch/x86/cpu/baytrail | |
| parent | dcc7dbc73169bb4e39f27c1d95bbf031ccfc1744 (diff) | |
| parent | 12c7510f17ff29190e52336910e43a50c0d620a6 (diff) | |
| download | talos-obmc-uboot-1a2728ae4faf12874173de156b8a7e66cfbbeae5.tar.gz talos-obmc-uboot-1a2728ae4faf12874173de156b8a7e66cfbbeae5.zip | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/baytrail')
| -rw-r--r-- | arch/x86/cpu/baytrail/Kconfig | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/baytrail/cpu.c | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/baytrail/valleyview.c | 10 |
3 files changed, 13 insertions, 1 deletions
diff --git a/arch/x86/cpu/baytrail/Kconfig b/arch/x86/cpu/baytrail/Kconfig index e86cc01115..407feb214b 100644 --- a/arch/x86/cpu/baytrail/Kconfig +++ b/arch/x86/cpu/baytrail/Kconfig @@ -6,4 +6,4 @@ config INTEL_BAYTRAIL bool - select HAVE_FSP + select HAVE_FSP if !EFI diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c index a0117308ae..b1faf8ca32 100644 --- a/arch/x86/cpu/baytrail/cpu.c +++ b/arch/x86/cpu/baytrail/cpu.c @@ -45,6 +45,8 @@ static void set_max_freq(void) static int cpu_x86_baytrail_probe(struct udevice *dev) { + if (!ll_boot_init()) + return 0; debug("Init BayTrail core\n"); /* diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c index 9915da5bd7..610e9d9b1d 100644 --- a/arch/x86/cpu/baytrail/valleyview.c +++ b/arch/x86/cpu/baytrail/valleyview.c @@ -7,6 +7,7 @@ #include <common.h> #include <mmc.h> #include <pci_ids.h> +#include <asm/irq.h> #include <asm/post.h> static struct pci_device_id mmc_supported[] = { @@ -20,6 +21,7 @@ int cpu_mmc_init(bd_t *bis) ARRAY_SIZE(mmc_supported)); } +#ifndef CONFIG_EFI_APP int arch_cpu_init(void) { int ret; @@ -35,3 +37,11 @@ int arch_cpu_init(void) return 0; } + +int arch_misc_init(void) +{ + pirq_init(); + + return 0; +} +#endif |
