public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Wolfgang Denk <wd@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] tegra2: fix warning: "assert" redefined
Date: Sat, 10 Sep 2011 16:19:23 +0200	[thread overview]
Message-ID: <1315664363-3979-1-git-send-email-wd@denx.de> (raw)
In-Reply-To: <1309376974-12943-1-git-send-email-sjg@chromium.org>

Commit 21726a7 "Add assert() for debug assertions" caused build
warnings for all tegra2 based boards:

clock.c:36:1: warning: "assert" redefined
In file included from clock.c:29:
include/common.h:144:1: warning: this is the location of the previous definition

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
---
 arch/arm/cpu/armv7/tegra2/clock.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/arch/arm/cpu/armv7/tegra2/clock.c b/arch/arm/cpu/armv7/tegra2/clock.c
index 67eed14..0aaed7d 100644
--- a/arch/arm/cpu/armv7/tegra2/clock.c
+++ b/arch/arm/cpu/armv7/tegra2/clock.c
@@ -28,14 +28,6 @@
 #include <asm/arch/tegra2.h>
 #include <common.h>
 
-#ifdef DEBUG
-#define assert(x)	\
-	({ if (!(x)) printf("Assertion failure '%s' %s line %d\n", \
-		#x, __FILE__, __LINE__); })
-#else
-#define assert(x)
-#endif
-
 /*
  * Get the oscillator frequency, from the corresponding hardware configuration
  * field.
-- 
1.7.6

  parent reply	other threads:[~2011-09-10 14:19 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-29 19:49 [U-Boot] [PATCH v3] Add assert() for debug assertions Simon Glass
2011-06-29 20:43 ` Mike Frysinger
2011-06-29 21:01   ` Wolfgang Denk
2011-06-29 21:54     ` Mike Frysinger
2011-09-07 22:29       ` Simon Glass
2011-09-09  0:34         ` Mike Frysinger
2011-09-09 13:55           ` Simon Glass
2011-09-09 22:04 ` Wolfgang Denk
2011-09-09 22:38 ` [U-Boot] [PATCH] Fix warning: "assert" redefined Wolfgang Denk
2011-09-09 22:46   ` Simon Glass
2011-09-10 20:37   ` Wolfgang Denk
2011-09-10 14:07 ` [U-Boot] [PATCH] utx8245: fix build breakage due to assert() Wolfgang Denk
2011-09-10 20:42   ` Wolfgang Denk
2011-09-10 14:19 ` Wolfgang Denk [this message]
2011-09-10 20:44   ` [U-Boot] [PATCH] tegra2: fix warning: "assert" redefined Wolfgang Denk
2011-09-12  4:39     ` Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1315664363-3979-1-git-send-email-wd@denx.de \
    --to=wd@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox