Message ID | 20230206190550.1692420-64-sjg@chromium.org |
---|---|
State | RFC |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) 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=n5/573DY; 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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P9bjn0X0Qz23r8 for <incoming@patchwork.ozlabs.org>; Tue, 7 Feb 2023 06:22:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C84288613C; Mon, 6 Feb 2023 20:13: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="n5/573DY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E6B3B85C2A; Mon, 6 Feb 2023 20:10:41 +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-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 E6A5985CB8 for <u-boot@lists.denx.de>; Mon, 6 Feb 2023 20:10:02 +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-x134.google.com with SMTP id s10so749977iln.6 for <u-boot@lists.denx.de>; Mon, 06 Feb 2023 11:10:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=Sq+UTpUYqYdChQvOgoEMWXT/xNTYGJo45H08wriSk1s=; b=n5/573DYXb8MJ6xfNlFVKx18z//DCQT3pN+ok8J4cfcN2zYtVoCkCxjmNiwhs3iGGQ 8m/dqya1gOSFMESidkQo3geDuOY1QzGUuBKswceMBoHkM23hX1IVW4rST1lp7CgSgZoZ QhtvmGHszt8ss7jgecmrzSEuhFp9r9JsQhsYI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Sq+UTpUYqYdChQvOgoEMWXT/xNTYGJo45H08wriSk1s=; b=O2he85M8CrRUjsAyza9PWyK668s6NkBIwWRf2NqcPoO4BzWPBW65q1gE3M7i+LQoBa KLm6OMQce+bFIvt6ed7xR2uQA3dv1CVvQ5Nq4UCMzhzLWGoN9BPRyfoTjI+NVxUbD6on lrPrb6nfWzpZISIVuphD3sIjlYD3uPUuL9ludXX8uu8RHggPsKeJIopzX3BfaaITamL4 tnaeCUYMVyyK3AfWOe7SO2Lc447am8E3GImeIP/znG7cNzkvMQ5i7iPJQAr9WAXBHDOz MIFwn/MnHmhXTGGGXC6SiAIfpjlUwXYihGt46pFakYyTAMZqUhLkpyTB02/wU/tXl3ge LhIQ== X-Gm-Message-State: AO0yUKUkWzSL5q1pXoZEAoN1FJ28JdHLJk+UPj53GBftJBF1Ti4Gg8Qg 2Sst9JtrYinKJAV5+VynQOSj4Zqhq/Vwp98f X-Google-Smtp-Source: AK7set+D/PRKeS7L88ryj/qj7rGh36/3D7REQobQPZzAxkImtRUMQUYCDGe7jI7FCRdzDtjvPQSrsA== X-Received: by 2002:a92:7402:0:b0:313:b792:3da1 with SMTP id p2-20020a927402000000b00313b7923da1mr206294ilc.25.1675710581062; Mon, 06 Feb 2023 11:09:41 -0800 (PST) Received: from kea.bld.corp.google.com ([2620:15c:183:200:34e9:6977:1cac:fd32]) by smtp.gmail.com with ESMTPSA id t24-20020a028798000000b00375a885f908sm749878jai.36.2023.02.06.11.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 11:09:40 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Bin Meng <bmeng.cn@gmail.com> Subject: [PATCH v3 63/81] x86: Fix monitor base for split config Date: Mon, 6 Feb 2023 12:05:31 -0700 Message-Id: <20230206190550.1692420-64-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206190550.1692420-1-sjg@chromium.org> References: <20230206190550.1692420-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
RFC: Migrate to split config
|
expand
|
diff --git a/arch/x86/cpu/intel_common/car2.S b/arch/x86/cpu/intel_common/car2.S index f8cf78586d0..c4f64b17694 100644 --- a/arch/x86/cpu/intel_common/car2.S +++ b/arch/x86/cpu/intel_common/car2.S @@ -443,6 +443,6 @@ ucode_base: /* Declared in microcode.h */ .globl ucode_size ucode_size: /* Declared in microcode.h */ .long 0 /* microcode size */ - .long CONFIG_SYS_MONITOR_BASE /* code region base */ - .long CONFIG_SYS_MONITOR_LEN /* code region size */ + .long CONFIG_PPL_SYS_MONITOR_BASE /* code region base */ + .long CONFIG_PPL_SYS_MONITOR_LEN /* code region size */ #endif
This currently makes SPL refer to its own address. Use the PPL symbol to avoid this. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) arch/x86/cpu/intel_common/car2.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)