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