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 73BBCC636CD for ; Sun, 5 Feb 2023 23:11:38 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 64DAB8606F; Mon, 6 Feb 2023 00:03:45 +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="C0CGE1/j"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0510C85AEE; Sun, 5 Feb 2023 23:43:13 +0100 (CET) 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 A50D785A73 for ; Sun, 5 Feb 2023 23:42:06 +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 k12so4107886ilv.10 for ; Sun, 05 Feb 2023 14:42:06 -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=HSjsxUtUpuwBVabAA5RbMtAX43loExJ1w2O8geznOK0=; b=C0CGE1/jG2s0htUuwBXfChL5pwYnl+NTrMq0KmorQbbVqEWCwIIAswsuiPdE+eludX zqOzV09wJb4HhFLsaLxu/9NBv8bDsurpeEWLyvbRz+RHHHSjCG2umf2MmcuA/x+aBGM+ qSMyVuCU3aF/7L/VGU/NL75GiTo4P5+imBtko= 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=HSjsxUtUpuwBVabAA5RbMtAX43loExJ1w2O8geznOK0=; b=U448KARjClSSjnNTL8nNSexxf5RVmKMf6Dc1P4s+9QjF+C2j0PRaN0v8XDZkLoi0JQ KdoCJiGncjHuEVoIZVVL2m8zCj4I0VoFyzJCuGQ77PT6kUNw+1XFtivRfWm+E+TzulNH ycWuXQF24VDAfCizOXtKNBBHStgwuGQ6Dwsu5XG7qOoLQ2/k5mjEKTHsf62NzrkxYxlv jIHJiniQEiT26gDaTGY2RLobbo+4VvMqXhm/k3+V7Gcy6Q1sdb1d1+oU559righH3TvP Hu81BY8GgDSYAKkMiS20ihev+Cl6joqEX4UcQcLnL5QkMnTRUxbCbX3BPSE6qGygbrYa TNOg== X-Gm-Message-State: AO0yUKWDuxN1qusINVhMMy6hOyq6jtHzgXe7h0sUmklTsnK5VtWeEdLQ erif3AbimGFHcik+CWY6IhmevauquNwt0rsA X-Google-Smtp-Source: AK7set8UpxOg+TiWQi/2iqaSbZPwBEQBsl6Q4Oid4GhoFa2Ks5sza4dv7M4WS0zYBg9ckALtGtn+CA== X-Received: by 2002:a05:6e02:1a26:b0:313:b792:3da1 with SMTP id g6-20020a056e021a2600b00313b7923da1mr5078169ile.25.1675636925260; Sun, 05 Feb 2023 14:42:05 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:04 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 069/169] Correct SPL uses of DTB_RESELECT Date: Sun, 5 Feb 2023 15:39:38 -0700 Message-Id: <20230205224118.233425-70-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 --- (no changes since v1) 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.519.gcb327c4b5f-goog