From patchwork Mon Feb 5 01:04:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 869116 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KjNyR8I2"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zZTv72BS3z9sR8 for ; Mon, 5 Feb 2018 12:06:43 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D8631C21DD7; Mon, 5 Feb 2018 01:05:45 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 4933CC21E5A; Mon, 5 Feb 2018 01:05:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 44116C21E26; Mon, 5 Feb 2018 01:05:13 +0000 (UTC) Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by lists.denx.de (Postfix) with ESMTPS id 9FABBC21E2F for ; Mon, 5 Feb 2018 01:05:09 +0000 (UTC) Received: by mail-it0-f65.google.com with SMTP id h129so14013843ita.2 for ; Sun, 04 Feb 2018 17:05:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cycUN7KFVbgZaqXKLRobC5EvIx815L6AeFPEAzOgAZA=; b=KjNyR8I2t2qclFwkhUXeXN0AGCGwIeDRxoapzDh8fvdkVwbsgH5n3ab5/3uE+26yxO HM2ry4omz4AvBGcRD25rJcJhrf0Mj0FiIrCjoTIPhlD0m459W/IgCDbHqrbtNxCotKXd lsq0Tphpjcx1TSwwyOd2RtgPHjHt6mBOCX9GVtHcWp6O7N9Yh7h/Ps2VJxZh1QPRybsX 4i+J1XmqabwvQkblt8hLRAUxn9EJJjJkjpT8RJABngKnJrQNf9UddyIrrVOXtLPvOLJl L++IbMKxo387uFwDQoDLInNp2P+ip25kl0/kk8K7carkTGjleXKyHYWCZpvgwDXAA0a9 zDYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cycUN7KFVbgZaqXKLRobC5EvIx815L6AeFPEAzOgAZA=; b=arEyq6Sry1middCTc38CtZ7EkFM8utcSESzyzNUOJG1XT+u3a9Ml6sJfkt+Dp1WW/w mLIBsAwUiheHYRFEHc9V7PY/reqKytmZsvlJB3e4sRMm4Di+mMgnFlIZovW4nAD9EwnN nVAcsPlYXd0f/KtjBZ61YO4TU5iFAtDbqX8kYH7GVvsVKy12ofJkP0liJdWdJNIMo66I eklYkNQUmLldx2JE3GiSMoirFR3RM8M4pk6N1/5VX+Va+FSjF+xjWBG4/qWbblZuxZJa 2yCgLBuLbDzn1fmBx7InzgmbyWHVNBpaRYRHEXkSixWGxayTe3e5Ydxl05ymvoIlOuhg Y7Og== X-Gm-Message-State: APf1xPAwD1aNIaqcRuING26BzY+IVm7AhUTLfch64vZgEwt8YgNPti5V 6ldGzKrTPyoQhWUwgnnsLkOdMQ== X-Google-Smtp-Source: AH8x226cM8KJdjwaMYVZHzcVJEPDVlOXo/Ll+aVyjKl+sbLvG+L6xekfWjrirbFWRDuYu2Iz+NAzOg== X-Received: by 10.36.65.222 with SMTP id b91mr9998272itd.66.1517792708205; Sun, 04 Feb 2018 17:05:08 -0800 (PST) Received: from ethiopia.woodsts.org (c-73-74-196-48.hsd1.il.comcast.net. [73.74.196.48]) by smtp.gmail.com with ESMTPSA id y186sm4561058ioy.57.2018.02.04.17.05.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Feb 2018 17:05:07 -0800 (PST) From: "Derald D. Woods" To: u-boot@lists.denx.de Date: Sun, 4 Feb 2018 19:04:49 -0600 Message-Id: <20180205010450.20665-2-woods.technical@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180205010450.20665-1-woods.technical@gmail.com> References: <20180205010450.20665-1-woods.technical@gmail.com> Cc: trini@konsulko.com Subject: [U-Boot] [PATCH 1/2] ARM: omap3: ti_omap3_common: Fix CONFIG_SYS_NS16550_REG_SIZE compiler warning 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This commit fixes the following compiler warnings when DM_SERIAL is enabled. ---8<------------------------------------------------------------------- ... CC spl/board/ti/evm/evm.o In file included from /solution/scm/u-boot-master/board/ti/evm/evm.c:16:0: /solution/scm/u-boot-master/include/ns16550.h:31:0: warning: "CONFIG_SYS_NS16550_REG_SIZE" redefined #define CONFIG_SYS_NS16550_REG_SIZE (-1) In file included from /solution/scm/u-boot-master/include/configs/omap3_evm.h:22:0, from include/config.h:5, from /solution/scm/u-boot-master/include/common.h:21, from /solution/scm/u-boot-master/board/ti/evm/evm.c:14: /solution/scm/u-boot-master/include/configs/ti_omap3_common.h:33:0: note: this is the location of the previous definition # define CONFIG_SYS_NS16550_REG_SIZE (-4) LD spl/board/ti/evm/built-in.o ... CC spl/drivers/serial/ns16550.o In file included from /solution/scm/u-boot-master/drivers/serial/ns16550.c:11:0: /solution/scm/u-boot-master/include/ns16550.h:31:0: warning: "CONFIG_SYS_NS16550_REG_SIZE" redefined #define CONFIG_SYS_NS16550_REG_SIZE (-1) In file included from /solution/scm/u-boot-master/include/configs/omap3_evm.h:22:0, from include/config.h:5, from /solution/scm/u-boot-master/include/common.h:21, from /solution/scm/u-boot-master/drivers/serial/ns16550.c:7: /solution/scm/u-boot-master/include/configs/ti_omap3_common.h:33:0: note: this is the location of the previous definition # define CONFIG_SYS_NS16550_REG_SIZE (-4) LD spl/drivers/serial/built-in.o ... ---8<------------------------------------------------------------------- Signed-off-by: Derald D. Woods Reviewed-by: Tom Rini --- include/configs/ti_omap3_common.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 72c4b184d9..cd6a9c2197 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -28,10 +28,12 @@ /* NS16550 Configuration */ #define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK -#ifdef CONFIG_SPL_BUILD -# define CONFIG_SYS_NS16550_SERIAL -# define CONFIG_SYS_NS16550_REG_SIZE (-4) -#endif +#if defined(CONFIG_SPL_BUILD) +#define CONFIG_SYS_NS16550_SERIAL +#if !defined(CONFIG_DM_SERIAL) +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#endif /* !CONFIG_DM_SERIAL */ +#endif /* CONFIG_SPL_BUILD */ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ 115200}