Re: [PATCH 5/6] sh: Remove sh7757lcr board

2021-02-15 Thread Tom Rini
On Wed, Feb 10, 2021 at 12:51:25PM -0500, Tom Rini wrote:

> This board has not been converted to CONFIG_DM by the deadline of v2020.01
> and is missing other conversions which depend on this as well.  Remove it.
> 
> As this is the last SH4A board, remove that support as well.
> 
> Cc: Marek Vasut 
> Signed-off-by: Tom Rini 

Applied to u-boot/master, thanks!

-- 
Tom


signature.asc
Description: PGP signature


[PATCH 5/6] sh: Remove sh7757lcr board

2021-02-10 Thread Tom Rini
This board has not been converted to CONFIG_DM by the deadline of v2020.01
and is missing other conversions which depend on this as well.  Remove it.

As this is the last SH4A board, remove that support as well.

Cc: Marek Vasut 
Signed-off-by: Tom Rini 
---
 arch/sh/Kconfig  |  18 -
 arch/sh/include/asm/cpu_sh4.h|  25 --
 arch/sh/include/asm/system.h |  23 -
 arch/sh/include/asm/unaligned-sh4a.h | 258 ---
 arch/sh/include/asm/unaligned.h  |   7 +-
 board/renesas/sh7757lcr/Kconfig  |  12 -
 board/renesas/sh7757lcr/MAINTAINERS  |   6 -
 board/renesas/sh7757lcr/Makefile |   7 -
 board/renesas/sh7757lcr/README.sh7757lcr |  77 
 board/renesas/sh7757lcr/lowlevel_init.S  | 544 ---
 board/renesas/sh7757lcr/sh7757lcr.c  | 433 --
 board/renesas/sh7757lcr/spi-boot.c   | 108 -
 configs/sh7757lcr_defconfig  |  40 --
 drivers/net/sh_eth.h |   4 -
 include/configs/sh7757lcr.h  |  78 
 15 files changed, 1 insertion(+), 1639 deletions(-)
 delete mode 100644 arch/sh/include/asm/unaligned-sh4a.h
 delete mode 100644 board/renesas/sh7757lcr/Kconfig
 delete mode 100644 board/renesas/sh7757lcr/MAINTAINERS
 delete mode 100644 board/renesas/sh7757lcr/Makefile
 delete mode 100644 board/renesas/sh7757lcr/README.sh7757lcr
 delete mode 100644 board/renesas/sh7757lcr/lowlevel_init.S
 delete mode 100644 board/renesas/sh7757lcr/sh7757lcr.c
 delete mode 100644 board/renesas/sh7757lcr/spi-boot.c
 delete mode 100644 configs/sh7757lcr_defconfig
 delete mode 100644 include/configs/sh7757lcr.h

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index d8d2a7ffe9d0..2e9ccf7632a6 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -4,19 +4,6 @@ menu "SuperH architecture"
 config CPU_SH4
bool
 
-config CPU_SH4A
-   bool
-   select CPU_SH4
-
-config SH_32BIT
-   bool "32bit mode"
-   depends on CPU_SH4A
-   default n
-   help
- SH4A has 2 physical memory maps. This use 32bit mode.
- And this is board specific. Please check your board if you
- want to use this.
-
 choice
prompt "Target select"
optional
@@ -25,10 +12,6 @@ config TARGET_R2DPLUS
bool "Renesas R2D-PLUS"
select CPU_SH4
 
-config TARGET_SH7757LCR
-   bool "SH7757LCR"
-   select CPU_SH4A
-
 config TARGET_SH7763RDP
bool "SH7763RDP"
select CPU_SH4
@@ -44,7 +27,6 @@ config SYS_CPU
 source "arch/sh/lib/Kconfig"
 
 source "board/renesas/r2dplus/Kconfig"
-source "board/renesas/sh7757lcr/Kconfig"
 source "board/renesas/sh7763rdp/Kconfig"
 
 endmenu
diff --git a/arch/sh/include/asm/cpu_sh4.h b/arch/sh/include/asm/cpu_sh4.h
index 5fc9c962d833..ed7c243b3bda 100644
--- a/arch/sh/include/asm/cpu_sh4.h
+++ b/arch/sh/include/asm/cpu_sh4.h
@@ -46,29 +46,4 @@
 # error "Unknown SH4 variant"
 #endif
 
-#if defined(CONFIG_SH_32BIT)
-#define PMB_ADDR_ARRAY 0xf610
-#define PMB_ADDR_ENTRY 8
-#define PMB_VPN24
-
-#define PMB_DATA_ARRAY 0xf710
-#define PMB_DATA_ENTRY 8
-#define PMB_PPN24
-#define PMB_UB 9   /* Buffered write */
-#define PMB_V  8   /* Valid */
-#define PMB_SZ17   /* Page size (upper 
bit) */
-#define PMB_SZ04   /* Page size (lower 
bit) */
-#define PMB_C  3   /* Cacheability */
-#define PMB_WT 0   /* Write-through */
-
-#define PMB_ADDR_BASE(entry)   (PMB_ADDR_ARRAY + (entry << PMB_ADDR_ENTRY))
-#define PMB_DATA_BASE(entry)   (PMB_DATA_ARRAY + (entry << PMB_DATA_ENTRY))
-#define mk_pmb_addr_val(vpn)   ((vpn << PMB_VPN))
-#define mk_pmb_data_val(ppn, ub, v, sz1, sz0, c, wt)   \
-   ((ppn << PMB_PPN) | (ub << PMB_UB) | \
-(v << PMB_V) | (sz1 << PMB_SZ1) | \
-(sz0 << PMB_SZ0) | (c << PMB_C) | \
-(wt << PMB_WT))
-#endif
-
 #endif /* _ASM_CPU_SH4_H_ */
diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h
index 24b5ce8e3042..ccc79b3c9177 100644
--- a/arch/sh/include/asm/system.h
+++ b/arch/sh/include/asm/system.h
@@ -70,18 +70,6 @@ static inline void sched_cacheflush(void)
 {
 }
 
-#ifdef CONFIG_CPU_SH4A
-#define __icbi()   \
-{  \
-   unsigned long __addr;   \
-   __addr = 0xa800;\
-   __asm__ __volatile__(   \
-   "icbi   %0\n\t" \
-   : /* no output */   \
-   : "m" (__m(__addr)));   \
-}
-#endif
-
 static inline unsigned long tas(volatile int *m)
 {
unsigned long retval;
@@ -100,25 +88,14 @@ static inline unsigned long tas(volatile int *m)
  *