From patchwork Wed Sep 25 14:00: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: 1167248 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="RGEnyaK+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dfxN2nh0z9sNx for ; Thu, 26 Sep 2019 00:06:30 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9CAB4C21FEA; Wed, 25 Sep 2019 14:06:27 +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 49BC9C21F89; Wed, 25 Sep 2019 14:00:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 07258C21F3D; Wed, 25 Sep 2019 14:00:30 +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 0E2EEC21F24 for ; Wed, 25 Sep 2019 14:00:27 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id j4so14016251iog.11 for ; Wed, 25 Sep 2019 07:00: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=+1R8mLHbSNwwalHQVNsz8mKknMWrR9OFYOIafPDoyNI=; b=RGEnyaK+7KE2CLlftctUg92Av/Khe5ZLq3SfdlE1j9F75sziQdhQl3hlglwFoTTgNs 3OtEQSOl7jQVthikZlTefq6lvF5hBjGoi4/mH7MwPTwizN7O/FMGFgXJa0tNAOPGT9z1 VhmzmmZLmqdo+WoBBY6gNQyGFgf3tqxEp3ggI= 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=+1R8mLHbSNwwalHQVNsz8mKknMWrR9OFYOIafPDoyNI=; b=hayfxAUwuyqZcrJHAOCnKjaUKGXx1IUIZUDE49fwJG5b5eR2lNvNTDtTzDd0ZLrc5S qRD/ofLFDghEYzyJ62C//FCKJ6BcYdNbt5S3VuBnlRUGbeSC6V5i8oQ7wV0gg2+azwq5 G4u53K7AUguizuKWUpHsVqzEKEq4LHKooJXVjdLETlpr0T7wNApPAHjFgFWCUHYlaMyX uO0tY6CkzRIlzl7d3wd8JmVL3nbHkH7Unn3gJEW+RVDuneBNhVZCyBhd/a0xtT3DRrqc VOQKfzgDG4al56ihEfevAkOVlv1Arp5Q8Af2vJjsIxYyT+MWr4dbio2vmw3eTg7mwhE3 muMg== X-Gm-Message-State: APjAAAXgBrSsF44bkOYYKZjLukssPm/xISW++ithfYWMbopFzjGFnGZl o4tl22jvsEhAL3Gjd7EiB9kkttIXwk8= X-Google-Smtp-Source: APXvYqwBfp6J1Rtv7g17ACPADvlBE3qKj681BPm4pz4pjaDV8RoS97Bcj6klh4xBooF7zLvuZAtRNQ== X-Received: by 2002:a05:6638:73d:: with SMTP id j29mr5612155jad.21.1569420025352; Wed, 25 Sep 2019 07:00: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 q74sm6223082iod.72.2019.09.25.07.00.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 07:00:24 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 08:00:11 -0600 Message-Id: <20190925140020.188781-2-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925140020.188781-1-sjg@chromium.org> References: <20190925140020.188781-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 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 --- Changes in v3: None Changes in v2: - Correct Intel FSP web link 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 218e817cf3f..314f8def7a4 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/fsp/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/fsp/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 445e4ba2d7f..1e3829a433c 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 cefd26299a4..5b5d66aa5e9 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 7fe6fa7995a..607e333f21c 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 2fd06b3bed7..773c2b2a0ae 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 c4d117783cb..0dd1901e07b 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 76556fc7f79..66737e655bb 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 c252192bf41..2466ad2ad30 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 906be5eab98..a8c7448ee45 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 ed0827c6e92..591eef7b813 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 3a23b70410b..3bf65b495ca 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 91d2d085572..52e71334f95 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 0eaa9b232b1..019a42f53fe 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 ac12f303a3b..8f4c587371d 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 695af6bb7ec..c037d5b14cd 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 efa183854b7..fb27624422c 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 ab3e1310eb5..b73d0cd70a7 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 Wed Sep 25 14:00: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: 1167249 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="hdw1x+ld"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dfzp5VXhz9sPJ for ; Thu, 26 Sep 2019 00:08:38 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 56644C21FB4; Wed, 25 Sep 2019 14:08:36 +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 9B12FC21F9D; Wed, 25 Sep 2019 14:00:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0B10FC21F9D; Wed, 25 Sep 2019 14:00:33 +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 6A9EDC21F4A for ; Wed, 25 Sep 2019 14:00:28 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id a1so14096284ioc.6 for ; Wed, 25 Sep 2019 07:00: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=TWhTqboa3p7RTWG/yozjiVXmysMoyWZb9QFTDZZE0HQ=; b=hdw1x+ldTxx8Ik4LW1DIp3dMhWlxkjzaCId4ZaIZu3Jcg50hITAG2EEOqFdUdyOXNR MPDba3kjTtHGb4+yKcC8TRtQcox4wI62WHMWQrFXUUNGQ7KuUG+1Jg2E1oOts6tCp/wr E1se9h0uI4YDDEhKI81UuVQJHJLbF5zfNOvzw= 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=TWhTqboa3p7RTWG/yozjiVXmysMoyWZb9QFTDZZE0HQ=; b=ZXXMI0DtN3dwZM6pC6vSR1EsLnX37lP23yXr2WTtnA2cLQSP5/wckIvkdycl3Cyf5C Lewh4w8th0cTp58ULIjIcAHWDOeuorFiniC3+hKaxpJPC9snPTI03gd7HuDus+EFSXS8 bJfWXf7t7iUoLv9SOZFfdDsKVaMmbHyjWKk3veuAO7c+DFfsY/nsX8W6Mi1DiAEXNRh5 8N/al8Lj1oqV3qbRG3Xr4WVgHFEsBpWJLAdWKYCuvVT6UGCPPT88oHA+2bFvtriOaH8T /CmIX+j0PKLWyCvhwg6CNgW6D3xhuHVHavDTRl+I9bXviPQVuuD7yyIzbGrO5lKI95AD pjeQ== X-Gm-Message-State: APjAAAVJON+R2hHlvzmKGNCIi8XY6+3C9j4U8YY0PcSgnh75FGkp7lAX +gcLIJ+/mrjwB5hRkSKCY9O5IDMj12M= X-Google-Smtp-Source: APXvYqwJ6YOX9f3aZQF6FzYGJiK/oXMx74FUgYQ75JwkhZJwHJBtbjb6OyVwjFVMiuDCWJCiDqKIXw== X-Received: by 2002:a6b:e719:: with SMTP id b25mr10551077ioh.100.1569420027143; Wed, 25 Sep 2019 07:00: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 q74sm6223082iod.72.2019.09.25.07.00.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 07:00:26 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 08:00:12 -0600 Message-Id: <20190925140020.188781-3-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925140020.188781-1-sjg@chromium.org> References: <20190925140020.188781-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 02/10] x86: Move fsp_azalia.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 --- Changes in v3: - Drop struct efi_guid and add a comment about forward declarations Changes in v2: - Rewrite to make azalia a common file for FSP1 and FSP2 arch/x86/include/asm/{fsp1 => fsp}/fsp_azalia.h | 0 arch/x86/include/asm/fsp1/fsp_support.h | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) rename arch/x86/include/asm/{fsp1 => fsp}/fsp_azalia.h (100%) diff --git a/arch/x86/include/asm/fsp1/fsp_azalia.h b/arch/x86/include/asm/fsp/fsp_azalia.h similarity index 100% rename from arch/x86/include/asm/fsp1/fsp_azalia.h rename to arch/x86/include/asm/fsp/fsp_azalia.h diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h index 7b92392a277..6d30dd7fbc8 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -14,7 +14,7 @@ #include "fsp_api.h" #include "fsp_infoheader.h" #include "fsp_bootmode.h" -#include "fsp_azalia.h" +#include #include #include @@ -22,6 +22,9 @@ #define FSP_HIGHMEM_BASE 0x100000000ULL #define UPD_TERMINATOR 0x55AA +/* Forward declarations for update_fsp_configs() */ +struct fspinit_rtbuf; +struct fsp_config_data; /** * FSP Continuation assembly helper routine From patchwork Wed Sep 25 14:00: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: 1167250 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="cSTEXxat"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dg101f5Pz9sPJ for ; Thu, 26 Sep 2019 00:09:39 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8A875C21F59; Wed, 25 Sep 2019 14:08:47 +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 1F540C21FB9; Wed, 25 Sep 2019 14:00:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6A7F3C21F9D; Wed, 25 Sep 2019 14:00:34 +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 5BA2BC21EBA for ; Wed, 25 Sep 2019 14:00:30 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id v2so14044839iob.10 for ; Wed, 25 Sep 2019 07:00: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=sMnu6oYAE+5W24OnZ746AtaRQwySlQNa6sqqx+exsuM=; b=cSTEXxatdAuD2nF2Vn8EDs44DK5bL9cxPGA+/CjQBL8/E8aHjF6pWoc8EZK+X8Qzci uQq3A62mWBizzbJwWZeslYyNi0fvpfX33eHZ06EnvINBp7Caysbq3dIfyk3BbJVVJRlm dmOIFk7LP2uIHFy2I2qYnT3XunoXq4O2nTtaM= 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=sMnu6oYAE+5W24OnZ746AtaRQwySlQNa6sqqx+exsuM=; b=cLNuR7Uo0A5C36fE1Rlj2OWZGChsZqmRSknwNxZx1Lh7+gF31jJ6GyEtm5Wnlvt6/x dR7JmrOKDZwMa3ZuJoaP1kBjWLyKvvwnHwO4+FDPV8uGRlUq0TVPGLGovdQidQQ1qsLd RCWP9lQNGjMDAL2cS/hhAvZbkOdZMg6mDA7linqPhf7GVCZqWM0HM6jBrnDoXYkHtLOA jvsUvBRoRz1zL6iuQG2YAlldpEcTO22FoFFydJJgDvJ5Y2fK/glgobAdzZJolkuq0Hc9 YRSPPL4diwMA5X2DjmgIrLbL5jh0KQAFHQVakaK14uUZoC9DIeOGbhWSvWWcYdrl8/Vf AlIg== X-Gm-Message-State: APjAAAXmA828NWnoyuGFY0Wt3PVWZg4FF1EU0TUPUdXr7o489OA+tDmX OWxpwxAcJ1tkbQ9CFFeV8ysp0+q9CCA= X-Google-Smtp-Source: APXvYqyDv+JXdV5An+4SPVWPFSvFJUolnG0S2tihk7IB1qqd7/FVq8MhZmRXkA0fLFexOMEXhuA+UQ== X-Received: by 2002:a6b:3804:: with SMTP id f4mr10568170ioa.166.1569420029100; Wed, 25 Sep 2019 07:00: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 q74sm6223082iod.72.2019.09.25.07.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 07:00:28 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 08:00:13 -0600 Message-Id: <20190925140020.188781-4-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925140020.188781-1-sjg@chromium.org> References: <20190925140020.188781-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 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 --- Changes in v3: None Changes in v2: None 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 6d30dd7fbc8..ae38fb4bdfe 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -14,9 +14,8 @@ #include "fsp_api.h" #include "fsp_infoheader.h" #include "fsp_bootmode.h" +#include #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 00000000000..fb7f9109f7b --- /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 Wed Sep 25 14:00: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: 1167251 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="Wzcb7O8j"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dg233MKTz9sQv for ; Thu, 26 Sep 2019 00:10:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E47C0C21FDD; Wed, 25 Sep 2019 14:09:07 +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 797A6C21F58; Wed, 25 Sep 2019 14:01:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CB4D7C21F24; Wed, 25 Sep 2019 14:01:29 +0000 (UTC) Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by lists.denx.de (Postfix) with ESMTPS id BE07AC21F24 for ; Wed, 25 Sep 2019 14:00:31 +0000 (UTC) Received: by mail-io1-f46.google.com with SMTP id c25so14032151iot.12 for ; Wed, 25 Sep 2019 07:00: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=2gTaV7Fe/Uhq98ZnPb1xBHm3d0xJ5p/5dXPFbR/G2Qs=; b=Wzcb7O8jAK67+jOzcQQAaeAGwmguGCDd9qZ04eZ0jlgp5gSNk8nhFgOkmb8rzzW6Xk NatoBR/bKr9JG6siA9KCuFOXS6HYv0UfzUKI3f4u00Nqj2ZtZOnZhmWSGmyPPpoBef7J ULHnVhm8M5Iw5H4T6MPlnS1qkXf2bk7usmOFo= 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=2gTaV7Fe/Uhq98ZnPb1xBHm3d0xJ5p/5dXPFbR/G2Qs=; b=eSVieFUFWqyijaN//jcnXprapyzImcEpcZS2Nw2aKhSaBZ0XUgB4FmWk+cfBAWupDL sq+K/M0YBaSpMRuPe/DHTEe8SyK/JPMSBIbqw1/J3OpyYsRLtAXFwcDv0lDH+mbRKmfN 2Z28j7ey/ikeWykO3LubBlG46zgsv4p38QvGv3ySbiXWZxlzVrqNnkGwD3S4aAou6v74 ROXsiKzWly2JlemIDbfkFcSeYXu5ShQTBMEvBNxiKGmlovZF3yN8a+2JOcmudswSXrhB r2NFgphoasK0/RNyUH1aI1rgJPuwObn05HNFRT0bOhsTqfJRhjhkKcBz2EeUgoAxiJrO RK3g== X-Gm-Message-State: APjAAAWvJHLkTnvzjqEKT0O/R08xRicMH9WCNj62wj5YM0+OcIJIepA/ 4GO6UD8amnbcWOyX/T7kqC0sTX7f5fI= X-Google-Smtp-Source: APXvYqwhyHOJccco64XRfN7mvn5xfj547TuWth00uddVYCqGXgbJ7FDr2lXP942Urd0iow0HugZmlw== X-Received: by 2002:a92:3ac3:: with SMTP id i64mr694668ilf.221.1569420030582; Wed, 25 Sep 2019 07:00: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 q74sm6223082iod.72.2019.09.25.07.00.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 07:00:30 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 08:00:14 -0600 Message-Id: <20190925140020.188781-5-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925140020.188781-1-sjg@chromium.org> References: <20190925140020.188781-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 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 --- Changes in v3: None Changes in v2: None 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 ae38fb4bdfe..b425ff1e0b2 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 fb7f9109f7b..b223141c448 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 Wed Sep 25 14:00: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: 1167252 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="nQ/bAo7l"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dg2d6qZRz9sPJ for ; Thu, 26 Sep 2019 00:11:03 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5A847C21FDD; Wed, 25 Sep 2019 14:09:16 +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 ED188C21FC7; Wed, 25 Sep 2019 14:01:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8414BC21FCC; Wed, 25 Sep 2019 14:01:43 +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 34A24C21F9C for ; Wed, 25 Sep 2019 14:00:33 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id b136so14089153iof.3 for ; Wed, 25 Sep 2019 07:00: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=OSKQJeHkc+A7t0WGOe4gdnPiQp4J9OyCKlbIZZ/uSs4=; b=nQ/bAo7lAie/H4vKor8nVFDrYbbPCpPnLqXePZdLrUoxlQKGnN29CCgSRS5e13LrU8 fVL5g5xgNONU9rk3rVgQ1U4JK23ZD2VlT+D34+/RzV/3qHAcVmozuie1uA+99wIyCFAp S+9OovuZ9ZRDuKJbHl9F85rd8aD3q4spl+O2s= 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=OSKQJeHkc+A7t0WGOe4gdnPiQp4J9OyCKlbIZZ/uSs4=; b=mfAoVhpNOFf2BERJWDT2saoTaBDomXxFgZqCM4PtyDT2tNYdwPMcyfiSqdKrBhmPs4 5FKv79+yRWWAr+28jZhlkIcx+heriZ5+i9vhNDVZn4UDBWx46jNliD5K8uQJWORjjyhQ kSGH8SdPVWLn+oyiNN4/S/LL5th0kGVkhAtEt5vOumsb0BrqT7yU2U3Yq9Qm5Pee1jc8 8tcUAwdRNWr7T+3mIxOWOgXnxGAu74oPamIkFFcEW3H9qchD2aKfM+i/7/AqXNWa2lGj hZxtqlnP4GmCCV8Zl7fuxbUxgfDJIRu+Wf4YT2cszHojKaapU5kYi73+Zp365kV+FJ9B TX5g== X-Gm-Message-State: APjAAAUbO5sUBYlIzmxeEq2s4/Ioi+ygCwZsmXZ4cfB7jHzH0j4NAPxl aEw9YcUT2eMFq3hgQ94OAMWVxMiA0L0= X-Google-Smtp-Source: APXvYqwh7jE78DZo2i1pX5GHTU0ShTRz4NRU46vsOr9AohH1VtaBGJgpBewy816dMDHU2Sv3XZr95Q== X-Received: by 2002:a5e:9747:: with SMTP id h7mr857887ioq.290.1569420031886; Wed, 25 Sep 2019 07:00:31 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id q74sm6223082iod.72.2019.09.25.07.00.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 07:00:31 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 08:00:15 -0600 Message-Id: <20190925140020.188781-6-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925140020.188781-1-sjg@chromium.org> References: <20190925140020.188781-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 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 --- Changes in v3: None Changes in v2: None 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 b425ff1e0b2..2677b6e429a 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 Wed Sep 25 14:00: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: 1167255 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="eY3/3xIn"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dg4B5wNCz9sNx for ; Thu, 26 Sep 2019 00:12:26 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 35350C21FCB; Wed, 25 Sep 2019 14:09:26 +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 48DE0C21FB1; Wed, 25 Sep 2019 14:02:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5F9C5C21FB1; Wed, 25 Sep 2019 14:02:02 +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 4699DC21F4A for ; Wed, 25 Sep 2019 14:00:34 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id j4so14017552iog.11 for ; Wed, 25 Sep 2019 07:00:34 -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=pqaBS4UrrV/ufTNZX1ffgoFgxcPkAb9Dq9+5XHdE9aw=; b=eY3/3xIn/mAlaDxtkvSjRFiuYAa4GDfYU/SRaZGvTwaKIp577eJbwZ5mimSR+yU57u YUoT0kDSi2ziHzYRUDYlC6XQ9tYzaUdPaq4KEhfXYtDgqxf5SASU71c/J5Ag2GfsVjGC ENFdHUx+e0fVcTzEq68DfLMe+WGpINl6TB8hk= 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=pqaBS4UrrV/ufTNZX1ffgoFgxcPkAb9Dq9+5XHdE9aw=; b=Vk1+q61okCGoEMPbkIRHRjlrMaL3XfGw7fwUBx/o760ysYhQXBybgUFFCp+hYGroJw 5MLw7GtEfAyA4Qj7JFNVob0C5ubrfS0TjwrZNVUrZ3GJV5dQjUUULXsP46YzX4gCtdqh HWEpc4GKUK69TL8JUomA9iCA4uj/z3fShUBi2hqeJCIg3xKN3pyydxvXv93fdqZK+hD8 J4NFAYNGSQOS9OLKEoUqvKuITOR08qg21uEqiB+RK3MUergdKa368l26txW2VqohsJy8 Axamj7tU81Qi9VE/wObpREAyEIWVRizCz1Vk4dtLJFChA4oCWnLkWmsyySJuYOYKQYrR Acqg== X-Gm-Message-State: APjAAAWhYrxrpWMndierczMkDW3uTKn4BUGzJiT4gswiYILFtVHiq5KG I1CqzPPcnj0ohkf1VKn68wqvpU9kPus= X-Google-Smtp-Source: APXvYqxo9cXFl+9MCMIZj64ZdHy+phHt75kRBl9uG7V/GS2Mv5dqARASQ6485CmyS3s9V31gH4gSSA== X-Received: by 2002:a92:8c84:: with SMTP id s4mr716460ill.106.1569420033100; Wed, 25 Sep 2019 07:00:33 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id q74sm6223082iod.72.2019.09.25.07.00.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 07:00:32 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 08:00:16 -0600 Message-Id: <20190925140020.188781-7-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925140020.188781-1-sjg@chromium.org> References: <20190925140020.188781-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 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 --- Changes in v3: None Changes in v2: None 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 2677b6e429a..de3b1936be8 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 Wed Sep 25 14:00: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: 1167254 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="URkQbrqg"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dg433K6rz9sNx for ; Thu, 26 Sep 2019 00:12:19 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1DE82C21FEF; Wed, 25 Sep 2019 14:09:35 +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 8C67AC21FD3; Wed, 25 Sep 2019 14:02:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1AB01C21FC1; Wed, 25 Sep 2019 14:02:06 +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 E0AA0C21FC1 for ; Wed, 25 Sep 2019 14:00:36 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id h144so14046735iof.7 for ; Wed, 25 Sep 2019 07:00:36 -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=VTz/J3Uwc29k74+ZRNVBxo8XDfAJCNv6QqCmjieuEuQ=; b=URkQbrqghQq2Mbwj1irtCEOCfDvDRX3+6ZHLxvF8KsHEDiG+mwHjIxF31MrpJMrI6u WoYse6nUXaIch6kfSsKiZ1fJeXsc9qbYTYKTZyU/G1e/6phPxlYmhx4YOjuS5IrQ16dL qYoQqaqFIhIfl011nDySsRuffaahZNzst1MtY= 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=VTz/J3Uwc29k74+ZRNVBxo8XDfAJCNv6QqCmjieuEuQ=; b=VoPPqaPS9RIstaq9CiWQg0IN8UtcnJSfGKr78z8rK6P1MroV7AjX5YjI4XHFp4DhC1 pd4/aDE4UoFF6G0lo+l1PzTpf5NpWDoOR6MVzxPGWipzzZ+63FcoUWcpWPhllgnHkbLN BEgshK4WJhkWW3TjZDYZECNMqcm7nnbRycBXO74PtTih1gV+DTaDXIyXbNUE92PfRxa6 nyYz9g/lir51v+R8ddFWc83jW3N96vAMWbKM60fp2uGdKjoTQ1VLwnIqgegt6wRiXJ47 rw/46jx4Jgskvq+sKz0ljtabiR018NPwGo20evPm6Kp0WxF79HefvBjk3EOCdfk3q6AY RQ5A== X-Gm-Message-State: APjAAAUksDpxLytUfqsPkRo+GlG6swosU7pOv9ybFYCRuiyHM0CverMG 7+F0vJK7FRN9aXGrJPaKz4U2iycX7XE= X-Google-Smtp-Source: APXvYqzTnvI7VfGVPayCbF1c8PA9TXtkyDDyQJf6dt8jPZK6CwN1KCpRNBTkEIj0D+rnCNCqMPPtUg== X-Received: by 2002:a6b:5a1a:: with SMTP id o26mr831166iob.65.1569420035608; Wed, 25 Sep 2019 07:00:35 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id q74sm6223082iod.72.2019.09.25.07.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 07:00:35 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 08:00:17 -0600 Message-Id: <20190925140020.188781-8-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925140020.188781-1-sjg@chromium.org> References: <20190925140020.188781-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 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 --- Changes in v3: None Changes in v2: None 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 de3b1936be8..2f1c5fbb546 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 Wed Sep 25 14:00:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1167258 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="SHswugJd"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dg4g1v03z9sPS for ; Thu, 26 Sep 2019 00:12:51 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C69A2C21FB7; Wed, 25 Sep 2019 14:09:45 +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 EF3C6C21FB7; Wed, 25 Sep 2019 14:02:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 674C3C21FCC; Wed, 25 Sep 2019 14:02:07 +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 2FA78C21FAC for ; Wed, 25 Sep 2019 14:00:40 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id j4so14018558iog.11 for ; Wed, 25 Sep 2019 07:00:40 -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=GTOV+oWhqKoTQVAtopf7Eu/xbhPErBZ4O4guraBM2j8=; b=SHswugJdcnDVXug+dXir9J4XIGCFDYbl2ebXJXf9yt1i3+1nPhrkKeks+I1pP18BTl uqV+WWhcvG98RQUcoJ2/jt1Hqq+qalQ175tT/yj9jen1H8mYQUqKzejbyUl8LfqpI3sw aRzM4UcyV8eyHv6tXcu1DGjCZzsH0jYmVkn+E= 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=GTOV+oWhqKoTQVAtopf7Eu/xbhPErBZ4O4guraBM2j8=; b=JLWAfNyRYPkK3qFNnja5CxidAlurdWartUIeFzdhg4VpVCctXeYIIeFppJYIcILmmY H2hc0zKIzfKq12yH4kIfJe5tEI+nS2BNVOlt9Ag2tLgkq0CvqjxdnVfRazm8OGWeHda3 0aREkREGq+5Qaa/YLP6fB0oyBfRGB1HttPRpUTc87NjR2UBKu6DTrb0hXNQAziKZklZT /4WlI71R2fQM8FFJLLstVV1+Ov0pvmjmG8mK0+lHdPUaTqCAUhcBvY/NlR5gjRvZEAPm 07Ghtb4OMyk/8gAxjhGoSPPPL991SfVw4Oji2j0hS+FmDbNgZ4oHunSvoCfcTIFDFGWt sqgQ== X-Gm-Message-State: APjAAAUfr+R5ZCXOB/OWifezXtItY8lzzIcRGlhbav5jzpJYDt+LX+7K 1xgTYo7GxJEt1EUdAw0BpeQSGVEIr+4= X-Google-Smtp-Source: APXvYqyoE7O4QIg4Xz+Jh2h0015ZYHLVxMKeGLWhZdTx8F7+E+1+oNuf/Sp3YlnvJb0tpbj52FPCHQ== X-Received: by 2002:a6b:fe0f:: with SMTP id x15mr3778380ioh.188.1569420038030; Wed, 25 Sep 2019 07:00:38 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id q74sm6223082iod.72.2019.09.25.07.00.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 07:00:37 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 08:00:18 -0600 Message-Id: <20190925140020.188781-9-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925140020.188781-1-sjg@chromium.org> References: <20190925140020.188781-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 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 --- Changes in v3: None Changes in v2: None 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 2f1c5fbb546..3582c0a8a08 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 #include From patchwork Wed Sep 25 14:00:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1167262 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="gOKkHKLP"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dg6J6LkHz9sNx for ; Thu, 26 Sep 2019 00:14:16 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 73C21C21FFD; Wed, 25 Sep 2019 14:10:03 +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 7329AC21FDD; Wed, 25 Sep 2019 14:02:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DE0AFC21FCF; Wed, 25 Sep 2019 14:02:09 +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 86729C21FB7 for ; Wed, 25 Sep 2019 14:00:40 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id z19so14128289ior.0 for ; Wed, 25 Sep 2019 07:00:40 -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=2XOtMY+B6hV9aF6Dh1TDQcUeAO/g6yXcnuyEb7Finoo=; b=gOKkHKLPcwdOTt8xErRSUf0+SM4Za/MYFOz0tHbwnzJj0zQtdwhjrKKzsQI/L6frEV I3dF3pp1kZuTqFXrrZ92nwv+0bEZqkxWep2pqmIG2RCYE+n9oGQn5jTFPsB7NY1WNLrv VPK0ktRobMkh5nsaj+Sr1ub6ckvikQk2qBwYE= 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=2XOtMY+B6hV9aF6Dh1TDQcUeAO/g6yXcnuyEb7Finoo=; b=odrEWm4cFgn6xTVAlHGEv9bdv1UZSwRSkapfWwcQFrcyGKrGEX++GtvH8oR5mnhKta 7GJY2zSNhbqDqRepTfUuutQ+djcBj40L6XUeiK/7EhUaaDCNUjuHXbCwgYJVWbKyQWir FtxPSSTFLdbNfiTSSlsgXRed3S+lG3S/otFK9keIdovxFs+QdoDi/iL7XSfkXrf7+6EU 5u4dRnbqQYsMxGUsM0Lk73gjYsPIB5qWftfxAMHNuE2K6+Dv42POaD76hDcAbtpmagfD 8h8zze6FIpvIj8DM4Pm1g8PLbg/jpw6TF8ivgxLhcHTMtWNDUFxHVM/g1WCp+gwDbZwD RQcg== X-Gm-Message-State: APjAAAXwFb8ICHJz0ycitbZWbarf5/GEG+cpRFGR1TrsHmu9H4BV2FUQ CFm7pxjByIDwdgCEx/MqzURa8SfhtFg= X-Google-Smtp-Source: APXvYqxSuSVKrnZfbzc+Ys/G966dmsGjnaXevsKZOUSH3MnYR3TeIGAEqt9pbC+8W39HGInFWxoBZg== X-Received: by 2002:a5e:9747:: with SMTP id h7mr858436ioq.290.1569420039236; Wed, 25 Sep 2019 07:00:39 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id q74sm6223082iod.72.2019.09.25.07.00.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 07:00:38 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 08:00:19 -0600 Message-Id: <20190925140020.188781-10-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925140020.188781-1-sjg@chromium.org> References: <20190925140020.188781-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 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 --- Changes in v3: None Changes in v2: None 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 3582c0a8a08..d69c0a4986a 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 #include From patchwork Wed Sep 25 14:00:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1167253 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="GRPDbfj1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dg4064y3z9sNx for ; Thu, 26 Sep 2019 00:12:16 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6C0E3C21FFB; Wed, 25 Sep 2019 14:10:13 +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 D438AC21FDA; Wed, 25 Sep 2019 14:02:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E1F27C21FC2; Wed, 25 Sep 2019 14:02:19 +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 9978FC21FB0 for ; Wed, 25 Sep 2019 14:00:41 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id h144so14047602iof.7 for ; Wed, 25 Sep 2019 07:00:41 -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=IabpANMfpCVAPZh8mGo599LRgIlJtQHOOIHOtfyaWXw=; b=GRPDbfj1KeaAc09B6FBG4XM4jsoRFxCPRKy/udDIsZpXmMK2a45CVBWQziNz3rKtSK sPOrrVFMYbxeI8au8rCcelwZT6pyDpVwmgIFfKsPGNf3+RkAMUzVQMKY33h6OIPLK9di 7CUm2K7Qp5Oh+Qnra7eIfhU46BiZBtjNGrDk4= 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=IabpANMfpCVAPZh8mGo599LRgIlJtQHOOIHOtfyaWXw=; b=BvgdoZaGDAq4UTfImwsj7ou1SypOHFMhrTWXLN1GOoba4SybCAAeWHK+2lX/00iFbY DoQ+kFQSSgFMTo6VUCoTTO1HahRoTDJC0T1DFgyZcvY9OF5WGHegoSJ0P8xEUg8Km//4 Rnq036uEMyZ6Yzvkd/uwfak5m1o+r1Q0D7n6XhGqAgQ9v7g+vfpGay0tQwk/J8tPc6sd ZJZ3TXV5QGQQ/EWV90nVL/9P5ZPwfqiUNbV1daAjJ3w05SfNVJN1CwuQGKGIJXzgBKY4 gWCSmNlC1P3OLBnn1/ncmGNIyqhbelfFh/dh4R25S1H8qzXFUBPwCgEQH9q0Ze58Vank +iHA== X-Gm-Message-State: APjAAAWRJGTSUcMh/qyWPwpIrInCRid/+BEPtVFjG3vJBMsVnN88BTNN WhCSxOQE154BqNOUcCSA5yD9KtpATA8= X-Google-Smtp-Source: APXvYqw/Hq25huNGi6pyF/AOk7lPpyP8lDjTT7Q7KwhK0vg0/HHbzSYlhMrkapycUQuUPI6xNu3WlQ== X-Received: by 2002:a5e:8f01:: with SMTP id c1mr10048597iok.148.1569420040402; Wed, 25 Sep 2019 07:00:40 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id q74sm6223082iod.72.2019.09.25.07.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 07:00:40 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 08:00:20 -0600 Message-Id: <20190925140020.188781-11-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925140020.188781-1-sjg@chromium.org> References: <20190925140020.188781-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 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 --- Changes in v3: None Changes in v2: None 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 b223141c448..3b2077b3924 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