Patchwork [U-Boot,v3,19/22] Move CONFIG_SYS_MEMTEST_SCRATCH #ifdef to top of file

login
register
mail settings
Submitter Simon Glass
Date Feb. 25, 2013, 3:33 a.m.
Message ID <1361763213-31183-20-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/222837/
State Accepted, archived
Delegated to: Tom Rini
Headers show

Comments

Simon Glass - Feb. 25, 2013, 3:33 a.m.
This config effectively has a default value of 0, so add this setting
at the top of the code to remove an #ifdef in the C function.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v3: None
Changes in v2: None

 common/cmd_mem.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index 95b49b2..50838a7 100644
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -39,6 +39,10 @@ 
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifndef CONFIG_SYS_MEMTEST_SCRATCH
+#define CONFIG_SYS_MEMTEST_SCRATCH 0
+#endif
+
 static int mod_mem(cmd_tbl_t *, int, int, int, char * const []);
 
 /* Display values from last command.
@@ -641,11 +645,7 @@  static ulong mem_test_alt(ulong start_addr, ulong end_addr)
 	vu_long temp;
 	vu_long anti_pattern;
 	vu_long num_words;
-#if defined(CONFIG_SYS_MEMTEST_SCRATCH)
 	vu_long *dummy = (vu_long *)CONFIG_SYS_MEMTEST_SCRATCH;
-#else
-	vu_long *dummy = NULL;	/* yes, this is address 0x0, not NULL */
-#endif
 	static const ulong bitpattern[] = {
 		0x00000001,	/* single bit */
 		0x00000003,	/* two adjacent bits */