From patchwork Wed Sep 25 14:57: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: 1167467 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="Vy+CRVym"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46djrq2xG1z9sNx for ; Thu, 26 Sep 2019 02:17:46 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 70273C22029; Wed, 25 Sep 2019 16:13:44 +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 6B67AC2223D; Wed, 25 Sep 2019 15:05:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A7899C2223C; Wed, 25 Sep 2019 15:05:27 +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 6D055C220CF for ; Wed, 25 Sep 2019 14:59:10 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id q10so14669575iop.2 for ; Wed, 25 Sep 2019 07:59:10 -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=N9lPT2sa2Rg3An02YQGcFw/cWH2opgvXAuqRIRWeAF8=; b=Vy+CRVymwcrC2S7T6D+gY7U0aVn/OClMstaeIJ6gbITIjrroux6Vv7Li90clvLNCIA CxQ+ZVnMMAS/MxbKNZqStninQ4QfePq+UewHSX3P+gQPkrb9caM8+FMXv7FJld3J3eqw gqDgR/JIHWR8ZnPfgAL3bvyojEcGsw4d1mRtc= 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=N9lPT2sa2Rg3An02YQGcFw/cWH2opgvXAuqRIRWeAF8=; b=JvjuU40zsgtL6UKYLnGxkBrRLSol0fg5CG4QrwZ/tr5TZQ3p/Y4isdvpGbRbxhQtup mME3x6lyg7H65psnsYqHMfiRvvpFjBM2KKX/JYdcK92Yg5y5VrV8AMg4qAlFSOq0754N RbRnvlT8lI79DqbgpLlBeLZNRyALmjRjBQWuk1bpOQX2ct5IJfKOt0pSOqu64uk62Pzj 46GfPHPw/moVB5KaeLb+RfdPjQyoaYxvReO0YR1XgI8vwHyTt+W3bXpdgpiZX7PqXrRJ XWXZMwe2M4cVU6fIFWf4BSkaSKWu2LJSIH4YpAI9QtEr/ujjdAJQwc++Cr8As64HrbGk xopg== X-Gm-Message-State: APjAAAUPHJiXO7k3T+AbxTsSBNzZji1FMXkyDborQYk8Y3Phovqs4q8x 9EHDuLgBw2+71uqpwlGuiIaCpzHnIRk= X-Google-Smtp-Source: APXvYqztaDYkbmtVnu21m0kCFHjRu27j3zu1Ek7u+CBMWx5uWvLVG3EOAzdT//Z7DPMzNH4gqSBfkQ== X-Received: by 2002:a02:7044:: with SMTP id f65mr5761510jac.37.1569423549183; Wed, 25 Sep 2019 07:59:09 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id d9sm4254964ioq.9.2019.09.25.07.59.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 07:59:08 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 08:57:14 -0600 Message-Id: <20190925145750.200592-91-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925145750.200592-1-sjg@chromium.org> References: <20190925145750.200592-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 090/126] x86: Update Kconfig options for 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" Many of the Kconfig options do not apply to FSP2. Update them to use the FSP_VERSION1 condition instead. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/Kconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 47bf28c434f..0de3f6ed7da 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -397,7 +397,7 @@ endchoice config FSP_FILE string "Firmware Support Package binary filename" - depends on HAVE_FSP + depends on FSP_VERSION1 default "fsp.bin" help The filename of the file to use as Firmware Support Package binary @@ -405,7 +405,7 @@ config FSP_FILE config FSP_ADDR hex "Firmware Support Package binary location" - depends on HAVE_FSP + depends on FSP_VERSION1 default 0xfffc0000 help FSP is not Position Independent Code (PIC) and the whole FSP has to @@ -418,7 +418,7 @@ config FSP_ADDR config FSP_TEMP_RAM_ADDR hex - depends on HAVE_FSP + depends on FSP_VERSION1 default 0x2000000 help Stack top address which is used in fsp_init() after DRAM is ready and @@ -426,14 +426,14 @@ config FSP_TEMP_RAM_ADDR config FSP_SYS_MALLOC_F_LEN hex - depends on HAVE_FSP + depends on FSP_VERSION1 default 0x100000 help Additional size of malloc() pool before relocation. config FSP_USE_UPD bool - depends on HAVE_FSP + depends on FSP_VERSION1 default y help Most FSPs use UPD data region for some FSP customization. But there @@ -442,7 +442,7 @@ config FSP_USE_UPD config FSP_BROKEN_HOB bool - depends on HAVE_FSP + depends on FSP_VERSION1 help Indicate some buggy FSPs that does not report memory used by FSP itself as reserved in the resource descriptor HOB. Select this to @@ -600,7 +600,7 @@ config VGA_BIOS_ADDR config HAVE_VBT bool "Add a Video BIOS Table (VBT) image" - depends on HAVE_FSP + depends on FSP_VERSION1 help Select this option if you have a Video BIOS Table (VBT) image that you would like to add to your ROM. This is normally required if you