From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 93D8AC4332F for ; Sun, 20 Nov 2022 14:28:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A559F85529; Sun, 20 Nov 2022 15:18:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="l7OTcTGp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AF6A4854E2; Sun, 20 Nov 2022 15:18:20 +0100 (CET) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (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 D1A7E85423 for ; Sun, 20 Nov 2022 15:18:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x72a.google.com with SMTP id k2so6526403qkk.7 for ; Sun, 20 Nov 2022 06:18:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Y50Gzsi5yrpjBpJ5Us/FTVni/SNsATVb9gyiygo39Ss=; b=l7OTcTGpMb14KnA0O+Bb7JLuEXipXRcpz7E8Uq6zyoB6nSwkpuVB6hJSWMDsKGQDKD U3GIslLqwp0TxTIPLgdZPiLLsZGP6aEfacmS9yiP9E5mttEaUmp4KGvafyCG+aknLF6+ MNCQS4BS684BHl/DBwsYDSeDzGOBc0Dp3acrA= 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y50Gzsi5yrpjBpJ5Us/FTVni/SNsATVb9gyiygo39Ss=; b=39oaxK9z28xywNnqiN/EXSI+dSjdpDebRJsfyT++t89lOu0/eN61edY3xswzuDC4Yt 5DVF3nisjtILixFflJDRzcR+PwXCY5zi9kfW+xIqmnzabqTGtoFQ4JXQA3ogaxATXh4L D64y+e+xrtVYeVTfb9EnNYuwAveZSbcTzNXkcysSjWgnnjYWLSfOwWiTdIHEybsnXaAo 7YHidP9jEA2j7EdgR3WcJxSYgLbi+Rcs4yQMBU2s28Lz6KZmQG3ZwmDgeZWMoRbUhhK1 YqGlF7pA1/VFSvq/XnXSYTbYqp1iQ/Jb37BrV9kvGAaP1dgdfadbDD9XV57rV4lKnvFP tSqA== X-Gm-Message-State: ANoB5pkyna2vDBa1+NDCGzKBgq3u1YsEGvA+/FJeeyR2yBkqNSzV0mnw f5GNU0Knx4v06X31D8OfHn+0qq0cT+F3LA== X-Google-Smtp-Source: AA0mqf5HP/BukEuGCt08niP9sPtUdoolfs0MR3o143IjLoVoz8D3/uAmFe5wIHbj3vNX6Yvt9QD2CQ== X-Received: by 2002:a05:620a:e1c:b0:6fb:a5cc:208a with SMTP id y28-20020a05620a0e1c00b006fba5cc208amr13134980qkm.231.1668953889313; Sun, 20 Nov 2022 06:18:09 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id bk23-20020a05620a1a1700b006ce580c2663sm6400114qkb.35.2022.11.20.06.18.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:18:08 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 238/241] global: Migrate CONFIG_X86_MRC_ADDR to CFG Date: Sun, 20 Nov 2022 09:17:40 -0500 Message-Id: <20221120141743.3059310-39-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120141743.3059310-1-trini@konsulko.com> References: <20221120140829.3057894-90-trini@konsulko.com> <20221120141743.3059310-1-trini@konsulko.com> 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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/x86/cpu/intel_common/mrc.c | 2 +- arch/x86/dts/u-boot.dtsi | 2 +- include/configs/x86-chromebook.h | 2 +- scripts/config_whitelist.txt | 3 ++- tools/binman/binman.rst | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c index a4918fbad61a..69405d740b47 100644 --- a/arch/x86/cpu/intel_common/mrc.c +++ b/arch/x86/cpu/intel_common/mrc.c @@ -200,7 +200,7 @@ static int sdram_initialise(struct udevice *dev, struct udevice *me_dev, debug("PEI data at %p:\n", pei_data); - data = (char *)CONFIG_X86_MRC_ADDR; + data = (char *)CFG_X86_MRC_ADDR; if (data) { int rv; ulong start; diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index 24e692f988d8..454efc17614e 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -86,7 +86,7 @@ #endif #ifdef CONFIG_HAVE_MRC intel-mrc { - offset = ; + offset = ; }; #endif #ifdef CONFIG_FSP_VERSION1 diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index ccd37abe2611..7d93dcbfc2e5 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -6,7 +6,7 @@ #ifndef _X86_CHROMEBOOK_H #define _X86_CHROMEBOOK_H -#define CONFIG_X86_MRC_ADDR 0xfffa0000 +#define CFG_X86_MRC_ADDR 0xfffa0000 #define CONFIG_X86_REFCODE_ADDR 0xffea0000 #define CONFIG_X86_REFCODE_RUN_ADDR 0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e9ca514f3cdb..66173404901d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -252,6 +252,7 @@ CFG_VSC7385_IMAGE CFG_VSC7385_IMAGE_SIZE CFG_WATCHDOG_PRESC CFG_WATCHDOG_RC -CONFIG_X86_MRC_ADDR +CFG_X86EMU_RAW_IO +CFG_X86_MRC_ADDR CONFIG_X86_REFCODE_ADDR CONFIG_X86_REFCODE_RUN_ADDR diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index fda16f1992d7..f50949aa37dd 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -298,7 +298,7 @@ C preprocessor:: #ifdef CONFIG_HAVE_MRC intel-mrc { - offset = ; + offset = ; }; #endif -- 2.25.1