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 4A8CDC636CD for ; Mon, 6 Feb 2023 01:01:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8925D86026; Mon, 6 Feb 2023 01:59:33 +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="isiChFKz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2409E8608E; Mon, 6 Feb 2023 01:59:27 +0100 (CET) Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (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 7306685FF8 for ; Mon, 6 Feb 2023 01:58:29 +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-io1-xd29.google.com with SMTP id l7so3956143ioa.7 for ; Sun, 05 Feb 2023 16:58:29 -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=gFw6k6wSZRfNsJuxTEioIOf3erAWwubASrXUq9Mz2jk=; b=isiChFKzLtHuqRP2MjBt29tuexd3w7jyd1kPuAWKMLASoLNTRn2PlC2hQ2s76ofLO8 h49B7qynYjSLeLHf3MeJxYrn+FrDxRk6LqZLYC8QgKe6bAHHBqxc5jfpW9b4PJQb3Z6K mJs4gaNOoYEd1oOW4cj3uZMrRsmSvM/Yiiutw= 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=gFw6k6wSZRfNsJuxTEioIOf3erAWwubASrXUq9Mz2jk=; b=sDhFjKC72riwHqVZQTS1Kcj3z9N7RWYNSJQ6hwkeuxJHUEIBpS9DrPI8nNzEwOdm5F 4d+E+7KJ/V1s1TXWzXTPSqmXtn1F4UIvqLRIeen5xmVItqj/m0rX/VHx6KjekrIYxJ8v bJvyUOm4j50AMJkpwqh9vV+i+UZRuDdQvQrK8garZAo6A/+2iFsWQdLIiBtsnPhCdjxa guKMvYiuEZ1IUkER3KlIhv0vTO0P7Ete96JAW57angCzfOLrGWDcihm2busjD2tCTUqq n/bUX0NAkFXL5UOo6Jgg6uRH5a/TK1QIpeaOfW81qg5Dcnx8SZWdkvlcRsIF+FpP0jET QULQ== X-Gm-Message-State: AO0yUKXr6649iSUqOKE1J4kO0CKPQeI2jFh3+MyOxijY4+hWS2rdkKp9 V+1u18xxwgPENJBRLQ4bGABsdxH6dduB3l+z X-Google-Smtp-Source: AK7set8HdjRky1DpqT8OQFDszTjKhwT3A5O1ADRK6dR3lyFQ9aYkYpI0EoO4/pUtRuweFF43NKvutg== X-Received: by 2002:a5d:890a:0:b0:71e:703b:63fe with SMTP id b10-20020a5d890a000000b0071e703b63femr11063614ion.5.1675645108894; Sun, 05 Feb 2023 16:58:28 -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 b22-20020a6bb216000000b006e2f42a30c2sm2734703iof.35.2023.02.05.16.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 16:58:28 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 154/169] Correct SPL uses of TEN64_CONTROLLER Date: Sun, 5 Feb 2023 17:55:21 -0700 Message-Id: <20230206005537.254541-155-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206005537.254541-27-sjg@chromium.org> References: <20230206005537.254541-27-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_TEN64_CONTROLLER defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) board/traverse/ten64/ten64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 9e4c84ad2f4..5dfb7165c0e 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -97,7 +97,7 @@ int checkboard(void) printf("Unknown boot source %d\n", src); puts("Controller: "); - if (CONFIG_IS_ENABLED(TEN64_CONTROLLER)) { + if (IS_ENABLED(CONFIG_TEN64_CONTROLLER)) { /* Driver not compatible with alpha/beta board MCU firmware */ if (board_rev <= TEN64_BOARD_REV_C) { if (ten64_read_board_info(&boardinfo)) { @@ -375,7 +375,7 @@ static void ten64_board_retimer_ds110df410_init(void) /* Retimer power cycle not implemented on early board * revisions/controller firmwares */ - if (CONFIG_IS_ENABLED(TEN64_CONTROLLER) && + if (IS_ENABLED(CONFIG_TEN64_CONTROLLER) && board_rev >= TEN64_BOARD_REV_C) { ret = board_cycle_retimer(&retim_dev); if (ret) { -- 2.39.1.519.gcb327c4b5f-goog