From patchwork Fri Jul 31 15:32:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 502654 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 8B0291402B1 for ; Sat, 1 Aug 2015 01:37:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=QynkbSMY; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 920334BB80; Fri, 31 Jul 2015 17:35:48 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NZmztgBDFlob; Fri, 31 Jul 2015 17:35:48 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 542174BB82; Fri, 31 Jul 2015 17:34:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 07F204BAA1 for ; Fri, 31 Jul 2015 17:32:57 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f2W3edn94r1W for ; Fri, 31 Jul 2015 17:32:56 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-io0-f175.google.com (mail-io0-f175.google.com [209.85.223.175]) by theia.denx.de (Postfix) with ESMTPS id 095324BA97 for ; Fri, 31 Jul 2015 17:32:38 +0200 (CEST) Received: by ioea135 with SMTP id a135so88874356ioe.1 for ; Fri, 31 Jul 2015 08:32:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=OM0ry26Ymev/fDw++tuPmKYt92PglQHc0PlHS2yoRvE=; b=QynkbSMY+SvuEpeLpmI0HoryfXfM63svlE7Pn8x/TlSuYuKLwwMx3seHEjKLCIgm6N is8P4Sus08cmLMoVSMqvAQtNi+CPtvgT2sXWF8h+gBmYmSRITO5Oiqgg/ns990hFK7Bq 889/5Mul4pCZTmOu3A2JhDWOxcTEVQaRr7o6QtN+JyTzTQ6e3cBGVBNkFTsnzFvVhztd z0fTXF2ktKGgejXcRpnPHn0aM74yU4G9z4KRdSKv5uASD5evxurFI5p2Zdezu5QveLbc TyZ258n4hreoepbCmxqi0NnXg+sEChIXHAE4ESofSVIPqkm5JldbkrtNZFj0aV3tF0xG e5IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=OM0ry26Ymev/fDw++tuPmKYt92PglQHc0PlHS2yoRvE=; b=NH+Cb1GZ8owHaz3T2fTXFriFWtYeHF8PgbrHu5pupflo1lUANp4LetDJq+saBjCJxU TV92G3QPDmOm2TUODcG3R0AesXuWm/7Mu4GAwx5OwPKfcQXPtW9fyefiRLF+9T6yZsH6 AkLrEH5aCsB8uUcggRIoSeKiIiRwk1urx4UXqIchaK3bWPe4l9sdehhzyu7Jg4FKtu0c HIZiz/N9EeiOkEfANJAQ88jlBNp+lzMy6uahp9ZMs3ui/0r8mg7tZaVuNz7xcqDADS8Z ryUH+XFHW4e/b3/B86rpXfRGqaESvroqCBiNKyXfWAhtuLxQnL10/2gj6PybO98oXBhe a85Q== X-Gm-Message-State: ALoCoQnc+XNUS9oOu5W2ia9SBqyszeozD5rkN3RVJXJTOKtAXOMENJ8l74kKU60FzGai/9E5g7l8 X-Received: by 10.107.158.20 with SMTP id h20mr5875529ioe.187.1438356757829; Fri, 31 Jul 2015 08:32:37 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id q12sm4072131igr.2.2015.07.31.08.32.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 08:32:32 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 676EF222228; Fri, 31 Jul 2015 09:32:26 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Fri, 31 Jul 2015 09:32:01 -0600 Message-Id: <1438356724-6561-45-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.5.0.rc2.392.g76e840b In-Reply-To: <1438356724-6561-1-git-send-email-sjg@chromium.org> References: <1438356724-6561-1-git-send-email-sjg@chromium.org> Cc: Graeme Russ Subject: [U-Boot] [PATCH v2 44/47] x86: baytrail: Support operation as an EFI payload X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Reviewed-by: Bin Meng --- Changes in v2: - Fix indenting in board/intel/minnowmax/Kconfig - Rename CONFIG_ARCH_EFI to CONFIG_EFI_APP arch/x86/cpu/baytrail/Kconfig | 2 +- arch/x86/cpu/baytrail/cpu.c | 2 ++ arch/x86/cpu/baytrail/valleyview.c | 2 ++ 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 9915da5..e0652ba 100644 --- a/arch/x86/cpu/baytrail/valleyview.c +++ b/arch/x86/cpu/baytrail/valleyview.c @@ -20,6 +20,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 +36,4 @@ int arch_cpu_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