From patchwork Tue Mar 14 23:59:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1757095 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=ezj2Kxf7; 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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbrBx4Gzcz246q for ; Wed, 15 Mar 2023 11:00:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5756E85ECA; Wed, 15 Mar 2023 01:00:35 +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="ezj2Kxf7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 49B2D86223; Wed, 15 Mar 2023 01:00:12 +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=ham 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 936D0857F0 for ; Wed, 15 Mar 2023 01:00:03 +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 i19so9495569ila.10 for ; Tue, 14 Mar 2023 17:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678838402; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ex7J3HGA9mn6kwfibzQBZnVR3Vb3GLCHcn5OZEXND5I=; b=ezj2Kxf7r0JNYUp/kTQ7uyYLFrn9fNzmWD4+zzfAA6w4eQM57R9KC09wcvDxB9wriF Nl2cUcV0sR6LNFYICBkMiQh9WCRy+8/QZgctWjxwJH9b3pdUQM1Gr/JX1bMTmHYy0ETe ifOLyWJapGPNuYi9JOM+4ErU/QKQcsZdD4P8Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678838402; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ex7J3HGA9mn6kwfibzQBZnVR3Vb3GLCHcn5OZEXND5I=; b=qE0CP92KQTv2ekyGOf1uE4nAhZAsD7xqqVJN8OZgSn9ILBrTeSHEyosHmAsbboIxO/ iMrQey9RUiPebCW4vP03LvEuFJPIQR3YS7JJa+7VcZZmwq3caNK1nNl9kGVGILCDRdkz YE297V4dDzZ4L/Gr46HulbEes26Q/BPNq8IQo5JfvKkEVFa+d7BUlQxKkMQTLw7o48/r 6GarKi3YX39VrlLzbB29z+SIboOMCxg8WgZb+fBdsTl1HTLqC4QblcS2rwSMYRHP9GUo agCJco48IDPjVSGbu/KA/tKmUu9dxEo5JbHmXpHvCLMMAC7+gd41VJtBqudBOX6uWupy ISLA== X-Gm-Message-State: AO0yUKVXNGtSD+MSO+C8J7S8RLEzES5NQSYy0fR1w3xUj2YZjyEDhGwB GKaQ/nmik6tpkaRbByFn1OE8QAaqG3nH90NgXc4= X-Google-Smtp-Source: AK7set9EEUKwErHniQSLMBmf1JaGfdZp0RB0/i0vCfBdS7N8eau/pn9C2LraNliDmxfzznGxsEy1kA== X-Received: by 2002:a92:d10c:0:b0:322:fa92:7d60 with SMTP id a12-20020a92d10c000000b00322fa927d60mr3093228ilb.0.1678838401908; Tue, 14 Mar 2023 17:00:01 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 17:00:01 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass Subject: [PATCH v3 1/5] x86: minnowmax: Fix up adjustment of CONFIG_TEXT_BASE Date: Tue, 14 Mar 2023 17:59:51 -0600 Message-Id: <20230314235955.973727-1-sjg@chromium.org> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog 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. Add documentation on how to make this change safely. Signed-off-by: Simon Glass Fixes: 66e2c665f ("x86: minnowmax: Adjust CONFIG_TEXT_BASE") Reviewed-by: Bin Meng --- Changes in v3: - Squash commits - Fix ordering of Environment in docs - Fix value of CONFIG_TEXT_BASE in docs - Change the commit message and subject Changes in v2: - Add new patch which boots while still enabling EFI_LOADER arch/x86/dts/minnowmax.dts | 2 +- configs/minnowmax_defconfig | 1 + doc/board/intel/minnowmax.rst | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts index 68e0510c68d8..466309f2b8d5 100644 --- a/arch/x86/dts/minnowmax.dts +++ b/arch/x86/dts/minnowmax.dts @@ -206,7 +206,7 @@ memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; - reg = <0x006f0000 0x00010000>; + reg = <0x005f0000 0x00010000>; }; }; }; diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 679b6e3de535..b93c0d729f80 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -18,6 +18,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/doc/board/intel/minnowmax.rst b/doc/board/intel/minnowmax.rst index 1ba25b50d21b..d0286bd99374 100644 --- a/doc/board/intel/minnowmax.rst +++ b/doc/board/intel/minnowmax.rst @@ -54,9 +54,9 @@ Offset Description Controlling config 000000 descriptor.bin Hard-coded to 0 in ifdtool 001000 me.bin Set by the descriptor 500000 +5f0000 MRC cache CONFIG_ENABLE_MRC_CACHE +600000 u-boot-dtb.bin CONFIG_TEXT_BASE 6ef000 Environment CONFIG_ENV_OFFSET -6f0000 MRC cache CONFIG_ENABLE_MRC_CACHE -700000 u-boot-dtb.bin CONFIG_TEXT_BASE 7b0000 vga.bin CONFIG_VGA_BIOS_ADDR 7c0000 fsp.bin CONFIG_FSP_ADDR 7f8000 (depends on size of fsp.bin) @@ -68,3 +68,14 @@ Overall ROM image size is controlled by CONFIG_ROM_SIZE. Note that the debug version of the FSP is bigger in size. If this version is used, CONFIG_FSP_ADDR needs to be configured to 0xfffb0000 instead of the default value 0xfffc0000. + +If you want to change CONFIG_TEXT_BASE from the current value of ffe00000 +you need to check a few other things. CONFIG_SYS_MONITOR_BASE should +automatically update to be the same as CONFIG_TEXT_BASE but +CONFIG_SYS_MONITOR_LEN may need to be adjusted too. It must cover the space +from the start of U-Boot to the end of the RAM, since the 16-bit boot needs to +be able to jump to U-Boot. See the end of arch/x86/lib/fsp1/fsp_car.S which +has these values. + +Also check the MRC cache address in the devicetree ("rw-mrc-cache"). It must +not overlap with U-Boot. From patchwork Tue Mar 14 23:59:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1757094 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=nkJGIobp; 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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbrBZ12pYz246q for ; Wed, 15 Mar 2023 11:00:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CCA69861AA; Wed, 15 Mar 2023 01:00:19 +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="nkJGIobp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8705C86220; Wed, 15 Mar 2023 01:00:11 +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=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 2893785EC3 for ; Wed, 15 Mar 2023 01:00:04 +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-x133.google.com with SMTP id y12so5298970ilq.4 for ; Tue, 14 Mar 2023 17:00:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678838402; 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=DLq6L8KsQsFG1Y1TFTi/hWibLShghIfA6oZfSrh5UiU=; b=nkJGIobpqFklQ7jJ8B9O+VCGdfv35xtFevLE+eXMT7xK23ChD8J9Lah79cKTUtClZF SGfuYUxYx7XfVfKL6LzY1veV+shbya/SdglZ9DG+TEPe1o30aw1EdWWQrMFjUAr7POcu hEGfywy3Yh8XXf99IWZQFYpUbmCHcZyaEvmN8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678838402; 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=DLq6L8KsQsFG1Y1TFTi/hWibLShghIfA6oZfSrh5UiU=; b=oDRoK2etzRouPgzdju8WGTh4Cxp5/d9w6fE/U4hkV/Rv8EtEJ3bjeaioDPQhDJ2RSk 7k6qAV5cnkNtkoZmSYBwxnOBkB/fo7zQWFaKCjV1WdGqQNiSJ790LYkvS7o+LuhSQV+X x6yXcfffLqHqRpbpCAx3dQK/XosHV3vAxsSn6mRejdcQ5vBV9W3t3ZS7+niMZD3XyAqT NTy4wouxvc1NMHTdJbQ0jOE0s3x/8iE/6AKwHR0gl86erv5PSruedGaFT9m7pQHYrA0w trwyMCIxhCEGvx9lINY0p0HTDR0hAcnEzaLuzm0Y13FX/PmeZBXq1B+YvlBrh5Nm/FHy E7MQ== X-Gm-Message-State: AO0yUKVhKqUABUxkkDh26jmBF7yl2vcut2AVroase8hJmwkCDS5JK6g7 oSvmIGHWzqwn9qR4z7/5eZYWnayAnIc+Ug9hOzE= X-Google-Smtp-Source: AK7set/5yhmQr51aLv7hBqU++hU4drkM6w3Xt7jjLTs06tmCTfWFWNC0PFbuyLngNuHfLNwnpWWTOA== X-Received: by 2002:a05:6e02:1526:b0:315:375c:dc5a with SMTP id i6-20020a056e02152600b00315375cdc5amr4640853ilu.20.1678838402654; Tue, 14 Mar 2023 17:00:02 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 17:00:02 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass Subject: [PATCH v3 2/5] x86: bayleybay: Fix up adjustment of CONFIG_TEXT_BASE Date: Tue, 14 Mar 2023 17:59:52 -0600 Message-Id: <20230314235955.973727-2-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: f38be308683 ("x86: bayleybay: Adjust CONFIG_TEXT_BASE") Reviewed-by: Bin Meng --- Changes in v3: - Add new patch arch/x86/dts/bayleybay.dts | 2 +- configs/bayleybay_defconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/dts/bayleybay.dts b/arch/x86/dts/bayleybay.dts index b92729dd0b0b..f4cbbd61dffe 100644 --- a/arch/x86/dts/bayleybay.dts +++ b/arch/x86/dts/bayleybay.dts @@ -182,7 +182,7 @@ memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; - reg = <0x006e0000 0x00010000>; + reg = <0x005e0000 0x00010000>; }; }; }; diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 14d435076da8..5035ccb78b04 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -14,6 +14,7 @@ CONFIG_VGA_BIOS_ADDR=0xfffb0000 CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_SEABIOS=y +CONFIG_SYS_MONITOR_LEN=2097152 CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y From patchwork Tue Mar 14 23:59:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1757096 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=P0GLn8OF; 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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbrCH6wSzz246q for ; Wed, 15 Mar 2023 11:01:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 25CB686220; Wed, 15 Mar 2023 01:00:48 +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="P0GLn8OF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 15CBA86223; Wed, 15 Mar 2023 01:00:25 +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-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 046EE861DB for ; Wed, 15 Mar 2023 01:00:04 +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-x12c.google.com with SMTP id bp11so4110729ilb.3 for ; Tue, 14 Mar 2023 17:00:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678838403; 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=LOm70ypFKEApvwjX9/eGmMGedIUa+HsQoC8rvcVRNE8=; b=P0GLn8OFcOse4uCm/c+jwgk//yo0Z/LGFpvDiM2jyBdWp16JkH4zKcQ19+3a80N7R/ Pt1jiwdpDH4mP1OSCaanvItI9dJMdiMzik5sbmRRsmrESlRVeyurOk20gVnP9ZeU+qmP e+rY4QsAGBXEc2onOqOlS1lWG/fRBHlLAPLP4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678838403; 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=LOm70ypFKEApvwjX9/eGmMGedIUa+HsQoC8rvcVRNE8=; b=WSWabDa52ysXNsPLXduyCdgk05l4WMLV6DBJkNmD7enrIqiFYg+qLV8F8ZoJdBdv1m w6BkyjG/KZQJaW9JjC3h7GDqfOmuubgGsYfQI7Oley6CGzEl4n7JfW5YqWcQSRdhhY7O E22lUzSI9hmp67ZaFajzn+LbrhHDTzUJfV6RB0XWGSR2fKmkqXf3ksw8NrcM5NMEw8cl Eq3OznvJ8KHAp4BFXKSLpTr8rpWjFtgHx3HpoJKl9kvvN6gvixmQJb7ViG/P85pc/7F1 I0i3b8aWRPHWaal+fjsRJ5Cr6N1/VDG9RbQyCDxzz/1HJVRM0eo4fom3zFGA+L/EFZ0p DRZA== X-Gm-Message-State: AO0yUKX1HtcnUOvHUM+xUOTFz9lPxCRtUwfvZp/Ntbqg8DMeKbGcDxGw m1eskN6rQKp+GH8d8YjxO1/+y3s5otOE5iEEtdQ= X-Google-Smtp-Source: AK7set/qaUAVUSAI88KwQkdejNwBPvnVYqu3VBGQc17QF3F85qa5rDA3VHOlezijGS9RbEeBIoLgXA== X-Received: by 2002:a92:cb0d:0:b0:316:e6e4:570b with SMTP id s13-20020a92cb0d000000b00316e6e4570bmr3468419ilo.11.1678838403396; Tue, 14 Mar 2023 17:00:03 -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.02 (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 3/5] x86: conga-qeval20-qa3-e3845: Fix up adjustment of CONFIG_TEXT_BASE Date: Tue, 14 Mar 2023 17:59:53 -0600 Message-Id: <20230314235955.973727-3-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: 388f93f9635 ("x86: conga-qeval20-qa3-e3845: Adjust CONFIG_TEXT_BASE") Reviewed-by: Bin Meng Reviewed-by: Stefan Roese --- Changes in v3: - Add new patch arch/x86/dts/conga-qeval20-qa3-e3845.dts | 2 +- configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/dts/conga-qeval20-qa3-e3845.dts b/arch/x86/dts/conga-qeval20-qa3-e3845.dts index 705157ceaa33..d11e789945ac 100644 --- a/arch/x86/dts/conga-qeval20-qa3-e3845.dts +++ b/arch/x86/dts/conga-qeval20-qa3-e3845.dts @@ -193,7 +193,7 @@ memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; - reg = <0x006f0000 0x00010000>; + reg = <0x005f0000 0x00010000>; }; }; }; diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 3a84190bbfdc..f1bfc9653ca7 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -18,6 +18,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/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index bb8b9ef312a6..09d08a842f09 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -14,6 +14,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-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig index 74c4a4967d0f..00fa3544bd10 100644 --- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig @@ -17,6 +17,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-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig index 194b0519ea22..7cf8c551451e 100644 --- a/configs/theadorable-x86-conga-qa3-e3845_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig @@ -16,6 +16,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 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 From patchwork Tue Mar 14 23:59:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1757097 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=85.214.62.61; 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=Hm3iT3gd; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4PbrCd60QVz246q for ; Wed, 15 Mar 2023 11:01:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C7E458621E; Wed, 15 Mar 2023 01:00:56 +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="Hm3iT3gd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BB80A861DB; Wed, 15 Mar 2023 01:00:27 +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=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 98C8286203 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-x133.google.com with SMTP id y12so5299031ilq.4 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=1678838405; 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=wHCc0i2qiQjsZKIJlhpAlu8p3lxB9DZpHJbQhgEk2Wc=; b=Hm3iT3gdVssGqFGrzqVdT2EctKsvYqtvzr4nFqp2VJtPCMU2FgCoeFpgSZvVxRYcN+ 3O5PoWvcQoATNoDTdfiJuWWqX9eFwBpmugI6W6U+wCAHtLsrieArJtaVHBj4n7qmLpDf kD+TaYWmpcI+WRFmMpbQqCOsF5+QWl2dyIRkE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678838405; 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=wHCc0i2qiQjsZKIJlhpAlu8p3lxB9DZpHJbQhgEk2Wc=; b=Oz6CvIrVxQAkn/yUbUoHMbeU64F5Gz19lhlPY6Tb/GryM1xlh80yj6tgDuKWN5AjJw oS0YJq3MVfbUHhKfSC6rRr0vKcqtwUIr9gdZPSS36+5iysPNtph0xSfZBTmUY6irZmIx 08egLw+zQ0w2bekhg5MNdIwfm9pe8AKvm4IQTlM/grxzljA8oRIL2vSk8JCmNwrhV1wV uvxQ6GqjmbPCpoBQNl5Z5YMgQDDoR0KvvpRhzEvsGaEvIRXiuHiWJuoCTFm0xDYK2vTH gIB8Wkv95tEfRJZZxnHojGzuEjd1lFMfZZvZej02z/tRq6LWZNbdkqswyvwbO2WVfDjJ GrCA== X-Gm-Message-State: AO0yUKW+gvH3neU9PoN/kEgQvOVj7SlcK6FzpjBMqclN4UUfZkrIKVW0 Ppn8mLAlGt7yk4femSjhq13VS+PuEc4+KY4V7Ns= X-Google-Smtp-Source: AK7set+Tg7CaK5s5Hb1c7trEzI+7IN+Y80mc9tqpbWjnrWYfauaJaG0QTW4kYQOcvFd78ORTn81coQ== X-Received: by 2002:a92:d850:0:b0:317:9af1:5b8f with SMTP id h16-20020a92d850000000b003179af15b8fmr3519758ilq.21.1678838405053; Tue, 14 Mar 2023 17:00:05 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 17:00:04 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , George McCollister Subject: [PATCH v3 5/5] x86: som-db5800-som-6867: Fix up adjustment of CONFIG_TEXT_BASE Date: Tue, 14 Mar 2023 17:59:55 -0600 Message-Id: <20230314235955.973727-5-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: e23cae30801 ("x86: som-db5800-som-6867: Adjust CONFIG_TEXT_BASE") Reviewed-by: Bin Meng --- Changes in v3: - Add new patch arch/x86/dts/baytrail_som-db5800-som-6867.dts | 2 +- configs/som-db5800-som-6867_defconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/dts/baytrail_som-db5800-som-6867.dts b/arch/x86/dts/baytrail_som-db5800-som-6867.dts index e9b56de7927b..ca7d97f2d48b 100644 --- a/arch/x86/dts/baytrail_som-db5800-som-6867.dts +++ b/arch/x86/dts/baytrail_som-db5800-som-6867.dts @@ -206,7 +206,7 @@ memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; - reg = <0x006f0000 0x00010000>; + reg = <0x005f0000 0x00010000>; }; }; }; diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index c4752a2b0a5c..73813500fa11 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -15,6 +15,7 @@ CONFIG_HAVE_VGA_BIOS=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_SEABIOS=y +CONFIG_SYS_MONITOR_LEN=2097152 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y