]> git.sur5r.net Git - u-boot/commitdiff
sh: cache use jump_to_P2() and back_to_P1() from asm/system.h
authorVladimir Zapolskiy <vz@mleia.com>
Sun, 27 Nov 2016 22:15:16 +0000 (00:15 +0200)
committerTom Rini <trini@konsulko.com>
Sat, 3 Dec 2016 02:32:41 +0000 (21:32 -0500)
Both jump_to_P2() and back_to_P1() functions are found in asm/system.h
header file and functionally they are the same, don't redefine them.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
arch/sh/cpu/sh4/cache.c

index b3e5fd559576dbc74bddf4954a50fdc2e7208f85..50695b61154dc51a82bf7c866998536506ead080 100644 (file)
@@ -7,44 +7,9 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/processor.h>
 #include <asm/io.h>
-
-/*
- * Jump to P2 area.
- * When handling TLB or caches, we need to do it from P2 area.
- */
-#define jump_to_P2()                   \
-  do {                                 \
-    unsigned long __dummy;             \
-    __asm__ __volatile__(              \
-               "mov.l  1f, %0\n\t"     \
-               "or     %1, %0\n\t"     \
-               "jmp    @%0\n\t"        \
-               " nop\n\t"              \
-               ".balign 4\n"           \
-               "1:     .long 2f\n"     \
-               "2:"                    \
-               : "=&r" (__dummy)       \
-               : "r" (0x20000000));    \
-  } while (0)
-
-/*
- * Back to P1 area.
- */
-#define back_to_P1()                                   \
-  do {                                                 \
-    unsigned long __dummy;                             \
-    __asm__ __volatile__(                              \
-               "nop;nop;nop;nop;nop;nop;nop\n\t"       \
-               "mov.l  1f, %0\n\t"                     \
-               "jmp    @%0\n\t"                        \
-               " nop\n\t"                              \
-               ".balign 4\n"                           \
-               "1:     .long 2f\n"                     \
-               "2:"                                    \
-               : "=&r" (__dummy));                     \
-  } while (0)
+#include <asm/processor.h>
+#include <asm/system.h>
 
 #define CACHE_VALID       1
 #define CACHE_UPDATED     2