Message ID | 20230130151612.212732-157-sjg@chromium.org |
---|---|
State | Changes Requested |
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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=mRnCaFyl; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4P5C022m8Mz23hg for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:34:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 246CA85A4A; Mon, 30 Jan 2023 16:26: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=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="mRnCaFyl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 90887858F0; Mon, 30 Jan 2023 16:19:49 +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-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 0C99D859D0 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:19:22 +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-x133.google.com with SMTP id m15so595870ilh.9 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:19:21 -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=nkoqOeZENfTzDH+XmsITl9ELi/hpD/avjLD8hhCVFc4=; b=mRnCaFylr2+4g5x7kk9TNKCwTJiOlu17fnqqvvczAqVwkoHCL2sdkCcD8rJr753sio w2S6ohltu6F5fqyxtH2+gHaXWbIk5aLnLJnkxwKkCLJbVHruAuxDz4pNwyubKYM5FBwY oJx82T6hVY+DFHJNCoxJVz31FshA5U/WDT1eQ= 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=nkoqOeZENfTzDH+XmsITl9ELi/hpD/avjLD8hhCVFc4=; b=sCIN9LwUUayTJWG4JBcq/XcH7gWr5+jznmajuKaArLnzAb3AM37E3ULp09Fmvm8Fbz jgr+CaAaz6exN8OH5JjpTG9kyw6jiT9NzTtZ/Np8pLc6+bNNRoTSTk5wsTFDhcbob1VQ 51S7aj5Lp6vBp/LAH19rISgGG40jZSg6Xzae2CuhseBMDcn/vNmK/jlkP16oNGnzPm0F iW4jvxd1Xl35xBgqlCBqx6aR9KctyyA71P+Ef92ely3eptIIXf5LuqqV1aPIrC6S5Dix lTw8Z3Ttn3yA1VOs3NzqrWcXCKfi01P4yLowWn4tEWGw8GJwimxygzkQGI2Gcb5cw0kO APMA== X-Gm-Message-State: AO0yUKX/GlRhaDdQ3YqmVDKSUakrWaoFe8vSQ5kwbYhwB7UypXCAYpGi A6QYjRbcmOZtTXX5PMhmhvPu4/3Pp5e1ERni X-Google-Smtp-Source: AK7set/WChmBe3CxRHuPUivZsdMw9OlhsInpzG50NxoyvXmsJ6RTHucIwl76OpkCQGzfN2KUQUu1Xw== X-Received: by 2002:a05:6e02:2181:b0:310:f912:5a7c with SMTP id j1-20020a056e02218100b00310f9125a7cmr2544278ila.25.1675091885811; Mon, 30 Jan 2023 07:18:05 -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 o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:05 -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>, Mathew McBride <matt@traverse.com.au> Subject: [PATCH 156/171] Correct SPL uses of TEN64_CONTROLLER Date: Mon, 30 Jan 2023 08:15:57 -0700 Message-Id: <20230130151612.212732-157-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-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 |
None
|
expand
|
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) {
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 <sjg@chromium.org> --- board/traverse/ten64/ten64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)