---

yaml --- r: 77796 b: refs/heads/master c: 3e0137f h: refs/heads/master v: v3
git-mirror · Jan 28, 2008 · bbe48fa · bbe48fa
1 parent 132a890
commit bbe48fa
Show file tree

Hide file tree

Showing 12 changed files with 295 additions and 1,649 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b000659b1c07f91f0c73bf94bb8922fa740c0ef0
+refs/heads/master: 3e0137f6c7852aff12db0da7bb45f8b3a0a704c8
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
@@ -505,19 +505,11 @@ config SH_MAGIC_PANEL_R2
 	help
 	  Select Magic Panel R2 if configuring for Magic Panel R2.
 
-config SH_SIMULATOR
-	bool "Simulator"
-	depends on SUPERH64
-
 config SH_CAYMAN
 	bool "Hitachi Cayman"
 	depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
 	select SYS_SUPPORTS_PCI
 
-config SH_HARP
-	bool "ST50 Harp"
-	depends on CPU_SH5
-
 endmenu
 
 source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"

diff --git a/trunk/arch/sh/Makefile b/trunk/arch/sh/Makefile
@@ -141,9 +141,7 @@ endif
 
 # SH-5 mach types
 # XXX.. to be reconciled with machdir-y later.
-core-$(CONFIG_SH_SIMULATOR)	+= arch/sh/mach-sim/
 core-$(CONFIG_SH_CAYMAN)	+= arch/sh/mach-cayman/
-core-$(CONFIG_SH_HARP)		+= arch/sh/mach-harp/
 
 # Companion chips
 core-$(CONFIG_HD6446X_SERIES)	+= arch/sh/cchips/hd6446x/