From 03626be3f4533c9875e919bd58c1dfdb73d7f6f0 Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Wed, 20 Oct 2010 01:35:28 +0900
Subject: [PATCH] sh: sh4: Move to boards.cfg

Move the sh4 target boards out of the Makefile and into boards.cfg.
And fix sh4 of MAKEALL.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 MAKEALL    | 19 ++---------------
 Makefile   | 60 ------------------------------------------------------
 boards.cfg | 10 +++++++++
 3 files changed, 12 insertions(+), 77 deletions(-)

diff --git a/MAKEALL b/MAKEALL
index 71dcba2994..4ae741a695 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -611,24 +611,9 @@ LIST_blackfin="$(boards_by_arch blackfin)
 
 LIST_sh2="$(boards_by_cpu sh2)"
 LIST_sh3="$(boards_by_cpu sh3)"
+LIST_sh4="$(boards_by_cpu sh4)"
 
-LIST_sh4="		\
-	ms7750se	\
-	ms7722se	\
-	MigoR		\
-	r7780mp		\
-	r2dplus		\
-	sh7763rdp	\
-	sh7785lcr	\
-	ap325rxa	\
-	espt		\
-"
-
-LIST_sh="		\
-	${LIST_sh2}	\
-	${LIST_sh3}	\
-	${LIST_sh4}	\
-"
+LIST_sh="$(boards_by_arch sh)"
 
 #########################################################################
 ## SPARC Systems
diff --git a/Makefile b/Makefile
index 3083c22de6..f8e13d782a 100644
--- a/Makefile
+++ b/Makefile
@@ -1184,66 +1184,6 @@ bf527-ezkit-v2_config	: unconfig
 	@$(MKCONFIG) -t BF527_EZKIT_REV_2_1 \
 		bf527-ezkit blackfin blackfin bf527-ezkit
 
-#========================================================================
-# SH3 (SuperH)
-#========================================================================
-
-#########################################################################
-## sh4 (Renesas SuperH)
-#########################################################################
-
-MigoR_config :       unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_MIGO_R 1" > $(obj)include/config.h
-	@$(MKCONFIG) -a $@ sh sh4 MigoR renesas
-
-ms7750se_config: unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_MS7750SE 1" > $(obj)include/config.h
-	@$(MKCONFIG) -a $@ sh sh4 ms7750se
-
-ms7722se_config :	unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_MS7722SE 1" > $(obj)include/config.h
-	@$(MKCONFIG) -a $@ sh sh4 ms7722se
-
-r2dplus_config  :   unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_R2DPLUS 1" > $(obj)include/config.h
-	@$(MKCONFIG) -a $@ sh sh4 r2dplus renesas
-
-r7780mp_config: unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_R7780MP 1" > $(obj)include/config.h
-	@$(MKCONFIG) -a $@ sh sh4 r7780mp renesas
-
-sh7763rdp_config  :   unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_SH7763RDP 1" > $(obj)include/config.h
-	@$(MKCONFIG) -a $@ sh sh4 sh7763rdp renesas
-
-sh7785lcr_32bit_config \
-sh7785lcr_config  :   unconfig
-	@mkdir -p $(obj)include
-	@mkdir -p $(obj)board/renesas/sh7785lcr
-	@echo "#define CONFIG_SH7785LCR 1" > $(obj)include/config.h
-	@if [ "$(findstring 32bit, $@)" ] ; then \
-		echo "#define CONFIG_SH_32BIT 1" >> $(obj)include/config.h ; \
-		echo "CONFIG_SYS_TEXT_BASE = 0x8ff80000" > \
-			$(obj)board/renesas/sh7785lcr/config.tmp ; \
-	fi
-	@$(MKCONFIG) -n $@ -a sh7785lcr sh sh4 sh7785lcr renesas
-
-ap325rxa_config  :   unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_AP325RXA 1" > $(obj)include/config.h
-	@$(MKCONFIG) -a $@ sh sh4 ap325rxa renesas
-
-espt_config  :   unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_ESPT 1" > $(obj)include/config.h
-	@$(MKCONFIG) -a $@ sh sh4 espt
-
 #########################################################################
 #########################################################################
 
diff --git a/boards.cfg b/boards.cfg
index 1dc557ef29..b701737475 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -735,5 +735,15 @@ bf527-ad7160-eval blackfin	blackfin
 rsk7203	sh	sh2		rsk7203		renesas		-
 mpr2	sh	sh3		mpr2	-	-
 ms7720se	sh	sh3	ms7720se	-	-
+MigoRsh	sh4	MigoR	renesas	-   
+ms7750se	sh	sh4	ms7750se	-	-   
+ms7722se	sh	sh4	ms7722se	-	-   
+r2dplus	sh	sh4	r2dplus	renesas	-   
+r7780mp	sh	sh4	r7780mp	renesas	-   
+sh7763rdp	sh	sh4	sh7763rdp	renesas	-   
+sh7785lcr	sh	sh4	sh7785lcr	renesas	-   
+sh7785lcr_32bit	sh  sh4	sh7785lcr	renesas	-	sh7785lcr:SH_32BIT=1
+ap325rxa	sh	sh4	ap325rxa	renesas	-   
+espt	sh	sh4	espt	-	-
 # Target	ARCH	CPU		Board name	Vendor		SoC		Options
 ###############################################################################################
-- 
2.30.2