From patchwork Tue Mar 14 23:59:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1757098 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=WI0AdqyO; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbrCy1HXpz246q for ; Wed, 15 Mar 2023 11:01:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8DADE8622C; Wed, 15 Mar 2023 01:01:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="WI0AdqyO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4665F8620D; Wed, 15 Mar 2023 01:00:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EED938620D for ; Wed, 15 Mar 2023 01:00:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id l9so6409561iln.1 for ; Tue, 14 Mar 2023 17:00:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678838404; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hB/Xk2AppKd3+gsG86iKGVmjQoSp6rkffohdtq/8/I8=; b=WI0AdqyOR1KSdqk5t8dERP9wBBHIRHC8VeXdhZ7O3b7wzmOltprqyhPhAlR5uHjd+7 daJsco4Zihnm9gsdt6O07q1oB7b1jHOHk5s5JUoCnSKr4jtyBPggKTsSUlZm2armRKRW yIpchRwB553/cCKtyADmCyCp+J8rmMRiorIFY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678838404; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hB/Xk2AppKd3+gsG86iKGVmjQoSp6rkffohdtq/8/I8=; b=E+DtjSNwAli8X9zU5D1qBzABqsN9Q6PLuD63XJ91rd3qBo6Ub8NpUsKxwGyL/FhsYc 6LqdeG8KZoSWIeVhNVTVo0jQAQRQ+OHvMHEXzvgFA2XbHOBpLqkZDkTq2JJIF4QkJl5E 20UhIhBW545elr2UtCJYuL4Cvv+jHVd4Qs3a+DJFiczkTJIa0PLXZuusm86jGzDcJ2No GwAVXc+6OtS1JfFuJnDi8rdUpQlwP2BdnSqF5JWFiymAbYEm4/C9MFmnzi+dYBdvbhDl yAyHMjEU8Wp7Y03kqGGGnEG/D1l4OCj8J4+IzlFHfeSSqiJvKvFJqPb++UUb3NLUT02U f4Rg== X-Gm-Message-State: AO0yUKX29o+7Yj6e2mcDA6DhPYOooxxhAbBmrwPUkeiY6CVaaHHJbyzF 3Umd2QO7O59yiXBoWrufxJuzItihfG6Tu3uTXpk= X-Google-Smtp-Source: AK7set9vzBfZ9RV3Ea5stR1q2QFXJkxfGsCGb4GFONtdrHxozflVriGXRJ+LfxPwGJH3uPjzJpLvfw== X-Received: by 2002:a05:6e02:10d2:b0:316:4174:b065 with SMTP id s18-20020a056e0210d200b003164174b065mr3303264ilj.15.1678838404281; Tue, 14 Mar 2023 17:00:04 -0700 (PDT) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id y9-20020a92c749000000b0031944d1ce5dsm1143751ilp.58.2023.03.14.17.00.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 17:00:03 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Stefan Roese Subject: [PATCH v3 4/5] x86: dfi-bt700: Fix up adjustment of CONFIG_TEXT_BASE Date: Tue, 14 Mar 2023 17:59:54 -0600 Message-Id: <20230314235955.973727-4-sjg@chromium.org> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog In-Reply-To: <20230314235955.973727-1-sjg@chromium.org> References: <20230314235955.973727-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean With recent CONFIG_TEXT_BASE changes, there are inconsistencies between several settings. Adjust CONFIG_SYS_MONITOR_LEN to allow more code space. Move the MRC cache out of the way too. Signed-off-by: Simon Glass Fixes: 5d1c8342aea ("x86: dfi-bt700: Adjust CONFIG_TEXT_BASE") Reviewed-by: Bin Meng Reviewed-by: Stefan Roese --- Changes in v3: - Add new patch arch/x86/dts/dfi-bt700.dtsi | 2 +- configs/dfi-bt700-q7x-151_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/dts/dfi-bt700.dtsi b/arch/x86/dts/dfi-bt700.dtsi index dff2345d60d0..c077a84574f1 100644 --- a/arch/x86/dts/dfi-bt700.dtsi +++ b/arch/x86/dts/dfi-bt700.dtsi @@ -204,7 +204,7 @@ memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; - reg = <0x006f0000 0x00010000>; + reg = <0x005f0000 0x00010000>; }; }; }; diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index bd8b2e1155d4..a48f7c25134c 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -13,6 +13,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_HAVE_ACPI_RESUME=y CONFIG_SEABIOS=y +CONFIG_SYS_MONITOR_LEN=2097152 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 39c8a87fbeea..82c348884559 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -15,6 +15,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_HAVE_ACPI_RESUME=y CONFIG_SEABIOS=y +CONFIG_SYS_MONITOR_LEN=2097152 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y