From patchwork Sun Aug 18 22:51:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1148915 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="g62MP7Fr"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46BXNx1MTtz9sN4 for ; Mon, 19 Aug 2019 08:51:44 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DEF39C21DA1; Sun, 18 Aug 2019 22:51:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3D27FC21DFB; Sun, 18 Aug 2019 22:51:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 503B8C21C3F; Sun, 18 Aug 2019 22:51:24 +0000 (UTC) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by lists.denx.de (Postfix) with ESMTPS id A2FFFC21BE5 for ; Sun, 18 Aug 2019 22:51:23 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id q22so5604iog.4 for ; Sun, 18 Aug 2019 15:51:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9kI5TO961HNdFjG97P9zypgN11eERGFXfAQqD49ZO+w=; b=g62MP7FrAV/fjkwRWgUvuCNhAXZ2koBOizt+alUMFpmRw2cas3RxzC88N0ZMHXN5hp hh5iocgsd3fh8r9NJlBUP3+Pe2kPP6l6fJKtK8AcDdChyU1r3rXkZnUaXXWbF1a1HeFg 5D8rIwxOGi18bkki2oEz886vrik98tKqWugN8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9kI5TO961HNdFjG97P9zypgN11eERGFXfAQqD49ZO+w=; b=bqi7Db6/A0+Cy+NzIoNsSmtEdT2O6aeHs8UKERHlyz0u23XdlqdE2w3+pn4laQ8nB+ lVtvTOqk+Ndr0qsZxKAqz678+Ikgc5zv55dUfsnD5zlJKSLH/fqqkEIxbok5AZ3wmv+d EuN50UdiJPCaDSeEXa8vxv9Lw5iEbtOansa4fCAECkCTI2aiZmG/MQ81sNyKRxK4gCzC 5cl9VYFLJgGk7PATUVai+Iwv3aztVsJMR6/DhxMuupobI9nBQIrqFcdZCL42F/mFoZNn 2epgOxG2UU+VPS57x4oveTNGHbvta1XXwbWMEgH1KvFBBCVw5OR5/NZFcAlxoJHOPdpJ 9hew== X-Gm-Message-State: APjAAAXqvntNkdZ/8VELXnykZ556hDRoJUcmiIRGpH5ptqwbSZH225ZV CRvM4/BvbwcDm5b3ZFWKkK65N85uy+E= X-Google-Smtp-Source: APXvYqyjDP2GXsAGLBoS9DOggaurGRVk20gO6knrjyqvjHMBa06EzesifGIQ3WWrMVR5LM1BcpiFxQ== X-Received: by 2002:a02:a18e:: with SMTP id n14mr24541220jah.84.1566168682277; Sun, 18 Aug 2019 15:51:22 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m20sm11754504ioh.4.2019.08.18.15.51.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 15:51:21 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Aug 2019 16:51:08 -0600 Message-Id: <20190818225117.142845-2-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190818225117.142845-1-sjg@chromium.org> References: <20190818225117.142845-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 01/10] x86: Rename existing FSP code to fsp1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Since there is now a new version of the FSP and it is incompatible with the existing version, move the code into an fsp1 directory. This will allow us to put FSP v2 code into an fsp2 directory. Add a Kconfig which defines which version is in use. Some of the code in this new fsp1/ directory is generic across both FSPv1 and FSPv2. Future patches will address this. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/Kconfig | 25 ++++++++++++++++++- arch/x86/cpu/baytrail/acpi.c | 2 +- arch/x86/cpu/baytrail/fsp_configs.c | 2 +- arch/x86/cpu/braswell/fsp_configs.c | 2 +- arch/x86/cpu/ivybridge/fsp_configs.c | 2 +- arch/x86/cpu/queensbay/fsp_configs.c | 2 +- arch/x86/cpu/queensbay/tnc.c | 2 +- arch/x86/include/asm/{fsp => fsp1}/fsp_api.h | 0 .../include/asm/{fsp => fsp1}/fsp_azalia.h | 0 .../include/asm/{fsp => fsp1}/fsp_bootmode.h | 0 arch/x86/include/asm/{fsp => fsp1}/fsp_ffs.h | 0 arch/x86/include/asm/{fsp => fsp1}/fsp_fv.h | 0 arch/x86/include/asm/{fsp => fsp1}/fsp_hob.h | 0 .../asm/{fsp => fsp1}/fsp_infoheader.h | 0 .../include/asm/{fsp => fsp1}/fsp_support.h | 0 .../x86/include/asm/{fsp => fsp1}/fsp_types.h | 0 arch/x86/include/asm/u-boot-x86.h | 2 +- arch/x86/lib/Makefile | 3 ++- arch/x86/lib/{fsp => fsp1}/Makefile | 0 arch/x86/lib/{fsp => fsp1}/fsp_car.S | 0 arch/x86/lib/{fsp => fsp1}/fsp_common.c | 2 +- arch/x86/lib/{fsp => fsp1}/fsp_dram.c | 2 +- arch/x86/lib/{fsp => fsp1}/fsp_graphics.c | 2 +- arch/x86/lib/{fsp => fsp1}/fsp_support.c | 2 +- .../som-db5800-som-6867/som-db5800-som-6867.c | 2 +- board/intel/cherryhill/cherryhill.c | 2 +- cmd/x86/fsp.c | 2 +- drivers/pci/pci-uclass.c | 2 +- 28 files changed, 41 insertions(+), 17 deletions(-) rename arch/x86/include/asm/{fsp => fsp1}/fsp_api.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_azalia.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_bootmode.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_ffs.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_fv.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_hob.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_infoheader.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_support.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_types.h (100%) rename arch/x86/lib/{fsp => fsp1}/Makefile (100%) rename arch/x86/lib/{fsp => fsp1}/fsp_car.S (100%) rename arch/x86/lib/{fsp => fsp1}/fsp_common.c (99%) rename arch/x86/lib/{fsp => fsp1}/fsp_dram.c (98%) rename arch/x86/lib/{fsp => fsp1}/fsp_graphics.c (98%) rename arch/x86/lib/{fsp => fsp1}/fsp_support.c (99%) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 218e817cf3..04e8a1a4e0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -364,6 +364,29 @@ config HAVE_FSP Note: Without this binary U-Boot will not be able to set up its SDRAM so will not boot. +choice + prompt "FSP version" + depends on HAVE_FSP + default FSP_VERSION1 + help + Selects the FSP version to use. Intel has published several versions + of the FSP External Architecture Specification and this allows + selection of the version number used by a particular SoC. + +config FSP_VERSION1 + bool "FSP version 1.x" + help + This covers versions 1.0 and 1.1a. See here for details: + https://github.com/IntelFsp/fsp1/wiki + +config FSP_VERSION2 + bool "FSP version 2.x" + help + This covers versions 2.0 and 2.1. See here for details: + https://github.com/IntelFsp/fsp1/wiki + +endchoice + config FSP_FILE string "Firmware Support Package binary filename" depends on HAVE_FSP @@ -429,7 +452,7 @@ config ENABLE_MRC_CACHE For platforms that use Intel FSP for the memory initialization, please check FSP output HOB via U-Boot command 'fsp hob' to see - if there is FSP_NON_VOLATILE_STORAGE_HOB_GUID (asm/fsp/fsp_hob.h). + if there is FSP_NON_VOLATILE_STORAGE_HOB_GUID (asm/fsp1/fsp_hob.h). If such GUID does not exist, MRC cache is not available on such platform (eg: Intel Queensbay), which means selecting this option here does not make any difference. diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c index 445e4ba2d7..1e3829a433 100644 --- a/arch/x86/cpu/baytrail/acpi.c +++ b/arch/x86/cpu/baytrail/acpi.c @@ -167,7 +167,7 @@ void acpi_create_gnvs(struct acpi_global_nvs *gnvs) * and PMC_BASE_ADDRESS are accessed, so we need make sure the base addresses * of these two blocks are programmed by either U-Boot or FSP. * - * It has been verified that 1st phase API (see arch/x86/lib/fsp/fsp_car.S) + * It has been verified that 1st phase API (see arch/x86/lib/fsp1/fsp_car.S) * on Intel BayTrail SoC already initializes these two base addresses so * we are safe to access these registers here. */ diff --git a/arch/x86/cpu/baytrail/fsp_configs.c b/arch/x86/cpu/baytrail/fsp_configs.c index cefd26299a..5b5d66aa5e 100644 --- a/arch/x86/cpu/baytrail/fsp_configs.c +++ b/arch/x86/cpu/baytrail/fsp_configs.c @@ -7,7 +7,7 @@ #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c index 7fe6fa7995..607e333f21 100644 --- a/arch/x86/cpu/braswell/fsp_configs.c +++ b/arch/x86/cpu/braswell/fsp_configs.c @@ -5,7 +5,7 @@ #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/ivybridge/fsp_configs.c b/arch/x86/cpu/ivybridge/fsp_configs.c index 2fd06b3bed..773c2b2a0a 100644 --- a/arch/x86/cpu/ivybridge/fsp_configs.c +++ b/arch/x86/cpu/ivybridge/fsp_configs.c @@ -5,7 +5,7 @@ #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/queensbay/fsp_configs.c b/arch/x86/cpu/queensbay/fsp_configs.c index c4d117783c..0dd1901e07 100644 --- a/arch/x86/cpu/queensbay/fsp_configs.c +++ b/arch/x86/cpu/queensbay/fsp_configs.c @@ -5,7 +5,7 @@ */ #include -#include +#include void update_fsp_configs(struct fsp_config_data *config, struct fspinit_rtbuf *rt_buf) diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c index 76556fc7f7..66737e655b 100644 --- a/arch/x86/cpu/queensbay/tnc.c +++ b/arch/x86/cpu/queensbay/tnc.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include static int __maybe_unused disable_igd(void) diff --git a/arch/x86/include/asm/fsp/fsp_api.h b/arch/x86/include/asm/fsp1/fsp_api.h similarity index 100% rename from arch/x86/include/asm/fsp/fsp_api.h rename to arch/x86/include/asm/fsp1/fsp_api.h diff --git a/arch/x86/include/asm/fsp/fsp_azalia.h b/arch/x86/include/asm/fsp1/fsp_azalia.h similarity index 100% rename from arch/x86/include/asm/fsp/fsp_azalia.h rename to arch/x86/include/asm/fsp1/fsp_azalia.h diff --git a/arch/x86/include/asm/fsp/fsp_bootmode.h b/arch/x86/include/asm/fsp1/fsp_bootmode.h similarity index 100% rename from arch/x86/include/asm/fsp/fsp_bootmode.h rename to arch/x86/include/asm/fsp1/fsp_bootmode.h diff --git a/arch/x86/include/asm/fsp/fsp_ffs.h b/arch/x86/include/asm/fsp1/fsp_ffs.h similarity index 100% rename from arch/x86/include/asm/fsp/fsp_ffs.h rename to arch/x86/include/asm/fsp1/fsp_ffs.h diff --git a/arch/x86/include/asm/fsp/fsp_fv.h b/arch/x86/include/asm/fsp1/fsp_fv.h similarity index 100% rename from arch/x86/include/asm/fsp/fsp_fv.h rename to arch/x86/include/asm/fsp1/fsp_fv.h diff --git a/arch/x86/include/asm/fsp/fsp_hob.h b/arch/x86/include/asm/fsp1/fsp_hob.h similarity index 100% rename from arch/x86/include/asm/fsp/fsp_hob.h rename to arch/x86/include/asm/fsp1/fsp_hob.h diff --git a/arch/x86/include/asm/fsp/fsp_infoheader.h b/arch/x86/include/asm/fsp1/fsp_infoheader.h similarity index 100% rename from arch/x86/include/asm/fsp/fsp_infoheader.h rename to arch/x86/include/asm/fsp1/fsp_infoheader.h diff --git a/arch/x86/include/asm/fsp/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h similarity index 100% rename from arch/x86/include/asm/fsp/fsp_support.h rename to arch/x86/include/asm/fsp1/fsp_support.h diff --git a/arch/x86/include/asm/fsp/fsp_types.h b/arch/x86/include/asm/fsp1/fsp_types.h similarity index 100% rename from arch/x86/include/asm/fsp/fsp_types.h rename to arch/x86/include/asm/fsp1/fsp_types.h diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index c252192bf4..2466ad2ad3 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -74,7 +74,7 @@ u32 isa_map_rom(u32 bus_addr, int size); /* arch/x86/lib/... */ int video_bios_init(void); -/* arch/x86/lib/fsp/... */ +/* arch/x86/lib/fsp1,2/... */ /** * fsp_save_s3_stack() - save stack address to CMOS for next S3 boot diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 906be5eab9..a8c7448ee4 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -43,7 +43,8 @@ ifndef CONFIG_SPL_BUILD obj-$(CONFIG_CMD_ZBOOT) += zimage.o endif obj-$(CONFIG_USE_HOB) += hob.o -obj-$(CONFIG_HAVE_FSP) += fsp/ +obj-$(CONFIG_FSP_VERSION1) += fsp1/ +obj-$(CONFIG_FSP_VERSION2) += fsp2/ ifdef CONFIG_SPL_BUILD ifdef CONFIG_TPL_BUILD diff --git a/arch/x86/lib/fsp/Makefile b/arch/x86/lib/fsp1/Makefile similarity index 100% rename from arch/x86/lib/fsp/Makefile rename to arch/x86/lib/fsp1/Makefile diff --git a/arch/x86/lib/fsp/fsp_car.S b/arch/x86/lib/fsp1/fsp_car.S similarity index 100% rename from arch/x86/lib/fsp/fsp_car.S rename to arch/x86/lib/fsp1/fsp_car.S diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c similarity index 99% rename from arch/x86/lib/fsp/fsp_common.c rename to arch/x86/lib/fsp1/fsp_common.c index ed0827c6e9..591eef7b81 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp1/fsp_common.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c similarity index 98% rename from arch/x86/lib/fsp/fsp_dram.c rename to arch/x86/lib/fsp1/fsp_dram.c index 3a23b70410..3bf65b495c 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp1/fsp_dram.c @@ -4,7 +4,7 @@ */ #include -#include +#include #include #include #include diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp1/fsp_graphics.c similarity index 98% rename from arch/x86/lib/fsp/fsp_graphics.c rename to arch/x86/lib/fsp1/fsp_graphics.c index 91d2d08557..52e71334f9 100644 --- a/arch/x86/lib/fsp/fsp_graphics.c +++ b/arch/x86/lib/fsp1/fsp_graphics.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/lib/fsp/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c similarity index 99% rename from arch/x86/lib/fsp/fsp_support.c rename to arch/x86/lib/fsp1/fsp_support.c index 0eaa9b232b..019a42f53f 100644 --- a/arch/x86/lib/fsp/fsp_support.c +++ b/arch/x86/lib/fsp1/fsp_support.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include struct fsp_header *__attribute__((optimize("O0"))) find_fsp_header(void) diff --git a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c index ac12f303a3..8f4c587371 100644 --- a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c +++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c @@ -5,7 +5,7 @@ */ #include -#include +#include /* ALC262 Verb Table - 10EC0262 */ static const u32 verb_table_data13[] = { diff --git a/board/intel/cherryhill/cherryhill.c b/board/intel/cherryhill/cherryhill.c index 695af6bb7e..c037d5b14c 100644 --- a/board/intel/cherryhill/cherryhill.c +++ b/board/intel/cherryhill/cherryhill.c @@ -5,7 +5,7 @@ #include #include -#include +#include static const struct gpio_family gpio_family[] = { GPIO_FAMILY_CONF("SOUTHEAST_2_hshvfamily_2x3_rcomp_7_0", NA, 0, diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c index efa183854b..fb27624422 100644 --- a/cmd/x86/fsp.c +++ b/cmd/x86/fsp.c @@ -5,7 +5,7 @@ #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index ab3e1310eb..b73d0cd70a 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -12,7 +12,7 @@ #include #include #if defined(CONFIG_X86) && defined(CONFIG_HAVE_FSP) -#include +#include #endif #include "pci_internal.h" From patchwork Sun Aug 18 22:51:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1148917 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="CX5I68Xc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46BXPf2K3Zz9s3Z for ; Mon, 19 Aug 2019 08:52:22 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DFF5BC21D56; Sun, 18 Aug 2019 22:52:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C2E34C21DA6; Sun, 18 Aug 2019 22:51:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EFBADC21E07; Sun, 18 Aug 2019 22:51:28 +0000 (UTC) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by lists.denx.de (Postfix) with ESMTPS id 45A5CC21D65 for ; Sun, 18 Aug 2019 22:51:25 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id i22so16359ioh.2 for ; Sun, 18 Aug 2019 15:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gT4SG1Q06lFZM/IbadX7brVYfJR+XznP5N7/t0Lt6gA=; b=CX5I68XcNtINFrBExFAa2KeFFkC6ICvYm5IX2y/7NKAaohAo5xoZ/82LuyOxQQZsLo Zqb4w6ATa5zrZXV3nKG3kqSfx1QuOrSHhAxxuSrpDVU98YDiUza6YrffSUG07t9BUN8n T4aExC/XQLgImaRPQsv8ePSKht46qwPDcidkw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gT4SG1Q06lFZM/IbadX7brVYfJR+XznP5N7/t0Lt6gA=; b=L9SuiW/UHzXpHNCwMuyLbFPaJKvXoFd3S5pCrfro3T2P1EGK/hH/mrY7NvVOBgUNI8 CBAwPfdUFj8q2PaND9UeDOWah7IMOMOWaqzOhXGycdnm9XrKwIe4qEWkq2MKddVkMM4A 4HN042x82OOiwqDpskKjfZ91R5CPdCb0luLhNxROQNSgC5LQLO3FXiRo1u6iVdnscyLs 2+0TpcHvF2+EKCK5beKagBxRyHEOr34rVKjWWtgZ26glVkKsQdBEWix/G5iV3DFHxdVG nXD2zkK7FRtSizbyQEnP9T/y0tCjVciCBUAb79RgsC5PVcXIhA0yLVKSldlrtf506z+l y4ig== X-Gm-Message-State: APjAAAUPwCIkbi5J8mbgbAlwzftsdQJTrdC7XrQtfzld9hm0RpSeT7Aw z0vmMVfrwrcqKAcUQduc64w6m2wv124= X-Google-Smtp-Source: APXvYqxiCF+udhkMfEfb67iwoRLJ2hLcl7jJ1QEcqLywCuK82y7REghsf/oj8Pq9bwZgzK3yAbWU+Q== X-Received: by 2002:a02:cc58:: with SMTP id i24mr24014518jaq.37.1566168684077; Sun, 18 Aug 2019 15:51:24 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m20sm11754504ioh.4.2019.08.18.15.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 15:51:23 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Aug 2019 16:51:09 -0600 Message-Id: <20190818225117.142845-3-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190818225117.142845-1-sjg@chromium.org> References: <20190818225117.142845-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 02/10] x86: fsp: Move fsp_azalia include out of fsp_support.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This file is only used by one board and we don't need the types for most FSP files so it is wasteful to include it so widely. Drop it from this header. Signed-off-by: Simon Glass --- arch/x86/cpu/braswell/fsp_configs.c | 1 + arch/x86/include/asm/fsp1/fsp_support.h | 4 +++- board/advantech/som-db5800-som-6867/som-db5800-som-6867.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c index 607e333f21..6f217ce7d6 100644 --- a/arch/x86/cpu/braswell/fsp_configs.c +++ b/arch/x86/cpu/braswell/fsp_configs.c @@ -5,6 +5,7 @@ #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h index 7b92392a27..72fbcbc393 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -14,7 +14,6 @@ #include "fsp_api.h" #include "fsp_infoheader.h" #include "fsp_bootmode.h" -#include "fsp_azalia.h" #include #include @@ -22,6 +21,9 @@ #define FSP_HIGHMEM_BASE 0x100000000ULL #define UPD_TERMINATOR 0x55AA +struct efi_guid; +struct fspinit_rtbuf; +struct fsp_config_data; /** * FSP Continuation assembly helper routine diff --git a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c index 8f4c587371..212f77fd62 100644 --- a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c +++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c @@ -5,6 +5,7 @@ */ #include +#include #include /* ALC262 Verb Table - 10EC0262 */ From patchwork Sun Aug 18 22:51:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1148927 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Bdbq2/du"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46BXTx2LkMz9s3Z for ; Mon, 19 Aug 2019 08:56:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 04A44C21DEC; Sun, 18 Aug 2019 22:52:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 01B07C21E1A; Sun, 18 Aug 2019 22:52:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B7D9FC21C51; Sun, 18 Aug 2019 22:51:30 +0000 (UTC) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by lists.denx.de (Postfix) with ESMTPS id 0D196C21DED for ; Sun, 18 Aug 2019 22:51:27 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id t6so16871578ios.7 for ; Sun, 18 Aug 2019 15:51:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0wnNbXOM10b/IMyYTOKFUDK4FKJv+OIDfYKcj6qXWm8=; b=Bdbq2/du8Kko7SKoLPOQhOEs+tB3oYQJRcLPB8ocCyMKUZxAkbyB3M/pecleAEYRvM fY67NjQi+lOUBQlfyzWt7L4wSrcap1/9FQG9ESm7aqYO19jyZSYGMbJapdCIVZSA35ah W8OHV7aAMHErSb4i1/Q8xw90ydmwdYBxL1Dhk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0wnNbXOM10b/IMyYTOKFUDK4FKJv+OIDfYKcj6qXWm8=; b=Xifc0vs1WAiVdPBbEfpBTWH6ujKc+zC4wnFP/9agX5Yanys1Ydi18nGF5wtv5m3WTC Fww8mlE1JLRcHi+llyu8Av+CBAWZ2aWkwMmMVaXmqCuEv7PFUZzoUngauGqA1WU3xlDr ePfhXS/I9QzRPf1HOG8eqqotXbKFTH2toNbHpX9Xhg0rrCMFKg5awnQL5t+cve7t6Ebr mrlgfLPenb3TxA7AIkHFXBceq7+lb/FspWAvJUjSejMvAoCuz7KEvyDNVHGOAYzS6I+q lt+QAzSrUokd6HQLciXeDZrqPHwak9seB1IR0t+QYRUciksTHwiTGDS4dDMs68oMX/vy QVfg== X-Gm-Message-State: APjAAAUyxfiYWnzLOOX95hjvZDKemDPfp7kdU8yT2nCEbJ097lvAFOFY xaqeEeWNXWx8n2zKO+cl4LkPry/zoZw= X-Google-Smtp-Source: APXvYqwQ2sbIK9OS7GV6GdckOVXpn0GNOKaoGvMePH/WrS/m6ykyDy6mUU+JEdNEr+6vfTeN9SJ93A== X-Received: by 2002:a6b:c581:: with SMTP id v123mr5996191iof.158.1566168685748; Sun, 18 Aug 2019 15:51:25 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m20sm11754504ioh.4.2019.08.18.15.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 15:51:25 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Aug 2019 16:51:10 -0600 Message-Id: <20190818225117.142845-4-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190818225117.142845-1-sjg@chromium.org> References: <20190818225117.142845-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 03/10] x86: Create a new fsp_arch.h header X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" At present fsp_support.h includes fsp_vpd.h which is an FPSv1 concept (VPD means Vital Product Data). For FSPv2 only UPD (Updatable Product Data) is used. To avoid mangling header files, put these two includes in a separate header which we can adjust as necessary for FSPv2. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/fsp1/fsp_support.h | 3 +-- arch/x86/include/asm/fsp_arch.h | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 arch/x86/include/asm/fsp_arch.h diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h index 72fbcbc393..423b523e60 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -14,8 +14,7 @@ #include "fsp_api.h" #include "fsp_infoheader.h" #include "fsp_bootmode.h" -#include -#include +#include #define FSP_LOWMEM_BASE 0x100000UL #define FSP_HIGHMEM_BASE 0x100000000ULL diff --git a/arch/x86/include/asm/fsp_arch.h b/arch/x86/include/asm/fsp_arch.h new file mode 100644 index 0000000000..fb7f9109f7 --- /dev/null +++ b/arch/x86/include/asm/fsp_arch.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2019 Google LLC + * Written by Simon Glass + * + * Architecture-specific definitions (FSP config and VPD/UPD) + */ + +#ifndef __FSP_ARCH_H__ +#define __FSP_ARCH_H__ + +/* + * Note: use #ifndef __ASSEMBLY__ around any struct definitions or other C code + * since this file can be included from assembly. + */ + +#include +#include + +#endif From patchwork Sun Aug 18 22:51:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1148919 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ggb2qZDr"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46BXRC6Hh2z9s3Z for ; Mon, 19 Aug 2019 08:53:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 85DB3C21C51; Sun, 18 Aug 2019 22:52:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5F945C21E07; Sun, 18 Aug 2019 22:51:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5266DC21D83; Sun, 18 Aug 2019 22:51:31 +0000 (UTC) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by lists.denx.de (Postfix) with ESMTPS id 80734C21E0F for ; Sun, 18 Aug 2019 22:51:28 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id l7so16859244ioj.6 for ; Sun, 18 Aug 2019 15:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CkeajOoq5ihs7r+wcRVda0m9PBOQ3LhwjflXBPTiHog=; b=ggb2qZDr2SXv9srh2x1zh3UyWAKsyRl0Zov4ob0bNpymXLYI8XEAxc5RS1bbQGLa4A zTLxJKd+bQaTbC0Fh1j6A2y9Uu1FLAQ700rakfgkXlGLgkYjXlw8GUKRxCGXLsvIRjyh uLCQIQul/dqJWCq7hphp621s17LrKxa3165ng= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CkeajOoq5ihs7r+wcRVda0m9PBOQ3LhwjflXBPTiHog=; b=i2xoyx1dZ54wIqU5JJmGSuUNUyWA5Jv0GJdcd3B/mbEFLBM2j+d8k2M4kRUEj8uHS6 edLn4W6DjMptKx1at4O3WZVySW7RaWSnQamctt+uB+hKUqNvOf7AZ1hUZF8kK+kFHbz7 t+z0cLpTYS8QIzbJsb31ttzSYFU///ba4lZ5Wsx34h15rG5mQcTF0c3g4Mm87MzjH2ID xpjlTnclYG2JhfG8XfkAIIk6d0EL6qkEZ2Kr4oqkq3LbqQgPH0e9su6H3un20DVT9Vbj PrqxQw2l89odRk2FoeB026Wn8bYFoEEq2xLT9YRuXFwWZi09ae3osqBg02E3/QjlCkwS 7B0Q== X-Gm-Message-State: APjAAAWR88por0eGxJ1300h45hxJ4QcDYiWp/KcE1H/Pzp4g0Zj9dZXe Mospioq5y+XLczI3uylxyzBOzwvnUPo= X-Google-Smtp-Source: APXvYqxx6ZFP/gcsLKvzHg0eCMFqqQYpzv75jHPBGge+D66JcolMNw9niM0irHh28QKdHlBR1NHyaA== X-Received: by 2002:a05:6638:303:: with SMTP id w3mr15128685jap.103.1566168687366; Sun, 18 Aug 2019 15:51:27 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m20sm11754504ioh.4.2019.08.18.15.51.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 15:51:26 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Aug 2019 16:51:11 -0600 Message-Id: <20190818225117.142845-5-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190818225117.142845-1-sjg@chromium.org> References: <20190818225117.142845-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 04/10] x86: Move fsp_api.h inclusion out of fsp_support.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This header file is different for each version of FSP. Move it into the fsp_arch.h header file. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/fsp1/fsp_support.h | 1 - arch/x86/include/asm/fsp_arch.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h index 423b523e60..9a7c002bfc 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -11,7 +11,6 @@ #include "fsp_hob.h" #include "fsp_fv.h" #include "fsp_ffs.h" -#include "fsp_api.h" #include "fsp_infoheader.h" #include "fsp_bootmode.h" #include diff --git a/arch/x86/include/asm/fsp_arch.h b/arch/x86/include/asm/fsp_arch.h index fb7f9109f7..b223141c44 100644 --- a/arch/x86/include/asm/fsp_arch.h +++ b/arch/x86/include/asm/fsp_arch.h @@ -14,6 +14,7 @@ * since this file can be included from assembly. */ +#include #include #include From patchwork Sun Aug 18 22:51:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1148921 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="fKhQ/Ls1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46BXRq6PTxz9s3Z for ; Mon, 19 Aug 2019 08:54:15 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 908F3C21E18; Sun, 18 Aug 2019 22:52:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 72268C21E02; Sun, 18 Aug 2019 22:51:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 624D7C21E1D; Sun, 18 Aug 2019 22:51:32 +0000 (UTC) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by lists.denx.de (Postfix) with ESMTPS id 338EAC21DE8 for ; Sun, 18 Aug 2019 22:51:30 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id q22so5962iog.4 for ; Sun, 18 Aug 2019 15:51:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QiSP2iFh0ke63zLWG0Hf921yo7P1nJHSJ8wGFaL9rUI=; b=fKhQ/Ls1UCUDiMkFVgJjv5U1vLSCvzk03W/m+nhnnwIKjJPEpdaAJXHCjERSgN0lic psVI0HPfyodovP3HpT3ysoKce0aL7L7gwk661k5JK16ewYNMoA1rEqiOWNZDPbcEScTH GagYVw2ej5CAqIw9smlIMCQP6t+9eweKvqhVs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QiSP2iFh0ke63zLWG0Hf921yo7P1nJHSJ8wGFaL9rUI=; b=ayys1+VnZ9FaC2VTq3SwE9Gp+/51HUsWNym+u/er6XIEZG6bKg2LbDys7933t3YfKV jAGU4E9Jkbhmijl4jsD79xC7Hvf/Ty/3cIaJwZgrRvKaNIuj5WW6SLtV2giy52vwpNtS n27mdnafL/LWsizqMKZtf/92GJcZi+7ba/nO3i76S3jlZ/1XSW5tFNDr0Xb2OKbzjtHj xX+u5M2aMjLDs+B2JomSpzdxO0vqyLNCKo+L0pzbW71a2+yPMloqTpeTqTSgBeNTIbWU wkFgTPtwMcDE0qiw27uNBt7mczsyQwIfarPGCvNFJUjpmunw5YHKfVoN3Un+WKAR4Jt2 72XA== X-Gm-Message-State: APjAAAWspsAv89VZ/70usQ6Zw9vyXFl6gxWnPV4HlxElXjQfYVwfw7kU kR1KjiVNa6KbtV9I5pwHslEsRrJujPM= X-Google-Smtp-Source: APXvYqxiUQ+EdtesUGiHpVmXSnZ8q/7hq7LJ9lcNTS4rbbHzn+DRsqyMuA7XpW1EhPNgD0WOspY/xQ== X-Received: by 2002:a5e:820a:: with SMTP id l10mr9876986iom.283.1566168689056; Sun, 18 Aug 2019 15:51:29 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m20sm11754504ioh.4.2019.08.18.15.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 15:51:28 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Aug 2019 16:51:12 -0600 Message-Id: <20190818225117.142845-6-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190818225117.142845-1-sjg@chromium.org> References: <20190818225117.142845-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 05/10] x86: Move fsp_types.h to the generic fsp directory X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This header file is the same for FSP v1 and v2. Move it into the general fsp directory. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/{fsp1 => fsp}/fsp_types.h | 0 arch/x86/include/asm/fsp1/fsp_support.h | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/x86/include/asm/{fsp1 => fsp}/fsp_types.h (100%) diff --git a/arch/x86/include/asm/fsp1/fsp_types.h b/arch/x86/include/asm/fsp/fsp_types.h similarity index 100% rename from arch/x86/include/asm/fsp1/fsp_types.h rename to arch/x86/include/asm/fsp/fsp_types.h diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h index 9a7c002bfc..bf0bbc7654 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -7,7 +7,7 @@ #ifndef __FSP_SUPPORT_H__ #define __FSP_SUPPORT_H__ -#include "fsp_types.h" +#include #include "fsp_hob.h" #include "fsp_fv.h" #include "fsp_ffs.h" From patchwork Sun Aug 18 22:51:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1148918 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="F36hG3f+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46BXR31mg5z9sN4 for ; Mon, 19 Aug 2019 08:53:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EB7CCC21DE8; Sun, 18 Aug 2019 22:52:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 94E53C21C51; Sun, 18 Aug 2019 22:52:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6AEB6C21DED; Sun, 18 Aug 2019 22:51:34 +0000 (UTC) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by lists.denx.de (Postfix) with ESMTPS id EDDDEC21DFA for ; Sun, 18 Aug 2019 22:51:31 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id j5so16873843ioj.8 for ; Sun, 18 Aug 2019 15:51:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aau9UXNfK0xgAUqIAzVeq9BZ19NII0NIgS7HgwxclhE=; b=F36hG3f+AqC/HuldH6Iycb7k8XmET+VGIYFY/Gs683cSl9thfKDMYpUzbPIMXb/SSr CASHIrDBuONGcMDc4A7S7cbArDiC+vwldKWPGfoL3RpIpaJuNhyGvs2H3BPnyfHc9l4a BzYjZF/Db3iMNOePHruJ2RybPASNTY5sQ0fzE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aau9UXNfK0xgAUqIAzVeq9BZ19NII0NIgS7HgwxclhE=; b=drgJ/yry5qZxrs8GpLs2+Twou3MON9f0Xduj2OTAtp4txMWMSP7pc9LgJzp9pfd2M6 fkIrEy6gs09+wMGrNizcNOJFREyPZABpIs8J1eDf507p3/JHZevXxHgT+rnz24a+9vYl mTs3h1E3oMyA7VkTU9VBH6wqWLRJXlDbJAIrjXAb68v8SjiL5m3O/akp5aYxsPGs8QFX IF0UVwjJOYqVKQLAKIfjPnAXcNzE9OA4cVaivqJ4QLvUHEVARFUF8+OESCK4rSg/y82x yjMxfNfRgUy8C8BRgrKCDaMjZxACYmIZHRsJlj/VuObjD4lI5nE6YxfbsJ8QGOdtof0b 3Wyg== X-Gm-Message-State: APjAAAWG6KYJQ5+ozekgZb95uhmtvwQJdHPmt+HA3arD29f1d5SAJ7VO V75qOObO45aMfkT/fxz2kaOpenWmePo= X-Google-Smtp-Source: APXvYqzcVbBksTwf3JBDaIaPJz2P48c9pFG56srjNeLbiVlihGnU4BeKbwtpHV3J3YTh8t1XfODtbg== X-Received: by 2002:a6b:ed01:: with SMTP id n1mr10263688iog.255.1566168690742; Sun, 18 Aug 2019 15:51:30 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m20sm11754504ioh.4.2019.08.18.15.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 15:51:30 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Aug 2019 16:51:13 -0600 Message-Id: <20190818225117.142845-7-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190818225117.142845-1-sjg@chromium.org> References: <20190818225117.142845-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 06/10] x86: Move fsp_fv.h to the generic fsp directory X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This header file is the same for FSP v1 and v2. Move it into the general fsp directory. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/{fsp1 => fsp}/fsp_fv.h | 0 arch/x86/include/asm/fsp1/fsp_support.h | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/x86/include/asm/{fsp1 => fsp}/fsp_fv.h (100%) diff --git a/arch/x86/include/asm/fsp1/fsp_fv.h b/arch/x86/include/asm/fsp/fsp_fv.h similarity index 100% rename from arch/x86/include/asm/fsp1/fsp_fv.h rename to arch/x86/include/asm/fsp/fsp_fv.h diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h index bf0bbc7654..464f129809 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -7,9 +7,9 @@ #ifndef __FSP_SUPPORT_H__ #define __FSP_SUPPORT_H__ +#include #include #include "fsp_hob.h" -#include "fsp_fv.h" #include "fsp_ffs.h" #include "fsp_infoheader.h" #include "fsp_bootmode.h" From patchwork Sun Aug 18 22:51:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1148920 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="cyiPGuHG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46BXRl3Tq0z9s3Z for ; Mon, 19 Aug 2019 08:54:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 279A1C21E16; Sun, 18 Aug 2019 22:52:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E6241C21E1D; Sun, 18 Aug 2019 22:51:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 136B7C21DA2; Sun, 18 Aug 2019 22:51:37 +0000 (UTC) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by lists.denx.de (Postfix) with ESMTPS id BA0D0C21E12 for ; Sun, 18 Aug 2019 22:51:33 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id l7so16859485ioj.6 for ; Sun, 18 Aug 2019 15:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xLkpmWiw5cCLu/wF59TKqu/2lp7JRXdPCuaYFw6jDwk=; b=cyiPGuHGbKZn5/iGQMAF0cITuWdZ2ZRnBGqqy648zFiQegupHSnGGBC21LiPhuZ7tn kr7Y7xgym1bmi/eVVTk087VfhvD1xWdnQRlU3XsOCex75n9AgKQQo2IrE6sB+NriJ6si ht9NJ8DiT+l3nU2jQRqdorKHQZQkshTVLYRj8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xLkpmWiw5cCLu/wF59TKqu/2lp7JRXdPCuaYFw6jDwk=; b=AujYQkxFL0NoSJdGJC8jWN5Nb8iZdNxTNiBLpRWpcrdz8v5Ha0o+KDN/OJhjgu51kb 55F0FlYAJPwb11quMTTI0EbctxCvDhtCD00ut3e+qG1ht2MEy24/umsWPfVPZqE98gok lh60/01X548fzXW2Lbr0F7vPuTpbG+7dK/yX9oRiZOsum+UndwMtrkYtEX5VmzriyrLl QZcJbGdyKu54s6GjTvvfxDOuho3CExsl7AdfJwBs2Cn7BaML9bpOe+XkwGc69Q+5e4GM 5gSQGzYjhKFr3cyKf8o3LhiU3KoxSSI4pxwjqqZxBcMqpbALUMp5ttYDuR9AEohglTDH 88QQ== X-Gm-Message-State: APjAAAWYOHGUj4NmXwcFX0rcGK+S0NHf8wCK5IfA9DGtxHHpkUUCo+Ev 1uS+mTKtox4CAjTrkbwpMUKs7XmCN8g= X-Google-Smtp-Source: APXvYqysOx035YduGboErvm/8ygXqVYIhm7jqLNBuUn+BgsOPLPIoaYqXSpoPjlrqzxbpSz6NlZ1YA== X-Received: by 2002:a05:6602:cc:: with SMTP id z12mr16146145ioe.86.1566168692550; Sun, 18 Aug 2019 15:51:32 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m20sm11754504ioh.4.2019.08.18.15.51.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 15:51:32 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Aug 2019 16:51:14 -0600 Message-Id: <20190818225117.142845-8-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190818225117.142845-1-sjg@chromium.org> References: <20190818225117.142845-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 07/10] x86: Move fsp_hob.h to the generic fsp directory X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This header file is the same for FSP v1 and v2. Move it into the general fsp directory. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/{fsp1 => fsp}/fsp_hob.h | 0 arch/x86/include/asm/{fsp1 => fsp}/fsp_infoheader.h | 0 arch/x86/include/asm/fsp1/fsp_support.h | 1 + 3 files changed, 1 insertion(+) rename arch/x86/include/asm/{fsp1 => fsp}/fsp_hob.h (100%) rename arch/x86/include/asm/{fsp1 => fsp}/fsp_infoheader.h (100%) diff --git a/arch/x86/include/asm/fsp1/fsp_hob.h b/arch/x86/include/asm/fsp/fsp_hob.h similarity index 100% rename from arch/x86/include/asm/fsp1/fsp_hob.h rename to arch/x86/include/asm/fsp/fsp_hob.h diff --git a/arch/x86/include/asm/fsp1/fsp_infoheader.h b/arch/x86/include/asm/fsp/fsp_infoheader.h similarity index 100% rename from arch/x86/include/asm/fsp1/fsp_infoheader.h rename to arch/x86/include/asm/fsp/fsp_infoheader.h diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h index 464f129809..7da19227d5 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -8,6 +8,7 @@ #define __FSP_SUPPORT_H__ #include +#include #include #include "fsp_hob.h" #include "fsp_ffs.h" From patchwork Sun Aug 18 22:51:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1148929 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="XBCzyvPE"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46BXVk4rCXz9s3Z for ; Mon, 19 Aug 2019 08:56:46 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6E013C21E0F; Sun, 18 Aug 2019 22:53:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 16ECDC21C93; Sun, 18 Aug 2019 22:52:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1C2B2C21CB6; Sun, 18 Aug 2019 22:51:41 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id 5E68FC21DE8 for ; Sun, 18 Aug 2019 22:51:35 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id 18so16867984ioe.10 for ; Sun, 18 Aug 2019 15:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wnhQn5nVmOWKvifQ+I9efQzCVM6/QXghuMSq+MeYIQA=; b=XBCzyvPEUXcCcC8KKjqCBnPddfH80CtZaaUoQ2ghcuQT8gRU+KrGjB0vXkC7wkjvmm 0ZMQ0EsSam6WQNIJ0SLGolLqTOSwKt88KOqYfBwINbaIYaBJHkL6cFCmdRtwymVBNWtW 4D19JcyaMgIZ4uMcxZPePVhkOcFiJonhz0dd8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wnhQn5nVmOWKvifQ+I9efQzCVM6/QXghuMSq+MeYIQA=; b=FhGrWABYjKb7FlUq0qRsl5fHhZSjCmbAGaO2EUksX+sf3r02tEHZxzaVa6DbxKdVbK tyvOTTDjYuPCuLZ8d1QOwZS+mZH+ZJ5uZyMFxWErve3LI5NOENIxfljrCXmbtbc5VjO8 1nYg1yGbdU1neMDiPM3g5OZ8jEgIYFNWbOLaDe+Z+ao2GkclI7fW4eNQqtzR8f3e8Anf milRdQyeHsojlCCzjlQY4O55aYvN1HBxYNWp2muPhXId6UziTE1NTnK2v5EnyBzFZB6J 6oTGlPybuNK3RgYY3BAR4gPF5PBrv6Vr+UYzckqWktlbSxBU42Nide6zTa3riqRY5YOO 1Wkg== X-Gm-Message-State: APjAAAVNNzDw9116nUGnAYf07ohJpjltscOo+WtRWKIRB0C8vO5ctbN3 Y7aG5u0ytHEeybztXH7deTdnCSlgH/s= X-Google-Smtp-Source: APXvYqzDeY5rc4nrWHo98YOLCMGOhdok2pSMy2440sGxlw0LH2g52yvRrSyxXlkFND7unvMZkfBtZw== X-Received: by 2002:a05:6638:2aa:: with SMTP id d10mr22751828jaq.89.1566168694234; Sun, 18 Aug 2019 15:51:34 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m20sm11754504ioh.4.2019.08.18.15.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 15:51:33 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Aug 2019 16:51:15 -0600 Message-Id: <20190818225117.142845-9-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190818225117.142845-1-sjg@chromium.org> References: <20190818225117.142845-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 08/10] x86: Move fsp_infoheader.h to the generic fsp directory X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This header file is the same for FSP v1 and v2. Move it into the general fsp directory. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/fsp1/fsp_support.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h index 7da19227d5..b93607f738 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -9,10 +9,10 @@ #include #include +#include #include #include "fsp_hob.h" #include "fsp_ffs.h" -#include "fsp_infoheader.h" #include "fsp_bootmode.h" #include From patchwork Sun Aug 18 22:51:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1148922 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="NI1+TLA8"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46BXS93jc8z9sND for ; Mon, 19 Aug 2019 08:54:33 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 08513C21E1A; Sun, 18 Aug 2019 22:53:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2A74BC21E18; Sun, 18 Aug 2019 22:52:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D51C8C21E18; Sun, 18 Aug 2019 22:51:43 +0000 (UTC) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by lists.denx.de (Postfix) with ESMTPS id 28476C21E29 for ; Sun, 18 Aug 2019 22:51:37 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id o9so11587iom.3 for ; Sun, 18 Aug 2019 15:51:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nX81+Mx5/OyOndc6Cd4oPYiEOJfTY7//Pd3Kefh+1L4=; b=NI1+TLA8a5fkiXXg0hnvUn0gfREmn3rlR6hHd6raKkeGH/ffhakGHUSnfPIMwLpkRT pqCFe7lCLN6N75edV0HMDULZir7/ALIAU9WNCC5Rmr+ZHSi9jFTD4sGyDU2cvILTncf2 3A6bnKuIUoxS7UOTmNH0EEwUCaJ6nGN8A7Sb4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nX81+Mx5/OyOndc6Cd4oPYiEOJfTY7//Pd3Kefh+1L4=; b=iX6o9qioukLII4YTKQ0QYnCaCq7AJdGdJcKacytheub8i+dIake4YpVf/8T33i4wN6 pWljFY4JUdjp3Quu/4bFPY39QMObd+HBgZrF6CSNpgUvw0/Ts9nffsdKHs83hyML9h3/ 6yALEXzEG+A2tj/N1zdW4PkSOV+n89FAwjqpSMnSX7aZ01JzeyWKG5XV59q/rU0rGcMZ tmRAC6i57mbQx0I1ozZFgAVkIMrXJJLg3jSYIYt0i/bQyTJ18984d58ihhSgmH34KkYd 2qyWXZ+v6/k0G0gBydUp218eFACKd/hdCHevsz9Ft3+iYPAS7eAnd6JcnSYhs/Mp+34r HY7g== X-Gm-Message-State: APjAAAUzqirYXFW7EaR98UZDskgUHZ0IkX96dCETH26G7lOQri941sXI gEseutKf70hACxwGJrmkyc1r/vmYHlU= X-Google-Smtp-Source: APXvYqwsfOUFgp7Hgpt81s6qa+sh+xTsfF4F0teqh8gOOQcTrPsHyYnjQzkJJiJ+PQuHh0MVHMlIIw== X-Received: by 2002:a6b:6012:: with SMTP id r18mr8351569iog.241.1566168696016; Sun, 18 Aug 2019 15:51:36 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m20sm11754504ioh.4.2019.08.18.15.51.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 15:51:35 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Aug 2019 16:51:16 -0600 Message-Id: <20190818225117.142845-10-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190818225117.142845-1-sjg@chromium.org> References: <20190818225117.142845-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 09/10] x86: Move fsp_bootmode.h to the generic fsp directory X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This header file is the same for FSP v1 and v2, although there may be some additions to come. Move it into the generic fsp directory. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/{fsp1 => fsp}/fsp_bootmode.h | 0 arch/x86/include/asm/fsp1/fsp_support.h | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename arch/x86/include/asm/{fsp1 => fsp}/fsp_bootmode.h (100%) diff --git a/arch/x86/include/asm/fsp1/fsp_bootmode.h b/arch/x86/include/asm/fsp/fsp_bootmode.h similarity index 100% rename from arch/x86/include/asm/fsp1/fsp_bootmode.h rename to arch/x86/include/asm/fsp/fsp_bootmode.h diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h index b93607f738..8f81e0ff2c 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -7,13 +7,12 @@ #ifndef __FSP_SUPPORT_H__ #define __FSP_SUPPORT_H__ +#include #include #include #include #include -#include "fsp_hob.h" #include "fsp_ffs.h" -#include "fsp_bootmode.h" #include #define FSP_LOWMEM_BASE 0x100000UL From patchwork Sun Aug 18 22:51:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1148928 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="nI4cfcg5"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46BXVP2hF4z9s3Z for ; Mon, 19 Aug 2019 08:56:29 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 06D63C21DED; Sun, 18 Aug 2019 22:53:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D72EDC21D72; Sun, 18 Aug 2019 22:52:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7B5BEC21DF3; Sun, 18 Aug 2019 22:51:45 +0000 (UTC) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by lists.denx.de (Postfix) with ESMTPS id 0D677C21DA2 for ; Sun, 18 Aug 2019 22:51:39 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id t6so16872125ios.7 for ; Sun, 18 Aug 2019 15:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ve6lOf7YiKxawKr1Ce51v2W0anqt6uf0S9OqHuwRsBg=; b=nI4cfcg5RW9zIZv2HfHfYYpdVLf9SPV0kBaaYtvgUZ7U3swBoEHD57sHUwuWiBED9j m3h6AX/aUMhrvbprHo4Dxy5J0CatyZ1rw4sHTkCwYSB64sM3+rOee3GN2uQ4mDM/Of5G 3kPeZd1eIEcFxE5QEhNHOIQ6XKzcYroedaDao= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ve6lOf7YiKxawKr1Ce51v2W0anqt6uf0S9OqHuwRsBg=; b=mhEHwIsuyNysjWWj9YZinYyReoJNriM7Vi7FlyhBzXCLmc72nKXzTbMBRWTV7zzBsB zF4GOfqiPcDwUIaytKVIgVSInYwVI34QVg8mXYrRkij2YgCyQaRAEtoKb3NFeygrOl9q QwBoLcBNhGyONYXpm6vEAiJ4/uNTboWB18zuypQPW4J6PG86CHREekiwUzTxZUwBHd4l 97hEjBLkIdT14nT+m3CgZteAxMIACEm4lIdyQ8A4wdxQfLjZk3h4Nv8AE3KeaSUtiGaf +Sf+FB7MYcQvBP394G57ecXEQy3L1nrTBUT40JOQWXUqO1B/so3KRWtrKOsmy9Fb7gVT 4bMA== X-Gm-Message-State: APjAAAUuIlJXsFgkz5d2UsUIgQKr+sjejOtr99SNwMnPsh1xDG7nfaPO h7RmtTDmlN/2XQ6ubXYtzcLUynR62Q0= X-Google-Smtp-Source: APXvYqyAuqaBjooIQL9JakU5ydH/ddfTNcSdR5tpkOJN+Vd1oNtaC7+YmjnDdMnsc4KpCRLqUi7j2Q== X-Received: by 2002:a5e:d911:: with SMTP id n17mr7813156iop.32.1566168697733; Sun, 18 Aug 2019 15:51:37 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m20sm11754504ioh.4.2019.08.18.15.51.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 15:51:37 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Aug 2019 16:51:17 -0600 Message-Id: <20190818225117.142845-11-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190818225117.142845-1-sjg@chromium.org> References: <20190818225117.142845-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 10/10] x86: Move fsp_ffs.h include to fsp_arch.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This include file is only used for FSP v1. Avoid including it from fdt_support.h so we can use the latter with FSP v2. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/fsp_arch.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/include/asm/fsp_arch.h b/arch/x86/include/asm/fsp_arch.h index b223141c44..3b2077b392 100644 --- a/arch/x86/include/asm/fsp_arch.h +++ b/arch/x86/include/asm/fsp_arch.h @@ -15,6 +15,7 @@ */ #include +#include #include #include