From patchwork Wed Sep 25 15:00:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1167472 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="WRwppWhe"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46djv03WTSz9sNx for ; Thu, 26 Sep 2019 02:19:40 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2AACCC22125; Wed, 25 Sep 2019 16:16:37 +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 22734C21F62; Wed, 25 Sep 2019 15:06:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2CF03C21F63; Wed, 25 Sep 2019 15:06:58 +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 21F0BC22160 for ; Wed, 25 Sep 2019 15:02:18 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id c6so14601957ioo.13 for ; Wed, 25 Sep 2019 08:02:18 -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=zq7fFz+U8FgebGVe6bKpDHDrSxCcHN4hfAB+NXbrPVk=; b=WRwppWheRccaW+xUus79M0NjgyRkHB0Jx2qHiD3Uz0b+ablYUhYB24I+rN7GZE4bQq 8ArHQ8Fd5DsWZtvNrwafj5/Z7w1M6a//ZBKGI2wfBllWUxgw7aMh6ibVp29I3oHmwHwx MFsqHftrOQrwN8RRSHL5qArfQU2i0PJVDpKhE= 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=zq7fFz+U8FgebGVe6bKpDHDrSxCcHN4hfAB+NXbrPVk=; b=d7dYUkHUxqaByU8iUI8c6eqrKeHj2ERmA9t24OMPZKcMydT3CgRZgeEiB02bTs8zx1 pCSwtNjeirqOQswp1NcmH7BXdziGwi5bLMyc8L+EAs34J8/SfGq09lMAOepIM4gOJleA eyatVtDRCaaw6CbDdESyn0KP1hm17lbQa1WK7LO8XiymgSYzDBI8hv7XfKRjAsuwoBMi arpFJ/eWSo2fledDN8qdkgD3ZSh1g3R4YYaEqe0hwcwV0t9SIVtSB3wlvs6lDU5OtYRI 2tPAfOalPduNxEjJ2XuLPhLbMyOXakCvzZNISTquQZCCqg/jG7mYzz8YI5ZeAHrK7TTO hNWg== X-Gm-Message-State: APjAAAUb0hMtzYMpUeyzknXMMtXADKAg9qyEASVrGxR1C94oubjzI8o4 zFSD8RpKM+ZMIoDnbzgoFwBrr3cnZqc= X-Google-Smtp-Source: APXvYqxPIL4t/JUfnxAEi2Y8Ju6/vRnvNzqq2khpy5KCSiPhcSpE5jQ6R7oJDnB9DB25aNv1ZlP97Q== X-Received: by 2002:a92:8c86:: with SMTP id s6mr869260ill.298.1569423735870; Wed, 25 Sep 2019 08:02:15 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id 197sm6758613ioc.78.2019.09.25.08.02.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 08:02:15 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 09:00:28 -0600 Message-Id: <20190925150052.201698-103-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925150052.201698-102-sjg@chromium.org> References: <20190925150052.201698-102-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 102/126] x86: Update .dtsi file for FSP2 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" Include the IFWI section and the FSP-M binary. The FSP-T binary is not currently used, as CAR is set up manually. Also drop the FSP binary as this relates only to FSP1. Signed-off-by: Simon Glass --- arch/x86/dts/u-boot.dtsi | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index 35129d0510b..189be2196cb 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -104,12 +104,39 @@ offset = ; }; #endif -#ifdef CONFIG_HAVE_FSP +#ifdef CONFIG_FSP_VERSION1 intel-fsp { filename = CONFIG_FSP_FILE; offset = ; }; #endif +#ifdef CONFIG_FSP_VERSION2 + intel-descriptor { + filename = CONFIG_FLASH_DESCRIPTOR_FILE; + }; + intel-ifwi { + filename = CONFIG_IFWI_INPUT_FILE; + convert-fit; + + section { + size = <0x8000>; + ifwi-replace; + ifwi-subpart = "IBBP"; + ifwi-entry = "IBBL"; + u-boot-tpl { + }; + x86-start16-tpl { + offset = <0x7800>; + }; + x86-reset16-tpl { + offset = <0x7ff0>; + }; + }; + }; + intel-fsp-m { + filename = CONFIG_FSP_FILE_M; + }; +#endif #ifdef CONFIG_HAVE_CMC intel-cmc { filename = CONFIG_CMC_FILE;