Re: [U-Boot] [RESEND][PATCH 03/24] sh3: remove unused cache.c file from being built

2016-11-29 Thread Simon Glass
On 27 November 2016 at 15:15, Vladimir Zapolskiy  wrote:
> The change is similar to commit 994b56616bae ("sh: delete an unused
> source file") for SH2, however here the removed cache.c file was
> built and included into an image as a dead code.
>
> If it is needed in future the contents can be reused from a similar
> arch/sh/cpu/sh4/cache.c file, which is in turn will be moved to
> a shared among all core flavours location at arch/sh/lib/cache.c.
>
> Signed-off-by: Vladimir Zapolskiy 
> ---
>  arch/sh/cpu/sh3/Makefile |  2 +-
>  arch/sh/cpu/sh3/cache.c  | 96 
> 
>  2 files changed, 1 insertion(+), 97 deletions(-)
>  delete mode 100644 arch/sh/cpu/sh3/cache.c

Reviewed-by: Simon Glass 
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [RESEND][PATCH 03/24] sh3: remove unused cache.c file from being built

2016-11-27 Thread Vladimir Zapolskiy
The change is similar to commit 994b56616bae ("sh: delete an unused
source file") for SH2, however here the removed cache.c file was
built and included into an image as a dead code.

If it is needed in future the contents can be reused from a similar
arch/sh/cpu/sh4/cache.c file, which is in turn will be moved to
a shared among all core flavours location at arch/sh/lib/cache.c.

Signed-off-by: Vladimir Zapolskiy 
---
 arch/sh/cpu/sh3/Makefile |  2 +-
 arch/sh/cpu/sh3/cache.c  | 96 
 2 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100644 arch/sh/cpu/sh3/cache.c

diff --git a/arch/sh/cpu/sh3/Makefile b/arch/sh/cpu/sh3/Makefile
index 1dccaf9..85917b9 100644
--- a/arch/sh/cpu/sh3/Makefile
+++ b/arch/sh/cpu/sh3/Makefile
@@ -12,4 +12,4 @@
 #
 
 extra-y= start.o
-obj-y  = cpu.o interrupts.o watchdog.o cache.o
+obj-y  = cpu.o interrupts.o watchdog.o
diff --git a/arch/sh/cpu/sh3/cache.c b/arch/sh/cpu/sh3/cache.c
deleted file mode 100644
index 34cbbff..000
--- a/arch/sh/cpu/sh3/cache.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * (C) Copyright 2007
- * Yoshihiro Shimoda 
- *
- * (C) Copyright 2007
- * Nobobuhiro Iwamatsu 
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include 
-#include 
-#include 
-#include 
-
-/*
- * 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:"\
-   : "=" (__dummy)   \
-   : "r" (0x2000));\
-  } 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:"\
-   : "=" (__dummy)); \
-  } while (0)
-
-#define CACHE_VALID   1
-#define CACHE_UPDATED 2
-
-static inline void cache_wback_all(void)
-{
-   unsigned long addr, data, i, j;
-
-   jump_to_P2();
-   for (i = 0; i < CACHE_OC_NUM_ENTRIES; i++) {
-   for (j = 0; j < CACHE_OC_NUM_WAYS; j++) {
-   addr = CACHE_OC_ADDRESS_ARRAY
-   | (j << CACHE_OC_WAY_SHIFT)
-   | (i << CACHE_OC_ENTRY_SHIFT);
-   data = inl(addr);
-   if (data & CACHE_UPDATED) {
-   data &= ~CACHE_UPDATED;
-   outl(data, addr);
-   }
-   }
-   }
-   back_to_P1();
-}
-
-
-#define CACHE_ENABLE  0
-#define CACHE_DISABLE 1
-
-int cache_control(unsigned int cmd)
-{
-   unsigned long ccr;
-
-   jump_to_P2();
-   ccr = inl(CCR);
-
-   if (ccr & CCR_CACHE_ENABLE)
-   cache_wback_all();
-
-   if (cmd == CACHE_DISABLE)
-   outl(CCR_CACHE_STOP, CCR);
-   else
-   outl(CCR_CACHE_INIT, CCR);
-   back_to_P1();
-
-   return 0;
-}
-- 
2.10.2

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot