From patchwork Mon Apr 9 01:34:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 896076 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tuxera.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40KCXj1fq7z9s1p for ; Mon, 9 Apr 2018 11:35:01 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AA5D6C21DA2; Mon, 9 Apr 2018 01:34:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 35DA9C21C27; Mon, 9 Apr 2018 01:34:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 67479C21BE5; Mon, 9 Apr 2018 01:34:51 +0000 (UTC) Received: from mx1.mpynet.fi (mx1.mpynet.fi [82.197.21.84]) by lists.denx.de (Postfix) with ESMTPS id EEE9FC21BE5 for ; Mon, 9 Apr 2018 01:34:50 +0000 (UTC) From: Tuomas Tynkkynen To: Date: Mon, 9 Apr 2018 04:34:33 +0300 Message-ID: <20180409013434.9583-1-tuomas@tuxera.com> X-Mailer: git-send-email 2.16.3 MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: none Subject: [U-Boot] [PATCH 1/2] ARM: s32v234evb: Set CONFIG_DM & CONFIG_DM_SERIAL in Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" These symbols are declared in Kconfig, so it's wrong to set them in header files. Note that this is not size-neutral - some 'default y' options will now get turned on by Kconfig, such as CONFIG_CMD_DM=y and CONFIG_DM_STDIO=y. Signed-off-by: Tuomas Tynkkynen --- configs/s32v234evb_defconfig | 3 ++- include/configs/s32v234evb.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/s32v234evb_defconfig b/configs/s32v234evb_defconfig index a28d24ce0b..5d98d15324 100644 --- a/configs/s32v234evb_defconfig +++ b/configs/s32v234evb_defconfig @@ -2,11 +2,12 @@ CONFIG_ARM=y CONFIG_TARGET_S32V234EVB=y CONFIG_SYS_TEXT_BASE=0x3E800000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_MALLOC_F=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/s32v234evb/s32v234evb.cfg" CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyLF0 root=/dev/ram rw" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_CMD_BOOTZ=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DM=y +CONFIG_DM_SERIAL=y CONFIG_OF_LIBFDT=y diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 4dc098b828..e5265a7362 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -12,7 +12,6 @@ #include #define CONFIG_S32V234 -#define CONFIG_DM /* Config GIC */ #define CONFIG_GICV2 @@ -58,7 +57,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) #endif -#define CONFIG_DM_SERIAL #define CONFIG_FSL_LINFLEXUART #define LINFLEXUART_BASE LINFLEXD0_BASE_ADDR From patchwork Mon Apr 9 01:34:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 896077 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tuxera.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40KCYw1bLNz9s4q for ; Mon, 9 Apr 2018 11:36:03 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 78724C21D8A; Mon, 9 Apr 2018 01:35:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id F2C1FC21C57; Mon, 9 Apr 2018 01:35:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 03C84C21DDC; Mon, 9 Apr 2018 01:34:57 +0000 (UTC) Received: from mx1.mpynet.fi (mx1.mpynet.fi [82.197.21.84]) by lists.denx.de (Postfix) with ESMTPS id C9FD9C21DA2 for ; Mon, 9 Apr 2018 01:34:53 +0000 (UTC) From: Tuomas Tynkkynen To: Date: Mon, 9 Apr 2018 04:34:34 +0300 Message-ID: <20180409013434.9583-2-tuomas@tuxera.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180409013434.9583-1-tuomas@tuxera.com> References: <20180409013434.9583-1-tuomas@tuxera.com> MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: none Subject: [U-Boot] [PATCH 2/2] serial: Migrate CONFIG_FSL_LINFLEXUART to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Signed-off-by: Tuomas Tynkkynen --- configs/s32v234evb_defconfig | 1 + drivers/serial/Kconfig | 7 +++++++ drivers/serial/serial_linflexuart.c | 4 ---- include/configs/s32v234evb.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configs/s32v234evb_defconfig b/configs/s32v234evb_defconfig index 5d98d15324..77e6faf146 100644 --- a/configs/s32v234evb_defconfig +++ b/configs/s32v234evb_defconfig @@ -10,4 +10,5 @@ CONFIG_CMD_BOOTZ=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_DM_SERIAL=y +CONFIG_FSL_LINFLEXUART=y CONFIG_OF_LIBFDT=y diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 975e6d3d58..c32e46a0f8 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -466,6 +466,13 @@ config BCM6345_SERIAL help Select this to enable UART on BCM6345 SoCs. +config FSL_LINFLEXUART + bool "Freescale Linflex UART support" + depends on DM_SERIAL + help + Select this to enable the Linflex serial module found on some + NXP SoCs like S32V234. + config FSL_LPUART bool "Freescale LPUART support" help diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c index fbb39592d6..b706fdb398 100644 --- a/drivers/serial/serial_linflexuart.c +++ b/drivers/serial/serial_linflexuart.c @@ -35,10 +35,6 @@ DECLARE_GLOBAL_DATA_PTR; -#ifndef CONFIG_DM_SERIAL -#error "The linflex serial driver does not have non-DM support." -#endif - static void _linflex_serial_setbrg(struct linflex_fsl *base, int baudrate) { u32 clk = mxc_get_clock(MXC_UART_CLK); diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index e5265a7362..7aa1e88a27 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -57,7 +57,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) #endif -#define CONFIG_FSL_LINFLEXUART #define LINFLEXUART_BASE LINFLEXD0_BASE_ADDR #define CONFIG_DEBUG_UART_LINFLEXUART diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 843e98124f..a281c12e17 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -680,7 +680,6 @@ CONFIG_FSL_IIM CONFIG_FSL_ISBC_KEY_EXT CONFIG_FSL_LAYERSCAPE CONFIG_FSL_LBC -CONFIG_FSL_LINFLEXUART CONFIG_FSL_MC9SDZ60 CONFIG_FSL_MEMAC CONFIG_FSL_NGPIXIS