Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[karo-tx-uboot.git] / common / cmd_itest.c

diff --git a/common/cmd_itest.c b/common/cmd_itest.c
index 7fba598d42b9f6075c177c0b312f197204b6ea98..58c5e7b3b56d4a83d5757998520870c8efebf762 100644 (file)
--- a/common/cmd_itest.c
+++ b/common/cmd_itest.c
@@ -32,8 +32,6 @@
 #include <config.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_ITEST)
-
 #define EQ     0
 #define NE     1
 #define LT     2
@@ -66,16 +64,19 @@ op_tbl_t op_table [] = {
 
 #define op_tbl_size (sizeof(op_table)/sizeof(op_table[0]))
 
-extern int cmd_get_data_size(char* arg, int default_size);
-
 static long evalexp(char *s, int w)
 {
-       long l, *p;
+       long l = 0;
+       long *p;
 
        /* if the parameter starts with a * then assume is a pointer to the value we want */
        if (s[0] == '*') {
                p = (long *)simple_strtoul(&s[1], NULL, 16);
-               l = *p;
+               switch (w) {
+               case 1: return((long)(*(unsigned char *)p));
+               case 2: return((long)(*(unsigned short *)p));
+               case 4: return(*p);
+               }
        } else {
                l = simple_strtoul(s, NULL, 16);
        }
@@ -165,7 +166,7 @@ int do_itest ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
 
        /* Validate arguments */
        if ((argc != 4)){
-               printf("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -194,7 +195,6 @@ int do_itest ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
 
 U_BOOT_CMD(
        itest, 4, 0, do_itest,
-       "itest   - return true/false on integer compare\n",
-       "[.b, .w, .l, .s] [*]value1 <op> [*]value2\n"
+       "return true/false on integer compare",
+       "[.b, .w, .l, .s] [*]value1 <op> [*]value2"
 );
-#endif /* CONFIG_COMMANDS & CFG_CMD_ITEST */