From patchwork Sat Aug 24 14:44: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: 1152653 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="h6R9lzWc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G1KL5lZXz9sBF for ; Sun, 25 Aug 2019 00:45:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 42D79C21DEC; Sat, 24 Aug 2019 14:44:46 +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 849E2C21E76; Sat, 24 Aug 2019 14:44:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8D199C21C8B; Sat, 24 Aug 2019 14:44:30 +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 BC477C21C38 for ; Sat, 24 Aug 2019 14:44:28 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id j4so18628074iog.11 for ; Sat, 24 Aug 2019 07:44: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=wug6U4mB8o3u5CDpLkc3gZb789MwqppFfMgyBuNdYys=; b=h6R9lzWcX0ikqotySjQ5i2GwLqxHAZWlHbZ153dejujlUGabEOIFCxoN9TxqEf2SJ8 JRNW427U2DaqMhaZYig1KvN/q3EKqPj7iPwOGDwNNig8Wa1KyT2YuPRAXuknqEwidJTn oqagApA2fk/WsvwsURLzQGp1g7046rMrMjHYg= 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=wug6U4mB8o3u5CDpLkc3gZb789MwqppFfMgyBuNdYys=; b=GrGSOlGacVRpaL3A5kJCYyLBbp4Yfbdt6hoeSMmXqN8r2iDuX9jTzXNeVzVweZhApk aCUG4eTG5hVPPNeXFHfnyo/7Rwc5MvALMZoVu9l2zF57EsmB4Z3rQxNDdYTFV3eDMSrR m1kPQr//4CnKFRqj1RHqu0wM1L6bhC3lli8gHdU99JVSk4P+lBoWW1sSZQLM1a/11Cor HDuVcBOmGSkh60QDTk6v0h7fZEgea9dPHZ4Sq4qLLsl2ajlq1VZNCGqsoOVUudRBIaRT wTxMMZ2iUfEznNymyPt1pzIUE2F/H1ZMUt46nGH8qpwojTt+b0mkwAHtDkt9pb7SFnyk duPg== X-Gm-Message-State: APjAAAWr45YTL4ksk5f9q4h1uJhVg6/CzeCLSKdKSWOBSyWbV2nKWJJN YQnXdBNH4Y6yQhpmV6swKyBlSAgXb+k= X-Google-Smtp-Source: APXvYqxY4MV0TOewRJYPh+aqcB/IoU9nev0l2+EOH7tjYdVw57qoZqBvy8GjbXVNPzyLjn1eIgGCSA== X-Received: by 2002:a05:6602:2193:: with SMTP id b19mr14123638iob.113.1566657867356; Sat, 24 Aug 2019 07:44: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 c19sm5614385ioi.22.2019.08.24.07.44.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2019 07:44:27 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 24 Aug 2019 08:44:13 -0600 Message-Id: <20190824144422.235024-2-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190824144422.235024-1-sjg@chromium.org> References: <20190824144422.235024-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 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 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 218e817cf3..314f8def7a 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 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 Sat Aug 24 14:44: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: 1152656 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="UTVJUKH0"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G1M01gZ1z9sBF for ; Sun, 25 Aug 2019 00:47:08 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E7400C21D56; Sat, 24 Aug 2019 14:45:21 +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 86D47C21DD3; Sat, 24 Aug 2019 14:44:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 38BFDC21E50; Sat, 24 Aug 2019 14:44:33 +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 AC58CC21DDC for ; Sat, 24 Aug 2019 14:44:30 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id l7so27011007ioj.6 for ; Sat, 24 Aug 2019 07:44: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=SgtpllH9BLMYsUqbo/1xPqwQaGpMcjYTL9/8bbxcA64=; b=UTVJUKH01P1D1nky1AIkL1iR1U4iSmRx4ArGMCpTQqQYSVKhs3GnCDDny67J1ye6Tp 7eWCazbj2xDiba7BPsunQPEXfz618jHpCXD2irX1r1OjB/Iw56j5KDu4+BD/4fPiiq2c b50ROPf0IJzxXrm8ZFQIjkNgyGPP+psYziZ1U= 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=SgtpllH9BLMYsUqbo/1xPqwQaGpMcjYTL9/8bbxcA64=; b=Ae50BQmouLeGpuNITjKyohzuKHmD1FWqABQWfEHv1kmV3dulRVpGjKEhcxTMoNegVG 3rQm7b11p9jWmBQr8VnQXt3Ru+JGc/8WME5AYXe8niF4BM3zEXjpeOUj2WUjXkx0Ho0D 94E+Fje0G39q68zNKVZlDqGO7o5zBDzAfuprB7mu3rxQfS8BmIAcNsTBBFlO012UWTXV 95sgW78lKh2mr8QMKLzgp1xMEClxlb9ky+S/Ctg1Q+GMNIL5Gvp+L32uVMA/q0brsgNx DMdG2cHMrapk4NmrECy+gdyeQ+05bQs+VOtvqmWjbPM5whnrZQjiD1T+Lf4RBUO9LjdF 3lvg== X-Gm-Message-State: APjAAAW6BO/h0CRXvZ2exeZD03ZXbKRkxI+UAT+xRPZpj6Tjqfx0EJV9 ZKhF1o6LB5i2FEBAPCOj1u7pmIowpDA= X-Google-Smtp-Source: APXvYqwNLCibzruTHu0lSBS+6ooPXi9f2eLoGbP6X+zUV1EcawsgAn9U+jMQ+WUp9zPBHKxskQ0Pcg== X-Received: by 2002:a5e:8b03:: with SMTP id g3mr6473227iok.170.1566657868925; Sat, 24 Aug 2019 07:44:28 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id c19sm5614385ioi.22.2019.08.24.07.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2019 07:44:28 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 24 Aug 2019 08:44:14 -0600 Message-Id: <20190824144422.235024-3-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190824144422.235024-1-sjg@chromium.org> References: <20190824144422.235024-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 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 --- 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 7b92392a27..487c751fcf 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 +struct efi_guid; +struct fspinit_rtbuf; +struct fsp_config_data; /** * FSP Continuation assembly helper routine From patchwork Sat Aug 24 14:44: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: 1152660 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="fxt67cp8"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G1P247TNz9sBF for ; Sun, 25 Aug 2019 00:48:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0FBBFC21E73; Sat, 24 Aug 2019 14:45:49 +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 8874BC21D8A; Sat, 24 Aug 2019 14:45:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3BBDCC21C6A; Sat, 24 Aug 2019 14:44: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 B23F4C21DEC for ; Sat, 24 Aug 2019 14:44:31 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id t3so26880396ioj.12 for ; Sat, 24 Aug 2019 07:44: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=AJq6dnYor63CwFeimmMWT4vU1T5lGbjgm4PkOqzp+VU=; b=fxt67cp8fRrdnoaav2yavHAR4449k8hc9tlFyDAn0/RfU0oZwwtkKRfjSyVr2NS00z 3KuGOnxH6AeWMHwiOdGUXxcJtqz2rx5SYn185j9UNr5WjVGJLH+T94FVB+n9Qk+6QsJr Zp82Bg/HnijRru/HiAZO7pCYW1xKyHQcimzFc= 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=AJq6dnYor63CwFeimmMWT4vU1T5lGbjgm4PkOqzp+VU=; b=GeMUHTn374enZdKw7MyJnHO9eu6Kk4NDRrKa1kn/atIpQkd8+exNdlqFf0Ljd4v5LK Dbhdbl0K7tbB4ETwv1Yh8+tESWeuniMYEY/sbwnJe3tUVl3uyumDazrgaSSYL4mEL1CM gbHqDQB8kJuTL1pGMlnG2A8NAfM6pPvl+7tF3U8sSPyxwsbxNW2KUKykS7Gre5c8pgrP d3QYCHHbxKyIx87ZPzIrAjU63ZkWvyeOejoayBa+2kcYmYyOrQMTrgWg6oQJFji0mlgz WN4jjlDekv7ohtrnpyG9OEKw1W8ch+2RzTSY3BBAk1tJa11kGxbdaNSkObxYJLCrBuWY or2w== X-Gm-Message-State: APjAAAV4Izmo9UcCiFzA6LETzpRzp3hsI4IUXQW6mIY9GygNF5tuQxR+ 9iIibtErjU8D3mwkfx3+Kw62wOVrt5s= X-Google-Smtp-Source: APXvYqwFDzxTe06aQP9en8SPz5YKIziVLOiNfrEDjxb7lKM8acgViEpJmWXP8kT5MNgZFQL3LfAqWA== X-Received: by 2002:a5d:951a:: with SMTP id d26mr13754838iom.31.1566657870610; Sat, 24 Aug 2019 07:44: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 c19sm5614385ioi.22.2019.08.24.07.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2019 07:44:30 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 24 Aug 2019 08:44:15 -0600 Message-Id: <20190824144422.235024-4-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190824144422.235024-1-sjg@chromium.org> References: <20190824144422.235024-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 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 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 487c751fcf..a50a21ca8b 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 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 Sat Aug 24 14:44: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: 1152662 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="nouuT0GJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G1Pz65rjz9sBF for ; Sun, 25 Aug 2019 00:49:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6165CC21E68; Sat, 24 Aug 2019 14:46: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 1CBBAC21ECC; Sat, 24 Aug 2019 14:45:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9ACEBC21E1B; Sat, 24 Aug 2019 14:44:36 +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 363C4C21E2F for ; Sat, 24 Aug 2019 14:44:33 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id q22so26994004iog.4 for ; Sat, 24 Aug 2019 07:44: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=9kfV5NVFSfA2ijphHz+tLDXfenEhEeZKkV859BKkSos=; b=nouuT0GJSddknxMyKvpcDMjabfP5QnKF9X1DFejQZT+0yqf06bAyh6QsFTfo19dBKk A07nK2Px4bmqGvr2GLgs9oftZcH+Oe5kt2NCD5vr4/BDh/bz8EY5EU1KR6US3kGO4OOf O8COzAYom/ND4eyes1TdqHRnn4u9MmLrBGbY8= 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=9kfV5NVFSfA2ijphHz+tLDXfenEhEeZKkV859BKkSos=; b=JCtQykn8cqfvBCHKebGdvF2JIe6wGfgYda/PP7V2pWIuN1BsIjdpM9flXeq9IZdPir 4qqummaB1NGNpFD6aF++XEHwlY/NAQPi51j7jM1HF/Ij3OA+X9MzTBZntAGlXozOZtTK 6FiUMmVOgHXZN/wt2gHfZuF4lGzbfr5lk0HZuzi/EhEgZXCoYbVV52HZQxFObigJ5rv5 ujC5bVN86XQAzraI67AZrQpmZbqbxF+5Z3/0/EQad1R3MR7W83qNkiCVl9/uQVH74fEm 4IBybwWXoNfmOpR3qIGU1qacjH4v6XCAL3ql6qt2mzytzQ3G2rFiP0vXwf9dLe3ws8lG sYoQ== X-Gm-Message-State: APjAAAVXBxqeYYTfuZtaPk7kNO5yev1R6NRb7FQW8MSGMoDri5icmXsm A1gPd1WLcOEbGrR9hg0Wm4bpADUbynU= X-Google-Smtp-Source: APXvYqyylrvCBQK+7wiwNeKnqBpSx57GWMksDn1Fnfh34zug6z/VTS/9XO+c/wHL4+SIa2+1HWFqBw== X-Received: by 2002:a05:6638:3d2:: with SMTP id r18mr10005765jaq.13.1566657871979; Sat, 24 Aug 2019 07:44: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 c19sm5614385ioi.22.2019.08.24.07.44.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2019 07:44:31 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 24 Aug 2019 08:44:16 -0600 Message-Id: <20190824144422.235024-5-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190824144422.235024-1-sjg@chromium.org> References: <20190824144422.235024-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 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 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 a50a21ca8b..f2ac8acdc9 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 Sat Aug 24 14:44: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: 1152654 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="J8Xdsoqw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G1Ll2NvDz9sBF for ; Sun, 25 Aug 2019 00:46:55 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 07A8AC21C38; Sat, 24 Aug 2019 14:45:40 +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 8E2A9C21E7D; Sat, 24 Aug 2019 14:44:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 30A3AC21E7D; Sat, 24 Aug 2019 14:44:37 +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 81463C21E35 for ; Sat, 24 Aug 2019 14:44:34 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id p12so27027682iog.5 for ; Sat, 24 Aug 2019 07:44: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=2A+5FODELrE0lNVeyw2MvyhIX+hKl28blSTsCau6ftw=; b=J8XdsoqwHUbxdJVzxKkNoc501GdamOQ0MEEzq+KfnPpcYDPa6Y3SsSz2HDZxyf1yhD +b8MylKzUB4eB/oQFPNYbhz1mt7tnL3fr5A+T2bLT3mlGrLgVmUnVx0nv2V89qivcw7n zy6AjfyQg2HwmDFxncouZiNJjoIJu88lLaiWs= 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=2A+5FODELrE0lNVeyw2MvyhIX+hKl28blSTsCau6ftw=; b=RD39l7UYUcCQqSXQYtweyDzd6ZcyfgrltGoeOxxXbne/nHO+uu7OjDk39c1ooLsftq SJRcVsxRobflse5WCEtgS6hRGsH3bBty3c10cJIjz1Vp4sMxyQrIAnY7YXSRrHzyHllT SZbKbgyma5dLp20H3x5sGCclT0Gg2i1pxtxBOJNLHEUGjxvks/QbEhOPzpb8W3aE099t 525Gx4iiR3UaeR2jt//PzauwPKfVtgLQlFIsUZhDSKu3ceoPPlX9zn0eRk5A82HGqrcF 2Em6y0VETE2VmLzMktKlQ1dNRFttEtZpBaR8efjZ28FeBOtwbHIqcJCCniyYeUnk39yh IJtQ== X-Gm-Message-State: APjAAAWjKG/AXUzMRtKaCBfSJTDks0DeaBVbgOwh0o1GlFL08maPPgMs nsZc1Oqt0JSSGBVZluyOyuBNezTKqLc= X-Google-Smtp-Source: APXvYqySi2eXYBOSiqvOUWoIPZVdZjIU64pE9rO38gLNc3Y6aPdJYmJnosPlOWJA82utZoPp5YJ1hA== X-Received: by 2002:a02:9644:: with SMTP id c62mr9762437jai.45.1566657873371; Sat, 24 Aug 2019 07:44: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 c19sm5614385ioi.22.2019.08.24.07.44.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2019 07:44:33 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 24 Aug 2019 08:44:17 -0600 Message-Id: <20190824144422.235024-6-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190824144422.235024-1-sjg@chromium.org> References: <20190824144422.235024-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 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 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 f2ac8acdc9..c55119448b 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 Sat Aug 24 14:44: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: 1152658 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="V4nJGxad"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G1N10X32z9sDB for ; Sun, 25 Aug 2019 00:48:00 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B73B3C21E57; Sat, 24 Aug 2019 14:45: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 024CAC21E2F; Sat, 24 Aug 2019 14:44:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6DEDDC21E45; Sat, 24 Aug 2019 14:44:38 +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 E4F1AC21E07 for ; Sat, 24 Aug 2019 14:44:35 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id x4so26843581iog.13 for ; Sat, 24 Aug 2019 07:44: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=F08y9JWwHzTVPgX9+gKbvnZXevyG1OI/T60qOoCO60M=; b=V4nJGxadECj/nD+3/tw84247LZjydkAuOw0KboNTLN76mwr1ntEhmTb8qli7lyvmIK cHOM1urlzu+bB/vpHpR8S53FkgdwEi8xRPJm+BA4WyNh4v8m9HLbv7/5sr/yUN7m/Gfl KnAZt76mNIZLF+QskFMlPWQRrs1wukrOu+74I= 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=F08y9JWwHzTVPgX9+gKbvnZXevyG1OI/T60qOoCO60M=; b=f9FoCJCrslpBo5+U/Ec0/qMmtC+KY1vGyEYT4IwzNcfK2kx9dY40T/Xnhv8Icw8Sjj Nup9X7JZ/2n+jw3Yn8AYd0WLVdy4znnUWkmJhixYDfepm9Ni/MeHmTms8b+LZ/frIdR8 GiffKxHGYct5ygiK3uh34teaOH3F5Qc2V2vjQCzHDTnP2YemlWLuaLt4CqSwLP8OwNvl BSwof/NNjpbLmcw5MM/JW+NYM7GTh9jiNEXm1VBOJlpZmox7t8RTrqQ53f1YtzB8flWI Fy/XJnZ22E3IgnPdm+DRnTl97knZZ8k7w8EOo8zxOrwRb2X1DVcddz9wfHDNf9JenyzC geug== X-Gm-Message-State: APjAAAXhgzBv5vFjB1miA3DuFrHAVJ1b7DMt48GJaNa3OehIjTbucexj eF28LWsVe0R8evZIgW3ZnZqwX10uNfc= X-Google-Smtp-Source: APXvYqwPpklk8sLwYe5Zx30gPN6MhzcWHAEwknUJCCYLIBC4cwFw17J5QFEyEe5t69PZX9/ATGuc4Q== X-Received: by 2002:a5e:cb0a:: with SMTP id p10mr10567814iom.133.1566657874801; Sat, 24 Aug 2019 07:44: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 c19sm5614385ioi.22.2019.08.24.07.44.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2019 07:44:34 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 24 Aug 2019 08:44:18 -0600 Message-Id: <20190824144422.235024-7-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190824144422.235024-1-sjg@chromium.org> References: <20190824144422.235024-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 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 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 c55119448b..f0f1cea599 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 Sat Aug 24 14:44: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: 1152655 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="To8is3V/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G1Ln3nVtz9sBF for ; Sun, 25 Aug 2019 00:46:57 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1D7B5C21E12; Sat, 24 Aug 2019 14:45:31 +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 13FACC21D56; Sat, 24 Aug 2019 14:44:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D9D29C21E76; Sat, 24 Aug 2019 14:44:39 +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 61937C21E16 for ; Sat, 24 Aug 2019 14:44:37 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id s21so27052834ioa.1 for ; Sat, 24 Aug 2019 07:44: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=QBiGsre7JfE/Uq7F3jkxrxbPtlX8/J/A964Bw9FpCl8=; b=To8is3V/pR7CL7PNYR92OV7KKDyeI9v8Rjzb8+a5SKUBnymC2WmHVWv5zgYTZlLlkV YhYzW/rAEOkO9JKop7u0hfSEpk//iTFniQrFu+6eXeMhCDUc993hWUvVyyR+jmVy1iKm MsbVL0yPizFw1mM6db0kInjQMnIla5ERr6bPc= 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=QBiGsre7JfE/Uq7F3jkxrxbPtlX8/J/A964Bw9FpCl8=; b=C2iiGHnIxlDmPUyW6pOs6DfezO4dF3Ca2ErEIRmEzsIJbjob2JExfnOvqknMPfOJ7i KG3GLGgdRrMupIxNptknx74BYQwFQIx9xImkLXJrNrslA3QQuF+gRqAMQFrPYS4OKbzd xRoIcLenLjflFwK853pXQX15ewEn6arMRx6h9cDtZ2H/tD9RQGuvpEsEgEkrGyfKegdw HvvjuZI9jLU+LlFzuyMyZpk4bClGLIUCc/xRefz8H13WhYbmLReVeZvo9a15CCXUoWGc nUoQRhjQto+HNyd8MX7gmUPOQ+IcDlOyURDPPUuj4vCbYmIBjawdh2pMtkcmmIM07ygN Bq4w== X-Gm-Message-State: APjAAAWvjKK03hdt/RqimdDa79Nt08r66uRjVTBs7V41tnWQsuFqPKtL l84Eq+OgzRn9RsmVtO27ZX1GUZpHo2Y= X-Google-Smtp-Source: APXvYqz1PI2x7NVFqR87LjIs4oIUK1PH7oeUNv8iQK03eOG8rbkMW0SNGoijIm/0TjwdvyJfiRHb0w== X-Received: by 2002:a02:a492:: with SMTP id d18mr10392131jam.27.1566657876215; Sat, 24 Aug 2019 07:44: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 c19sm5614385ioi.22.2019.08.24.07.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2019 07:44:35 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 24 Aug 2019 08:44:19 -0600 Message-Id: <20190824144422.235024-8-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190824144422.235024-1-sjg@chromium.org> References: <20190824144422.235024-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 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 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 f0f1cea599..91ba48f94a 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 Sat Aug 24 14:44: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: 1152661 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="SEgclwFB"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G1PN0qnxz9sBF for ; Sun, 25 Aug 2019 00:49:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 91B5AC21DED; Sat, 24 Aug 2019 14:46:30 +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 5B9DFC21E07; Sat, 24 Aug 2019 14:45:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E4E06C21DDC; Sat, 24 Aug 2019 14:44:40 +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 0FF5BC21E2F for ; Sat, 24 Aug 2019 14:44:40 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id b10so17916439ioj.2 for ; Sat, 24 Aug 2019 07:44: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=PNOFN88nWehmADttDGpj2dkf8aAzWNCGx4F2x7uZYGE=; b=SEgclwFBUxwqhBslbZADFvLdYlLPWj5L5vj7kinbkhJEhKB+aG18YmrdSKHMTHMbwd FSLA9cvHAWpltGyxDHq4Y2lqPSA7Wet9Y1q4D3BQk0ogFGS2jemyl6UL9GEsbmnPUY41 Ac/AfB1skephNOuyokAohIfAFDHyrSoi20Jog= 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=PNOFN88nWehmADttDGpj2dkf8aAzWNCGx4F2x7uZYGE=; b=Dn9+UEiokj//9aLdT8skwcHv5+WIItjlKMQ7gFUY2VMdoO5z1cK27KRKXk4AL9EGk4 ETlbrOUi47Vix4zIK3PpxA0pUp38i1pBTaVVB1nTaiRHaCJHhZ5ZTvee0j4nhAK4NQih VZhf723QosI+LZhUfc+w/mNcIQ/QSntDMnOPL+gGyvGYjyymhVbV8EdHfThnueOO3kd6 nmICfb46ly6jB30tfVE2ytCdadBqeCctJwgPjX2+B4+9P0bBLo7u/frL7aQXofHLE//B n4ss6RDFGwe5yPz+TTw+bAGKpLeqvMB/+P+p511GcSpFk940rhI3oe4iHg3je4JhXuCD uIfg== X-Gm-Message-State: APjAAAUBxY7ZAmwFm1Vpsk+wUqmtkR/J/f5cw8ckkTEC9qpjZX5bM7Sf 2dZ/77/TYqx9NXVHyJcTlfNV2huSsL8= X-Google-Smtp-Source: APXvYqwncUdYi8EL9IPJENe7ZyxjE0MFxLgTotTAY4QnGmmXp6rPLg0JSYfKFYm9ul1Z5aSZJkKaeQ== X-Received: by 2002:a5e:834d:: with SMTP id y13mr8627205iom.79.1566657878952; Sat, 24 Aug 2019 07:44: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 c19sm5614385ioi.22.2019.08.24.07.44.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2019 07:44:38 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 24 Aug 2019 08:44:20 -0600 Message-Id: <20190824144422.235024-9-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190824144422.235024-1-sjg@chromium.org> References: <20190824144422.235024-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 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 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 91ba48f94a..9543b8b563 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 Sat Aug 24 14:44:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1152657 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="EhnUC/cy"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G1MT3BDNz9sBF for ; Sun, 25 Aug 2019 00:47:33 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CCF0AC21D56; Sat, 24 Aug 2019 14:46: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 AA688C21E18; Sat, 24 Aug 2019 14:45:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A38E9C21DD4; Sat, 24 Aug 2019 14:44:49 +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 CBA97C21E1D for ; Sat, 24 Aug 2019 14:44:42 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id 18so26914634ioe.10 for ; Sat, 24 Aug 2019 07:44:42 -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=RGFVxMzksYs145SQGU179BLLnOCYMKomNa/O+NqVTEE=; b=EhnUC/cy1GDOfoZQ1JF3JJQm7p5/tzI3u+4Z4rQ3z1rTzL5DhD6S/OyL2zj/QGgrz3 vfp5dtkSZCzu5NWmI3UiPu55T2CpuLcrHthAjtXax4qvPL/zH1g4T1sjWvilFEuvGHHD OWwP195QyCTC4RgPG3ZGYzQbluaFdUhnrsbPw= 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=RGFVxMzksYs145SQGU179BLLnOCYMKomNa/O+NqVTEE=; b=O3EseEUByfqQGfJYl5VuWdsdTDDXaE8Pt4zNwNcwEkG27Bb7a05hJOnz79KE+X5Wuz FlZFdnIz9VW2bZXsh6z/GxNWs33LkHzleS97e+/RtxyIc7h0/jpk2xQQ3BLBTZ6Ik+Gk uNlyb+3KJtk+CjTsNtEwOgxKPPaotNqFSqfKKaORyDypEtcoNECX4Y2aQJfppsdWpshB Zs1bXZ04ltfXqMn9IMe5t2cbv48271M5VtBf/OKTy9S30xZE2ewUl0kDyGSop6EHqi5q FIPUcnHNREPJXqqS81KXOkW7zDF+6ftW+Oked20kSHk/+sKMNIpDRkiA8WUOBdYUUa7V aDIg== X-Gm-Message-State: APjAAAV/1l15/1laZyRc9XFIBAjq0UaRIUqPX8hsRCRbLAggFKXZ43mq KYqvVZHKgv5JaAImn8km/+HHaXX8Y2I= X-Google-Smtp-Source: APXvYqzCIorPlNIzkKcvhpRPxjlNZQfM/Fpz/QfXPMVlT8M3vPauWquS5L2V2ffJHc3f3xQKjeZErg== X-Received: by 2002:a02:cd82:: with SMTP id l2mr9822621jap.97.1566657880144; Sat, 24 Aug 2019 07:44: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 c19sm5614385ioi.22.2019.08.24.07.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2019 07:44:39 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 24 Aug 2019 08:44:21 -0600 Message-Id: <20190824144422.235024-10-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190824144422.235024-1-sjg@chromium.org> References: <20190824144422.235024-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 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 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 9543b8b563..d0f053fea4 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 Sat Aug 24 14:44:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1152659 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="UQnqu/vE"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G1Nk2KHYz9sBF for ; Sun, 25 Aug 2019 00:48:38 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CF342C21E18; Sat, 24 Aug 2019 14:46: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 04636C21E60; Sat, 24 Aug 2019 14:45:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EDAC3C21DB3; Sat, 24 Aug 2019 14:44:49 +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 1CB28C21E16 for ; Sat, 24 Aug 2019 14:44:43 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id t6so26992315ios.7 for ; Sat, 24 Aug 2019 07:44:43 -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=FLiSvB6IK/VrZUm8VtFm7KIgYVXLiFgdxohQxc9bpmM=; b=UQnqu/vE+Vx4jVg69h0uNXEpgLVpeMik8/8+DGCcHQF9AamHz8n5qNM4ynBE526Ey+ rtddSlhanx+qIygGh6xy8glg+36JJ/vZ2OfTnvsfjUL/HxLaGKNfLeKw2UxZ0j6Kk2L2 zg7MZWP8y3XFMPfeyaP4vHOkRFNkNnXCMro6Q= 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=FLiSvB6IK/VrZUm8VtFm7KIgYVXLiFgdxohQxc9bpmM=; b=XWyMKy2ap63uQ9QGGnwi6syzLMdbxQ835TgbOibc0OGHnCf1f1jhr7QU96GWIpgVS2 Lc7yrBZeiSgcFrHuAYEZRvIEL7wE5dC/wG1olbJpaTNlLSGH7hdXUU5D5nPR+y/QJnLm 6UL8O+QtG3logGCOXU1prpXGiIZrpZIH0JOj8oZku/srpVURB/ua/N3bSisUHVKu58en CBf690fd6ZLe72k6hAbYHx6XtbUaKuXDUD+YwgvSlKy3zI266zjsPJDRdtht6Cfj9tlu vte0jNGVT2hxCwndlQ7gRhQG5BPdDszqmAPDjTOPbTwpwidPswCuTcwmW143UGyAJdF3 QJtQ== X-Gm-Message-State: APjAAAVv0PyQSrFm3k5Xa5jLrFfyNw7aimZfng0OpciwttwrG/tTqfCh irHGraq/NdSu0CPT+9ENxy+zo66+JIw= X-Google-Smtp-Source: APXvYqyKa86tHQr19td42TH+XykGWOhtwLNz4vGbouJE8K2zBps8nKbwRekm9hKqImTRNJIzXC/jjQ== X-Received: by 2002:a02:487:: with SMTP id 129mr9642865jab.113.1566657881942; Sat, 24 Aug 2019 07:44:41 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id c19sm5614385ioi.22.2019.08.24.07.44.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2019 07:44:41 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 24 Aug 2019 08:44:22 -0600 Message-Id: <20190824144422.235024-11-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190824144422.235024-1-sjg@chromium.org> References: <20190824144422.235024-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 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 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 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