diff options
| author | Simon Glass <sjg@chromium.org> | 2015-08-04 18:34:02 (GMT) |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-08-05 14:44:08 (GMT) |
| commit | b4302582f309b49a08c770960a37af6fe1f3afb3 (patch) | |
| tree | 44a890e542d467cd0265abdc163f2b703602f98f | |
| parent | 8e3665087559092ef7fba861e65f633060896ede (diff) | |
| download | u-boot-fsl-qoriq-b4302582f309b49a08c770960a37af6fe1f3afb3.tar.xz | |
x86: baytrail: Support operation as an EFI payload
Disable a few things which interfere with the EFI init. This allows the
Minnowboard MAX to boot into EFI, load a U-Boot payload then boot to the
U-Boot prompt.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| -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 | 2 | ||||
| -rw-r--r-- | board/intel/minnowmax/Kconfig | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/arch/x86/cpu/baytrail/Kconfig b/arch/x86/cpu/baytrail/Kconfig index e86cc01..407feb2 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 a011730..b1faf8c 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 d8d2b8d..610e9d9 100644 --- a/arch/x86/cpu/baytrail/valleyview.c +++ b/arch/x86/cpu/baytrail/valleyview.c @@ -21,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; @@ -43,3 +44,4 @@ int arch_misc_init(void) return 0; } +#endif diff --git a/board/intel/minnowmax/Kconfig b/board/intel/minnowmax/Kconfig index f2a0b71..7e975f9 100644 --- a/board/intel/minnowmax/Kconfig +++ b/board/intel/minnowmax/Kconfig @@ -13,11 +13,12 @@ config SYS_CONFIG_NAME default "minnowmax" config SYS_TEXT_BASE - default 0xfff00000 + default 0xfff00000 if !EFI_STUB + default 0x01110000 if EFI_STUB config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select X86_RESET_VECTOR + select X86_RESET_VECTOR if !EFI_STUB select INTEL_BAYTRAIL select BOARD_ROMSIZE_KB_8192 |