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 4613AC54EED for ; Mon, 30 Jan 2023 15:04:30 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 66BD985952; Mon, 30 Jan 2023 16:02:34 +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="RxQQxjyU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D517A85857; Mon, 30 Jan 2023 15:58:19 +0100 (CET) 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 4D4A6857F6 for ; Mon, 30 Jan 2023 15:58:14 +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 d10so5180380ilc.12 for ; Mon, 30 Jan 2023 06:58:14 -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=agXq1+AU+e3RXIIdybELqk9YmQm/NQcRRv83utt0Y7s=; b=RxQQxjyU31G0lmL04hUPcdUP8wceePR2dkp3cLIEsOXYLXMZJXoxfmVbB0FqqcEpad 2Ng4W6YlvEqMG6okEefYGZpH9lff48QIoRl+IP/CFmhasQvj/OJd3h9YZKssFaqQq1IJ t7MKqS8QEn4AmAAmkIgc35s+HmlecnWOIfHLs= 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=agXq1+AU+e3RXIIdybELqk9YmQm/NQcRRv83utt0Y7s=; b=IVLPesf64Ya7UnW/YanyJtRecP2/wuiXQ3tb0r43Ot+zKw6EKk8OuR0U4RUgTaqd3q P7QwaMZs79PFxmxxXuxndRamwkOkzpdUq6Lkd+t708/OydX0u2rm0+7G/7LSd+zq9X9B TrwOP42sPoWIIo16iA5Ej5jFVbQ/D4z8ebZVLPA+eNIbG+djKGhwSbmGa9WJm7TOCE3q ENLjbeN8pAYI0ZkL0VC6peGTXzilKt9wKshPe1S02Z52ZMve4qQmJn/rlkWpBnohKorF tJCMeQDlsyksD6n7C0lbAoAd68HjkknltDhbVQP8GUDUoDoys39HEDImIWFbWNlTGpgL T2lg== X-Gm-Message-State: AFqh2kpyi7L61hk2kvVT1VUECMgfVMOjEzk1sOlAMmMOl2AuU5+fuoeo N3pq1bahyHmUziWqPk6ZlkVS49WjgwZZ+XgO X-Google-Smtp-Source: AMrXdXuKlS+qzlISIbWHBBNocTqGjup6HDYh6ROPQQF6kdOHcSdvFaPBNRs6iSYOALuiCQIG6Adc6w== X-Received: by 2002:a05:6e02:1a0b:b0:30f:526d:3e31 with SMTP id s11-20020a056e021a0b00b0030f526d3e31mr33812950ild.3.1675090692908; Mon, 30 Jan 2023 06:58:12 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek Subject: [PATCH 071/171] Correct SPL uses of DTB_RESELECT Date: Mon, 30 Jan 2023 07:41:44 -0700 Message-Id: <20230130144324.206208-72-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-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 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_DTB_RESELECT defined in Kconfig Signed-off-by: Simon Glass --- board/xilinx/common/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 3dea238466d..35a2f310f4f 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -208,7 +208,7 @@ static int xilinx_read_eeprom_fru(struct udevice *dev, char *name, } fru_capture((unsigned long)fru_content); - if (gd->flags & GD_FLG_RELOC || (_DEBUG && CONFIG_IS_ENABLED(DTB_RESELECT))) { + if (gd->flags & GD_FLG_RELOC || (_DEBUG && IS_ENABLED(CONFIG_DTB_RESELECT))) { printf("Xilinx I2C FRU format at %s:\n", name); ret = fru_display(0); if (ret) { @@ -501,7 +501,7 @@ int __maybe_unused board_fit_config_name_match(const char *name) return -1; } -#if CONFIG_IS_ENABLED(DTB_RESELECT) +#if IS_ENABLED(CONFIG_DTB_RESELECT) #define MAX_NAME_LENGTH 50 char * __maybe_unused __weak board_name_decode(void) -- 2.39.1.456.gfc5497dd1b-goog