gpio: Add Turris Omnia MCU driver

[platform/kernel/u-boot.git] / common / command.c

diff --git a/common/command.c b/common/command.c
index 4f49f15..41c91c6 100644 (file)
--- a/common/command.c
+++ b/common/command.c
@@ -9,12 +9,16 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <command.h>
 #include <console.h>
 #include <env.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/ctype.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /*
  * Use puts() instead of printf() to avoid printf buffer overflow
  * for long help messages
@@ -473,23 +477,20 @@ int cmd_get_data_size(char* arg, int default_size)
                        return 2;
                case 'l':
                        return 4;
-#ifdef MEM_SUPPORT_64BIT_DATA
-               case 'q':
-                       return 8;
-#endif
                case 's':
-                       return -2;
+                       return CMD_DATA_SIZE_STR;
+               case 'q':
+                       if (MEM_SUPPORT_64BIT_DATA)
+                               return 8;
+                       /* no break */
                default:
-                       return -1;
+                       return CMD_DATA_SIZE_ERR;
                }
        }
        return default_size;
 }
 #endif
 
-#if defined(CONFIG_NEEDS_MANUAL_RELOC)
-DECLARE_GLOBAL_DATA_PTR;
-
 void fixup_cmdtable(struct cmd_tbl *cmdtp, int size)
 {
        int     i;
@@ -534,7 +535,6 @@ void fixup_cmdtable(struct cmd_tbl *cmdtp, int size)
                cmdtp++;
        }
 }
-#endif
 
 int cmd_always_repeatable(struct cmd_tbl *cmdtp, int flag, int argc,
                          char *const argv[], int *repeatable)
@@ -570,7 +570,7 @@ int cmd_discard_repeatable(struct cmd_tbl *cmdtp, int flag, int argc,
  * @param argc         Number of arguments (arg 0 must be the command text)
  * @param argv         Arguments
  * @param repeatable   Can the command be repeated
- * @return 0 if command succeeded, else non-zero (CMD_RET_...)
+ * Return: 0 if command succeeded, else non-zero (CMD_RET_...)
  */
 static int cmd_call(struct cmd_tbl *cmdtp, int flag, int argc,
                    char *const argv[], int *repeatable)