Revert "GCC4.6: Convert various empty macros to inline functions"

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

diff --git a/common/cmd_cache.c b/common/cmd_cache.c
index 12022584196153e2b3d570f4fae1d692520807f4..9778d3bd3bc331af551acbfa0004e367b0c2b62d 100644 (file)
--- a/common/cmd_cache.c
+++ b/common/cmd_cache.c
@@ -26,22 +26,27 @@
  */
 #include <common.h>
 #include <command.h>
+#include <linux/compiler.h>
 
-static int on_off (const char *);
+static int parse_argv(const char *);
 
-int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+void __weak flush_icache(void)
+{
+       /* please define arch specific flush_icache */
+       puts("No arch specific flush_icache available!\n");
+}
+
+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: cmd_usage(cmdtp);
-                       return;
-#endif
+               switch (parse_argv(argv[1])) {
                case 0: icache_disable();
                        break;
                case 1: icache_enable ();
                        break;
+               case 2: flush_icache();
+                       break;
                }
                /* FALL TROUGH */
        case 1:                 /* get status */
@@ -49,25 +54,28 @@ int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        icache_status() ? "ON" : "OFF");
                return 0;
        default:
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
        }
        return 0;
 }
 
-int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+void __weak flush_dcache(void)
+{
+       puts("No arch specific flush_dcache available!\n");
+       /* please define arch specific flush_dcache */
+}
+
+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: cmd_usage(cmdtp);
-                       return;
-#endif
+               switch (parse_argv(argv[1])) {
                case 0: dcache_disable();
                        break;
                case 1: dcache_enable ();
                        break;
+               case 2: flush_dcache();
+                       break;
                }
                /* FALL TROUGH */
        case 1:                 /* get status */
@@ -75,16 +83,17 @@ int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        dcache_status() ? "ON" : "OFF");
                return 0;
        default:
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
        }
        return 0;
 
 }
 
-static int on_off (const char *s)
+static int parse_argv(const char *s)
 {
-       if (strcmp(s, "on") == 0) {
+       if (strcmp(s, "flush") == 0) {
+               return (2);
+       } else if (strcmp(s, "on") == 0) {
                return (1);
        } else if (strcmp(s, "off") == 0) {
                return (0);
@@ -96,13 +105,13 @@ static int on_off (const char *s)
 U_BOOT_CMD(
        icache,   2,   1,     do_icache,
        "enable or disable instruction cache",
-       "[on, off]\n"
-       "    - enable or disable instruction cache"
+       "[on, off, flush]\n"
+       "    - enable, disable, or flush instruction cache"
 );
 
 U_BOOT_CMD(
        dcache,   2,   1,     do_dcache,
        "enable or disable data cache",
-       "[on, off]\n"
-       "    - enable or disable data (writethrough) cache"
+       "[on, off, flush]\n"
+       "    - enable, disable, or flush data (writethrough) cache"
 );