From 399b4ba69dff1620aa0223fcb0482e19f1f9eb18 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 4 May 2018 17:40:33 -0600 Subject: [PATCH] arch/arm/src/kinetis: Eliminate a warning when no UARTs are enabled. --- arch/arm/src/kinetis/Kconfig | 1 + arch/arm/src/kinetis/Make.defs | 24 ++++++++++++----------- arch/arm/src/kinetis/kinetis_serialinit.c | 3 +-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/arch/arm/src/kinetis/Kconfig b/arch/arm/src/kinetis/Kconfig index 80647f40e84..3f79442d78f 100644 --- a/arch/arm/src/kinetis/Kconfig +++ b/arch/arm/src/kinetis/Kconfig @@ -266,6 +266,7 @@ config KINETIS_SERIALDRIVER config KINETIS_LPUART bool default n + select MCU_SERIAL config KINETIS_UART bool diff --git a/arch/arm/src/kinetis/Make.defs b/arch/arm/src/kinetis/Make.defs index 7e47c09e035..00b552e36c6 100644 --- a/arch/arm/src/kinetis/Make.defs +++ b/arch/arm/src/kinetis/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # arch/arm/src/kinetis/Make.defs # -# Copyright (C) 2011, 2013-2017 Gregory Nutt. All rights reserved. +# Copyright (C) 2011, 2013-2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -110,12 +110,10 @@ endif CHIP_ASRCS = -CHIP_CSRCS = kinetis_allocateheap.c kinetis_clockconfig.c -CHIP_CSRCS += kinetis_clrpend.c kinetis_idle.c kinetis_irq.c -CHIP_CSRCS += kinetis_lowputc.c kinetis_pin.c kinetis_pingpio.c -CHIP_CSRCS += kinetis_serialinit.c kinetis_serial.c -CHIP_CSRCS += kinetis_start.c kinetis_uid.c kinetis_wdog.c -CHIP_CSRCS += kinetis_cfmconfig.c +CHIP_CSRCS = kinetis_allocateheap.c kinetis_clockconfig.c kinetis_clrpend.c +CHIP_CSRCS += kinetis_idle.c kinetis_irq.c kinetis_lowputc.c kinetis_pin.c +CHIP_CSRCS += kinetis_pingpio.c kinetis_serialinit.c kinetis_start.c +CHIP_CSRCS += kinetis_uid.c kinetis_wdog.c kinetis_cfmconfig.c CHIP_CSRCS += kinetis_mpuinit.c # Configuration-dependent Kinetis files @@ -136,6 +134,14 @@ ifeq ($(CONFIG_DEBUG_GPIO_INFO),y) CHIP_CSRCS += kinetis_pindump.c endif +ifneq ($(CONFIG_KINETIS_UART),y) +CHIP_CSRCS += kinetis_serial.c +endif + +ifeq ($(CONFIG_KINETIS_LPUART),y) +CHIP_CSRCS += kinetis_lpserial.c +endif + ifeq ($(CONFIG_KINETIS_SDHC),y) CHIP_CSRCS += kinetis_sdhc.c endif @@ -168,10 +174,6 @@ ifeq ($(CONFIG_I2C),y) CHIP_CSRCS += kinetis_i2c.c endif -ifeq ($(CONFIG_KINETIS_LPUART),y) -CHIP_CSRCS += kinetis_lpserial.c -endif - ifeq ($(CONFIG_RTC),y) CHIP_CSRCS += kinetis_rtc.c ifeq ($(CONFIG_RTC_DRIVER),y) diff --git a/arch/arm/src/kinetis/kinetis_serialinit.c b/arch/arm/src/kinetis/kinetis_serialinit.c index ea4e1e240b9..90f5192212f 100644 --- a/arch/arm/src/kinetis/kinetis_serialinit.c +++ b/arch/arm/src/kinetis/kinetis_serialinit.c @@ -86,8 +86,6 @@ void kinetis_earlyserialinit(void) } #endif -#if defined(USE_SERIALDRIVER) - /**************************************************************************** * Name: up_serialinit * @@ -97,6 +95,7 @@ void kinetis_earlyserialinit(void) * ****************************************************************************/ +#if defined(USE_SERIALDRIVER) void up_serialinit(void) { #if defined(HAVE_UART_DEVICE) ||defined(HAVE_LPUART_DEVICE)