From patchwork Fri Jul 27 19:33:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 173767 X-Patchwork-Delegate: dzu@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id C2D702C0092 for ; Sat, 28 Jul 2012 05:33:58 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CCD8828090; Fri, 27 Jul 2012 21:33:56 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i+rOtNZxGd+V; Fri, 27 Jul 2012 21:33:56 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E338228088; Fri, 27 Jul 2012 21:33:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6C52028085; Fri, 27 Jul 2012 21:33:52 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gJ5i0Tg9OT1q; Fri, 27 Jul 2012 21:33:52 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by theia.denx.de (Postfix) with ESMTPS id 70C6028083; Fri, 27 Jul 2012 21:33:48 +0200 (CEST) Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3WkL2N2w2tz3hhh1; Fri, 27 Jul 2012 21:33:48 +0200 (CEST) X-Auth-Info: db0PtEW/JMJriHsPgUFhWBwwPGioYjWXwqAifPfaSmo= Received: from mashiro.lan (host-82-135-33-74.customer.m-online.net [82.135.33.74]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3WkL2L6qThzbblT; Fri, 27 Jul 2012 21:33:46 +0200 (CEST) From: Marek Vasut To: u-boot@lists.denx.de Date: Fri, 27 Jul 2012 21:33:43 +0200 Message-Id: <1343417623-30978-1-git-send-email-marex@denx.de> X-Mailer: git-send-email 1.7.10.4 Cc: Marek Vasut , u-boot-dm@lists.denx.de Subject: [U-Boot] [PATCH] dm: ppc: Rename CONFIG_SYS_CPU in BC3450 board X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This caused namespace clash with same macro defined in include/config.h: cmd_bc3450.c:55:0: warning: "CONFIG_SYS_CPU" redefined [enabled by default] In file included from /tmp/u-boot-marex/include/command.h:30:0, from /tmp/u-boot-marex/include/image.h:49, from /tmp/u-boot-marex/include/common.h:117, from cmd_bc3450.c:27: /tmp/u-boot-marex/include/config.h:3:0: note: this is the location of the previous definition Signed-off-by: Marek Vasut Cc: Detlev Zundel --- board/bc3450/cmd_bc3450.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/bc3450/cmd_bc3450.c b/board/bc3450/cmd_bc3450.c index a9e4902..b1f24ce 100644 --- a/board/bc3450/cmd_bc3450.c +++ b/board/bc3450/cmd_bc3450.c @@ -52,9 +52,9 @@ #define THERM_WRITE_TL 0x02 #define THERM_WRITE_TH 0x01 -#define CONFIG_SYS_CPU 2 -#define CONFIG_SYS_1SHOT 1 -#define CONFIG_SYS_STANDALONE 0 +#define DS1620_CFG_CPU 2 +#define DS1620_CFG_1SHOT 1 +#define DS1620_CFG_STANDALONE 0 struct therm { int hi; @@ -513,7 +513,7 @@ static int cmd_temp (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) therm.hi <<= 1; therm.lo <<= 1; ds1620_write_state (&therm); - ds1620_out (THERM_WRITE_CONFIG, 8, CONFIG_SYS_STANDALONE); + ds1620_out (THERM_WRITE_CONFIG, 8, DS1620_CFG_STANDALONE); return 0; } }