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 5E15EC433EF for ; Wed, 30 Mar 2022 22:09:42 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9558684172; Thu, 31 Mar 2022 00:08:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id A011E841B1; Thu, 31 Mar 2022 00:07:58 +0200 (CEST) Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (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 5941D8418C for ; Thu, 31 Mar 2022 00:07:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f54.google.com with SMTP id kk12so18141791qvb.13 for ; Wed, 30 Mar 2022 15:07:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DdUatVMk0m6B7xgLdNQDMxgb1pYQU6HDKqRzHxDtzDw=; b=fRmNaQ95oWyghngh3fgOfVGgm8lRoofTNNcutQAFBRn9OEgZtU0x0XB0OBf3dStrhB 5VSCssVKZ7V8YvRLHjXSXzkWX4Yir0CPPk38Sq9KXFDK4jg3l7mNVZ7ph7hr9qV9yIJI 0Fe1XO1yh9/vSb7g0b07x9bbbvixI46xTQRH6+RijzNaJpI6VG6EI/QdAGzNAyU9KVKE ny5hc9CYQkn1uZ/hGbBG3lTC+xNyoOxTwuMUlUoEbEn+Kuu0OaLX9H+WtXyPXg5r0glY TpjTEQdnO4bcJbqlI0bq3xr9liTnZFJ2yI5UHqEjInsddfYGwVizK2X+WfgrEGeVUnQo MYJA== X-Gm-Message-State: AOAM5302CZv+e+NLxn6gaW9gMMV16N3kKSZMU9jVqFYkAztcXzXrjpqL SC5MQ5ZktbTYrHAKCmbPPrtgkENNbw== X-Google-Smtp-Source: ABdhPJxjB6SckO9KoApvJMha2D8nKCJ+HYmYnI7A6aCmM6XnoxMVc/tn8uPCJRd8/ysaN8b0AtD0uA== X-Received: by 2002:a05:6214:240a:b0:443:5288:f135 with SMTP id fv10-20020a056214240a00b004435288f135mr17540453qvb.77.1648678065937; Wed, 30 Mar 2022 15:07:45 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id h2-20020ac85842000000b002e1ec550506sm17749694qth.87.2022.03.30.15.07.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 15:07:45 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 11/25] Convert CONFIG_CONS_SCIF0 et al to Kconfig Date: Wed, 30 Mar 2022 18:07:21 -0400 Message-Id: <20220330220735.908616-11-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220330220735.908616-1-trini@konsulko.com> References: <20220330220735.908616-1-trini@konsulko.com> 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.5 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_CONS_SCIF0 CONFIG_CONS_SCIF1 CONFIG_CONS_SCIF2 CONFIG_CONS_SCIF4 CONFIG_CONS_SCIFA0 Signed-off-by: Tom Rini --- drivers/serial/Kconfig | 21 +++++++++++++++++++++ include/configs/alt.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/kzm9g.h | 1 - include/configs/lager.h | 1 - include/configs/porter.h | 1 - include/configs/r2dplus.h | 1 - include/configs/rcar-gen3-common.h | 1 - include/configs/silk.h | 1 - include/configs/stout.h | 1 - 12 files changed, 21 insertions(+), 11 deletions(-) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 610f8062c76b..f52422504b03 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -782,6 +782,27 @@ config SCIF_CONSOLE on systems with RCar or SH SoCs, say Y to this option. If unsure, say N. +choice + prompt "SCIF console port" + depends on SCIF_CONSOLE && (!DM_SERIAL || (SPL && !SPL_DM_SERIAL)) + +config CONS_SCIF0 + bool "SCIF0" + +config CONS_SCIF1 + bool "SCIF1" + +config CONS_SCIF2 + bool "SCIF2" + +config CONS_SCIF4 + bool "SCIF4" + +config CONS_SCIFA0 + bool "SCIFA0" + +endchoice + config UNIPHIER_SERIAL bool "Support for UniPhier on-chip UART" depends on ARCH_UNIPHIER diff --git a/include/configs/alt.h b/include/configs/alt.h index acc416de06bd..1656072ebb4d 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -42,7 +42,6 @@ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 #ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF2 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 #endif diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 18e1e401ae68..f144302a71d2 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -33,7 +33,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* SCIF */ -#define CONFIG_CONS_SCIF1 #define SCIF0_BASE 0xe6c40000 #define SCIF1_BASE 0xe6c50000 #define SCIF2_BASE 0xe6c60000 diff --git a/include/configs/gose.h b/include/configs/gose.h index dfa139dc7dc1..9015cabc2d17 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -37,7 +37,6 @@ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 #ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 #endif diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 84603e354020..3fef4150b25c 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -37,7 +37,6 @@ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 #ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 #endif diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index c20ef5f69685..f35549d95acb 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* SCIF */ -#define CONFIG_CONS_SCIF4 #undef CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/lager.h b/include/configs/lager.h index 8cabad2853c9..df3b4bbce072 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -38,7 +38,6 @@ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 #ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 #endif diff --git a/include/configs/porter.h b/include/configs/porter.h index 661b7ea0cd2a..964ce7def64b 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -42,7 +42,6 @@ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 #ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 #endif diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 869f9f52ae11..54674094e83b 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -4,7 +4,6 @@ #define __LITTLE_ENDIAN__ 1 /* SCIF */ -#define CONFIG_CONS_SCIF1 1 /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE 0x8C000000 diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index c3759ed19bf0..5bb6bf3d7822 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -60,7 +60,6 @@ #define CONFIG_SPL_STACK 0xe6304000 #define CONFIG_SPL_MAX_SIZE 0x7000 #ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF2 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 #endif diff --git a/include/configs/silk.h b/include/configs/silk.h index fa195c62d56c..ec8740b3826d 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -42,7 +42,6 @@ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 #ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF2 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 #endif diff --git a/include/configs/stout.h b/include/configs/stout.h index f9574be3f776..4ddbea5b1d06 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -46,7 +46,6 @@ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 #ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIFA0 #define CONFIG_SH_SCIF_CLK_FREQ 52000000 #endif -- 2.25.1