Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b09ece0836e0267b86f37defec267aa3806cb03a

Authored by Alexandru Gagniuc
Committed by Tom Rini
1 parent 306b236bc1
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 1 changed file with 3 additions and 9 deletions Side-by-side Diff

... ... @@ -176,16 +176,10 @@
176 176 /*
177 177 * Note: this debug setup works by storing the strings in a fixed buffer
178 178 */
179   -#define FINAL
180   -#ifdef FINAL
181   -static char *zm_out = (char *) 0x00380000;
182   -static char *zm_out_start = (char *) 0x00380000;
183   -#else
184   -static char zm_buf[8192];
185   -static char *zm_out = zm_buf;
186   -static char *zm_out_start = zm_buf;
  179 +static char zm_debug_buf[8192];
  180 +static char *zm_out = zm_debug_buf;
  181 +static char *zm_out_start = zm_debug_buf;
187 182  
188   -#endif
189 183 static int
190 184 zm_dprintf (char *fmt, ...)
191 185 {