summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2008-10-30 17:35:30 -0500
committerWolfgang Denk <wd@denx.de>2008-11-02 16:23:46 +0100
commit20d04774f4ef3f6e38974636e0e36ae0f0b5501f (patch)
tree15562cc70bebb87b130ba1ef5218df84f4297c1d /common
parent298e476c66fd88d0bc4f0371118652d2b5de4e8a (diff)
downloadu-boot-imx-20d04774f4ef3f6e38974636e0e36ae0f0b5501f.zip
u-boot-imx-20d04774f4ef3f6e38974636e0e36ae0f0b5501f.tar.gz
u-boot-imx-20d04774f4ef3f6e38974636e0e36ae0f0b5501f.tar.bz2
Consolidate MAX/MIN definitions
There were several, now there is one (two if you count the lower-case versions). Signed-off-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bedbug.c4
-rw-r--r--common/cmd_elf.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c
index 3e597f9..e6277c9 100644
--- a/common/cmd_bedbug.c
+++ b/common/cmd_bedbug.c
@@ -13,10 +13,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
extern void show_regs __P ((struct pt_regs *));
extern int run_command __P ((const char *, int));
extern char console_buffer[];
diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 3ebb6d9..4d8e1d2 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -23,10 +23,6 @@
DECLARE_GLOBAL_DATA_PTR;
#endif
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
int valid_elf_image (unsigned long addr);
unsigned long load_elf_image (unsigned long addr);