From: Alexandru Gagniuc <alex.g@adaptrum.com>
Date: Tue, 4 Apr 2017 17:42:31 +0000 (-0700)
Subject: common/xyzModem.c: Do not use hard-coded address for debug buffer
X-Git-Tag: v2017.05-rc2~61
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b09ece0836e0267b86f37defec267aa3806cb03a;p=u-boot

common/xyzModem.c: Do not use hard-coded address for debug buffer

Under the plethora of #ifdefs, the xyzModem code hid this pearl:
static char *zm_out = (char *) 0x00380000;
This was only enabled when DEBUG is defined, so it's probably why it
went unnoticed for so long. No idea what platform had memory at that
exact location, but the this approach is extremely hacky.
Use a static buffer instead.

Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com>
---

diff --git a/common/xyzModem.c b/common/xyzModem.c
index 6ded958e89..a0c5dfeece 100644
--- a/common/xyzModem.c
+++ b/common/xyzModem.c
@@ -176,16 +176,10 @@ parse_num (char *s, unsigned long *val, char **es, char *delim)
 /*
  * Note: this debug setup works by storing the strings in a fixed buffer
  */
-#define FINAL
-#ifdef FINAL
-static char *zm_out = (char *) 0x00380000;
-static char *zm_out_start = (char *) 0x00380000;
-#else
-static char zm_buf[8192];
-static char *zm_out = zm_buf;
-static char *zm_out_start = zm_buf;
+static char zm_debug_buf[8192];
+static char *zm_out = zm_debug_buf;
+static char *zm_out_start = zm_debug_buf;
 
-#endif
 static int
 zm_dprintf (char *fmt, ...)
 {