Message ID | 20230130151612.212732-117-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=85.214.62.61; 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=Otl9AwtU; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5C5F0pQdz23hS for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:38:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B129185A9D; Mon, 30 Jan 2023 16:27:16 +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="Otl9AwtU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7523E85996; Mon, 30 Jan 2023 16:25:27 +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-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 A6AF185972 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:18:23 +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-x12e.google.com with SMTP id l15so1397476ilj.5 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:18:22 -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=LchWEAS792D4TztjhCcyyyvWD41slNBQ64vP3iIL3kE=; b=Otl9AwtUui/kYPpwfd86VVikYSgdiJMUsWGzAP6dIn7cpOXc+QSOKGwM0oIJNeq7d8 Bq14TYxdNlBpzGXwV2ydMoYUsp9fSyJiiryv10Cm9s079p8bd5kfvYlbJmXfqRaSDg90 JgNFtAglCCqfo0T9Oexfc01v2K1VmJK31zfCs= 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=LchWEAS792D4TztjhCcyyyvWD41slNBQ64vP3iIL3kE=; b=odgxmhNDqVuMHjDBqM34JzvTIdX3dL7i/buyuT1GhVfW8yjqQb2TisQ8mH0CktyFae r1ngJbWcYezsB9gaHHz3BbnKhqeTdH5cMQHVU8JtUBGz5eVZLUszOtOEwu6mdA7OqJKR P+ut+FmgI7n+BuKXVF7G4rL14TVhfxp1qFKpW3dUd7RuSBVDBEPG3AYSDoq+eEdzhhHx po1xEnAkCMTl510GV1kfX8QU6eG/fLRYBtyDQ3IL5bBWVkgV0QPHGMzrHw5G2X5gjKJw xBzH4xRw4UOnvmbAbisTPkJuTFSmN3pq5wMu4BYUvDi4F7sGey4urnFbWoHcvySVq88Q DEzw== X-Gm-Message-State: AO0yUKWEVNusCBFF3yGM5MOeETeG4cE/08og6qjWya+PmDPJtDg56UGk yT6HEs5rctFLTWzE2ZWtPtXvM2i0iT1iUR52 X-Google-Smtp-Source: AK7set9tkHCSH/ccXajeP5FQ3iXJxX/Zhq4PGOeE6YNNoIdsWFeYvUHi1Oa3BYfOmjsUv5c3PeWLfg== X-Received: by 2002:a05:6e02:190d:b0:310:c833:b325 with SMTP id w13-20020a056e02190d00b00310c833b325mr11433049ilu.6.1675091840380; Mon, 30 Jan 2023 07:17:20 -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.17.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:20 -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>, Aaron Williams <awilliams@marvell.com>, Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Subject: [PATCH 116/171] Correct SPL use of OCTEON_SERIAL_PCIE_CONSOLE Date: Mon, 30 Jan 2023 08:15:17 -0700 Message-Id: <20230130151612.212732-117-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/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c index 5adf4ba32c8..c7744e84706 100644 --- a/arch/mips/mach-octeon/cpu.c +++ b/arch/mips/mach-octeon/cpu.c @@ -448,7 +448,7 @@ int arch_misc_init(void) if (ret) return ret; - if (CONFIG_IS_ENABLED(OCTEON_SERIAL_PCIE_CONSOLE)) + if (IS_ENABLED(CONFIG_OCTEON_SERIAL_PCIE_CONSOLE)) init_pcie_console(); if (IS_ENABLED(CONFIG_OCTEON_SERIAL_BOOTCMD))
This converts 1 usage of this option to the non-SPL form, since there is no SPL_OCTEON_SERIAL_PCIE_CONSOLE defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/mips/mach-octeon/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)