X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fh8300%2FKconfig;h=093f3e64ce57dc7e199f8384a845e5871c9d64d4;hb=746550cff061581f89c687ada8523670768364f2;hp=556863890a72f143b342d7ed7b42b4773d7c16c2;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 556863890..093f3e64c 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -43,122 +43,7 @@ config PCI
 
 source "init/Kconfig"
 
-menu "Processor type and features"
-
-choice
-	prompt "H8/300 platform"
-	default H8300H_GENERIC
-
-config H8300H_GENERIC
-	bool "Generic"
-	help
-	  H8/300H CPU Generic Hardware Support
-
-config H8300H_AKI3068NET
-	bool "AE-3068/69"
-	help
-	  AKI-H8/3068F / AKI-H8/3069F Flashmicom LAN Board Support
-	  More Information. (Japanese Only)
-	  <http://akizukidensi.com/catalog/h8.html>
-	  AE-3068/69 Evaluation Board Support
-	  More Information.
-	  <http://www.microtronique.com/ae3069lan.htm>
-
-config H8300H_H8MAX
-	bool "H8MAX"
-	help
-	  H8MAX Evaluation Board Support
-	  More Information. (Japanese Only)
-	  <http://strawberry-linux.com/h8/index.html>
-
-config H8300H_SIM
-	bool "H8/300H Simulator"
-	help
-	  GDB Simulator Support
-	  More Information.
-	  arch/h8300/Doc/simulator.txt
-
-config H8S_EDOSK2674
-	bool "EDOSK-2674"
-	help
-	  Renesas EDOSK-2674 Evaluation Board Support
-	  More Information.
-	  <http://www.azpower.com/H8-uClinux/index.html>
- 	  <http://www.eu.renesas.com/tools/edk/support/edosk2674.html>
-
-config H8S_SIM
-	bool "H8S Simulator"
-	help
-	  GDB Simulator Support
-	  More Information.
-	  arch/h8300/Doc/simulator.txt
-
-endchoice
-
-choice 
-	prompt "CPU Selection"
-
-config H83002
-	bool "H8/3001,3002,3003"
-	depends on H8300H_GENERIC
-
-config H83007
-	bool "H8/3006,3007"
-	depends on (H8300H_GENERIC || H8300H_SIM)
-
-config H83048
-	bool "H8/3044,3045,3046,3047,3048,3052"
-	depends on H8300H_GENERIC
-
-config H83068
-	bool "H8/3065,3066,3067,3068,3069"
-	depends on (H8300H_GENERIC || H8300H_AKI3068NET || H8300H_H8MAX)
-
-config H8S2678
-	bool "H8S/2670,2673,2674R,2675,2676"
-	depends on (H8S_GENERIC || H8S_EDOSK2674 || H8S_SIM)
-
-endchoice
-
-config CPU_H8300H
-	bool
-	depends on (H8300H_GENERIC || H8300H_AKI3068NET || H8300H_H8MAX || H8300H_SIM)
-	default y
-
-config CPU_H8S
-	bool
-	depends on (H8S_GENERIC || H8S_EDOSK2674 || H8S_SIM)
-	default y
-
-config CPU_CLOCK
-	int "CPU Clock Frequency (/1KHz)"	
-	default "20000" if H8300H_AKI3068NET
-	default "25000" if H8300H_H8MAX
-	default "16000" if H8300H_SIM
-	default "16000" if H8300H_GENERIC
-	default "33000" if H8S_GENERIC
-	default "33000" if H8S_SIM
-	default "33000" if H8S_EDOSK2674
-	help
-	  CPU Clock Frequency divide to 1000
-choice
-	prompt "Kernel executes from"
-	---help---
-	  Choose the memory type that the kernel will be running in.
-
-config RAMKERNEL
-	bool "RAM"
-	help
-	  The kernel will be resident in RAM when running.
-
-config ROMKERNEL
-	bool "ROM"
-	help
-	  The kernel will be resident in FLASH/ROM when running.
-
-endchoice
-
-endmenu
+source "arch/h8300/Kconfig.cpu"
 
 menu "Executable file formats"
 
@@ -368,6 +253,8 @@ config CONFIG_BLKDEV_RESERVE_ADDRESS
 	  BLKDEV start address.
 endmenu
 
+source "kernel/vserver/Kconfig"
+
 source "security/Kconfig"
 
 source "crypto/Kconfig"