[U-Boot,13/18] x86: baytrail: Drop EFI-specific test logics

Message ID	1528637118-32739-14-git-send-email-bmeng.cn@gmail.com
State	Superseded
Delegated to:	Bin Meng
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Bin Meng <bmeng.cn@gmail.com> To: Simon Glass <sjg@chromium.org>, U-Boot Mailing List <u-boot@lists.denx.de> Date: Sun, 10 Jun 2018 06:25:12 -0700 Message-Id: <1528637118-32739-14-git-send-email-bmeng.cn@gmail.com> In-Reply-To: <1528637118-32739-1-git-send-email-bmeng.cn@gmail.com> References: <1528637118-32739-1-git-send-email-bmeng.cn@gmail.com> Cc: Stefan Roese <sr@denx.de> Subject: [U-Boot] [PATCH 13/18] x86: baytrail: Drop EFI-specific test logics Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	x86: efi: Fixes and enhancements to application and payload support \| expand [U-Boot,00/18] x86: efi: Fixes and enhancements to application and payload support [U-Boot,01/18] x86: doc: Fix reference to EFI doc in U-Boot [U-Boot,02/18] x86: Conditionally build the pinctrl_ich6 driver [U-Boot,03/18] x86: efi: app: Fix broken EFI application [U-Boot,04/18] x86: efi: payload: Enforce toolchain to generate 64-bit EFI payload stub codes [U-Boot,05/18] efi: Fix efi_uintn_t for 64-bit EFI payload [U-Boot,06/18] dm: pci: Make ranges dt property optional [U-Boot,07/18] dm: pci: Use a 1:1 mapping for bus <-> phy addresses [U-Boot,08/18] x86: efi: Refactor the directory of EFI app and payload support [U-Boot,09/18] x86: efi: payload: Add arch_cpu_init() [U-Boot,10/18] x86: efi: payload: Minor clean up on error message output [U-Boot,11/18] x86: Add generic EFI payload support [U-Boot,12/18] x86: Drop QEMU-specific EFI payload support [U-Boot,13/18] x86: baytrail: Drop EFI-specific test logics [U-Boot,14/18] efi: stub: Pass EFI GOP information to U-Boot payload [U-Boot,15/18] dm: video: Add an EFI framebuffer driver [U-Boot,16/18] x86: efi: payload: Add EFI framebuffer driver support [U-Boot,17/18] x86: Rename efi-x86 target to efi-x86_app [U-Boot,18/18] x86: efi: app: Display correct CPU info during boot

Message ID

1528637118-32739-14-git-send-email-bmeng.cn@gmail.com

State

Superseded

Delegated to:

Bin Meng

Headers

From: Bin Meng <bmeng.cn@gmail.com>
To: Simon Glass <sjg@chromium.org>,
	U-Boot Mailing List <u-boot@lists.denx.de>
Date: Sun, 10 Jun 2018 06:25:12 -0700
Message-Id: <1528637118-32739-14-git-send-email-bmeng.cn@gmail.com>
In-Reply-To: <1528637118-32739-1-git-send-email-bmeng.cn@gmail.com>
References: <1528637118-32739-1-git-send-email-bmeng.cn@gmail.com>
Cc: Stefan Roese <sr@denx.de>
Subject: [U-Boot] [PATCH 13/18] x86: baytrail: Drop EFI-specific test logics
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

x86: efi: Fixes and enhancements to application and payload support | expand

Commit Message

Bin Meng June 10, 2018, 1:25 p.m. UTC

Now that we have generic EFI payload support, drop EFI-specific test
logics in BayTrail Kconfig and codes, and all BayTrail boards too.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/cpu/baytrail/Kconfig                  | 6 +++---
 arch/x86/cpu/baytrail/valleyview.c             | 3 ---
 board/advantech/som-db5800-som-6867/Kconfig    | 5 ++---
 board/congatec/conga-qeval20-qa3-e3845/Kconfig | 5 ++---
 board/dfi/dfi-bt700/Kconfig                    | 5 ++---
 board/intel/minnowmax/Kconfig                  | 5 ++---
 6 files changed, 11 insertions(+), 18 deletions(-)

Comments

Simon Glass June 11, 2018, 2:54 p.m. UTC | #1

On 10 June 2018 at 05:25, Bin Meng <bmeng.cn@gmail.com> wrote:
> Now that we have generic EFI payload support, drop EFI-specific test
> logics in BayTrail Kconfig and codes, and all BayTrail boards too.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/cpu/baytrail/Kconfig                  | 6 +++---
>  arch/x86/cpu/baytrail/valleyview.c             | 3 ---
>  board/advantech/som-db5800-som-6867/Kconfig    | 5 ++---
>  board/congatec/conga-qeval20-qa3-e3845/Kconfig | 5 ++---
>  board/dfi/dfi-bt700/Kconfig                    | 5 ++---
>  board/intel/minnowmax/Kconfig                  | 5 ++---
>  6 files changed, 11 insertions(+), 18 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/baytrail/Kconfig b/arch/x86/cpu/baytrail/Kconfig
index 022a9f2..d2c3473 100644
--- a/arch/x86/cpu/baytrail/Kconfig
+++ b/arch/x86/cpu/baytrail/Kconfig
@@ -4,10 +4,10 @@ 
 
 config INTEL_BAYTRAIL
 	bool
-	select HAVE_FSP if !EFI
-	select ARCH_MISC_INIT if !EFI
+	select HAVE_FSP
+	select ARCH_MISC_INIT
 	select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
-	imply HAVE_INTEL_ME if !EFI
+	imply HAVE_INTEL_ME
 	imply ENABLE_MRC_CACHE
 	imply AHCI_PCI
 	imply ICH_SPI
diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
index 3194f8c..b7d481a 100644
--- a/arch/x86/cpu/baytrail/valleyview.c
+++ b/arch/x86/cpu/baytrail/valleyview.c
@@ -17,7 +17,6 @@ 
 #define BYT_TRIG_LVL		BIT(24)
 #define BYT_TRIG_POS		BIT(25)
 
-#ifndef CONFIG_EFI_APP
 int arch_cpu_init(void)
 {
 	post_code(POST_CPU_INIT);
@@ -57,8 +56,6 @@  int arch_misc_init(void)
 	return 0;
 }
 
-#endif
-
 void reset_cpu(ulong addr)
 {
 	/* cold reset */
diff --git a/board/advantech/som-db5800-som-6867/Kconfig b/board/advantech/som-db5800-som-6867/Kconfig
index fac562a..35d58fc 100644
--- a/board/advantech/som-db5800-som-6867/Kconfig
+++ b/board/advantech/som-db5800-som-6867/Kconfig
@@ -13,12 +13,11 @@  config SYS_CONFIG_NAME
 	default "som-db5800-som-6867"
 
 config SYS_TEXT_BASE
-	default 0xfff00000 if !EFI_STUB
-	default 0x01110000 if EFI_STUB
+	default 0xfff00000
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
-	select X86_RESET_VECTOR if !EFI_STUB
+	select X86_RESET_VECTOR
 	select INTEL_BAYTRAIL
 	select BOARD_ROMSIZE_KB_8192
 	select BOARD_EARLY_INIT_F
diff --git a/board/congatec/conga-qeval20-qa3-e3845/Kconfig b/board/congatec/conga-qeval20-qa3-e3845/Kconfig
index 9e44413..6469250 100644
--- a/board/congatec/conga-qeval20-qa3-e3845/Kconfig
+++ b/board/congatec/conga-qeval20-qa3-e3845/Kconfig
@@ -12,12 +12,11 @@  config SYS_CONFIG_NAME
 	default "theadorable-x86-conga-qa3-e3845" if TARGET_THEADORABLE_X86_CONGA_QA3_E3845
 
 config SYS_TEXT_BASE
-	default 0xfff00000 if !EFI_STUB
-	default 0x01110000 if EFI_STUB
+	default 0xfff00000
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
-	select X86_RESET_VECTOR if !EFI_STUB
+	select X86_RESET_VECTOR
 	select INTEL_BAYTRAIL
 	select BOARD_ROMSIZE_KB_8192
 	select BOARD_EARLY_INIT_F
diff --git a/board/dfi/dfi-bt700/Kconfig b/board/dfi/dfi-bt700/Kconfig
index f92f50a..50c7b2a 100644
--- a/board/dfi/dfi-bt700/Kconfig
+++ b/board/dfi/dfi-bt700/Kconfig
@@ -12,12 +12,11 @@  config SYS_CONFIG_NAME
 	default "theadorable-x86-dfi-bt700" if TARGET_THEADORABLE_X86_DFI_BT700
 
 config SYS_TEXT_BASE
-	default 0xfff00000 if !EFI_STUB
-	default 0x01110000 if EFI_STUB
+	default 0xfff00000
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
-	select X86_RESET_VECTOR if !EFI_STUB
+	select X86_RESET_VECTOR
 	select INTEL_BAYTRAIL
 	select BOARD_ROMSIZE_KB_8192
 	select BOARD_EARLY_INIT_F
diff --git a/board/intel/minnowmax/Kconfig b/board/intel/minnowmax/Kconfig
index a8668e4..543468c 100644
--- a/board/intel/minnowmax/Kconfig
+++ b/board/intel/minnowmax/Kconfig
@@ -13,12 +13,11 @@  config SYS_CONFIG_NAME
 	default "minnowmax"
 
 config SYS_TEXT_BASE
-	default 0xfff00000 if !EFI_STUB
-	default 0x01110000 if EFI_STUB
+	default 0xfff00000
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
-	select X86_RESET_VECTOR if !EFI_STUB
+	select X86_RESET_VECTOR
 	select INTEL_BAYTRAIL
 	select BOARD_ROMSIZE_KB_8192
 	select SPI_FLASH_STMICRO

[U-Boot,13/18] x86: baytrail: Drop EFI-specific test logics

Commit Message

Comments

Patch