Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

diff --git a/common/cmd_cache.c b/common/cmd_cache.c
index 675d43fa1877cc8320d3684b17caaf6cf23b295f..5512f924b1808c0aa8b6f9ec3682dd55498c16d1 100644 (file)
--- a/common/cmd_cache.c
+++ b/common/cmd_cache.c
@@ -26,87 +26,97 @@
  */
 #include <common.h>
 #include <command.h>
+#include <linux/compiler.h>
 
-#if defined(CONFIG_CMD_CACHE)
+static int parse_argv(const char *);
 
-static int on_off (const char *);
+void __weak invalidate_icache_all(void)
+{
+       /* please define arch specific invalidate_icache_all */
+       puts("No arch specific invalidate_icache_all available!\n");
+}
 
-int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_icache(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        switch (argc) {
        case 2:                 /* on / off     */
-               switch (on_off(argv[1])) {
-#if 0  /* prevented by varargs handling; FALLTROUGH is harmless, too */
-               default: printf ("Usage:\n%s\n", cmdtp->usage);
-                       return;
-#endif
-               case 0: icache_disable();
+               switch (parse_argv(argv[1])) {
+               case 0:
+                       icache_disable();
                        break;
-               case 1: icache_enable ();
+               case 1:
+                       icache_enable();
+                       break;
+               case 2:
+                       invalidate_icache_all();
                        break;
                }
-               /* FALL TROUGH */
+               break;
        case 1:                 /* get status */
-               printf ("Instruction Cache is %s\n",
+               printf("Instruction Cache is %s\n",
                        icache_status() ? "ON" : "OFF");
                return 0;
        default:
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
+               return CMD_RET_USAGE;
        }
        return 0;
 }
 
-int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+void __weak flush_dcache_all(void)
+{
+       puts("No arch specific flush_dcache_all available!\n");
+       /* please define arch specific flush_dcache_all */
+}
+
+int do_dcache(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        switch (argc) {
-       case 2:                 /* on / off     */
-               switch (on_off(argv[1])) {
-#if 0  /* prevented by varargs handling; FALLTROUGH is harmless, too */
-               default: printf ("Usage:\n%s\n", cmdtp->usage);
-                       return;
-#endif
-               case 0: dcache_disable();
+       case 2:                 /* on / off */
+               switch (parse_argv(argv[1])) {
+               case 0:
+                       dcache_disable();
                        break;
-               case 1: dcache_enable ();
+               case 1:
+                       dcache_enable();
+                       break;
+               case 2:
+                       flush_dcache_all();
                        break;
                }
-               /* FALL TROUGH */
+               break;
        case 1:                 /* get status */
-               printf ("Data (writethrough) Cache is %s\n",
+               printf("Data (writethrough) Cache is %s\n",
                        dcache_status() ? "ON" : "OFF");
                return 0;
        default:
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
+               return CMD_RET_USAGE;
        }
        return 0;
-
 }
 
-static int on_off (const char *s)
+static int parse_argv(const char *s)
 {
-       if (strcmp(s, "on") == 0) {
-               return (1);
-       } else if (strcmp(s, "off") == 0) {
-               return (0);
-       }
-       return (-1);
+       if (strcmp(s, "flush") == 0)
+               return 2;
+       else if (strcmp(s, "on") == 0)
+               return 1;
+       else if (strcmp(s, "off") == 0)
+               return 0;
+
+       return -1;
 }
 
 
 U_BOOT_CMD(
        icache,   2,   1,     do_icache,
-       "icache  - enable or disable instruction cache\n",
-       "[on, off]\n"
-       "    - enable or disable instruction cache\n"
+       "enable or disable instruction cache",
+       "[on, off, flush]\n"
+       "    - enable, disable, or flush instruction cache"
 );
 
 U_BOOT_CMD(
        dcache,   2,   1,     do_dcache,
-       "dcache  - enable or disable data cache\n",
-       "[on, off]\n"
-       "    - enable or disable data (writethrough) cache\n"
+       "enable or disable data cache",
+       "[on, off, flush]\n"
+       "    - enable, disable, or flush data (writethrough) cache"
 );
-
-#endif