Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

More foolproofing of the CPU configuration.

Limit the number of cpu type options in the cpu menu to just those
types that are actually available for the select platform.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Ralf Baechle 19 years ago
parent
cb4262481f
commit
7cf8053b8e
1 changed files with 149 additions and 2 deletions
Unified View Show Diff Stats
  1. 149 2
      arch/mips/Kconfig

+ 149 - 2
arch/mips/Kconfig
View File 

@@ -19,12 +19,14 @@ config MIPS_MTX1
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select SOC_AU1500
 
 	select SOC_AU1500
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_BOSPORUS
 
 config MIPS_BOSPORUS
 
 	bool "AMD Alchemy Bosporus board"
 
 	bool "AMD Alchemy Bosporus board"
 
 	select SOC_AU1500
 
 	select SOC_AU1500
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_PB1000
 
 config MIPS_PB1000
 
@@ -33,6 +35,7 @@ config MIPS_PB1000
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_PB1100
 
 config MIPS_PB1100
 
@@ -41,6 +44,7 @@ config MIPS_PB1100
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_PB1500
 
 config MIPS_PB1500
 
@@ -48,6 +52,7 @@ config MIPS_PB1500
 
 	select SOC_AU1500
 
 	select SOC_AU1500
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_PB1550
 
 config MIPS_PB1550
 
@@ -56,6 +61,7 @@ config MIPS_PB1550
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select MIPS_DISABLE_OBSOLETE_IDE
 
 	select MIPS_DISABLE_OBSOLETE_IDE
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_PB1200
 
 config MIPS_PB1200
 
@@ -63,6 +69,7 @@ config MIPS_PB1200
 
 	select SOC_AU1200
 
 	select SOC_AU1200
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select MIPS_DISABLE_OBSOLETE_IDE
 
 	select MIPS_DISABLE_OBSOLETE_IDE
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_DB1000
 
 config MIPS_DB1000
 
@@ -70,12 +77,14 @@ config MIPS_DB1000
 
 	select SOC_AU1000
 
 	select SOC_AU1000
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_DB1100
 
 config MIPS_DB1100
 
 	bool "AMD Alchemy DB1100 board"
 
 	bool "AMD Alchemy DB1100 board"
 
 	select SOC_AU1100
 
 	select SOC_AU1100
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_DB1500
 
 config MIPS_DB1500
 
@@ -84,6 +93,7 @@ config MIPS_DB1500
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select MIPS_DISABLE_OBSOLETE_IDE
 
 	select MIPS_DISABLE_OBSOLETE_IDE
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
@@ -93,6 +103,7 @@ config MIPS_DB1550
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select MIPS_DISABLE_OBSOLETE_IDE
 
 	select MIPS_DISABLE_OBSOLETE_IDE
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_DB1200
 
 config MIPS_DB1200
 
@@ -100,12 +111,14 @@ config MIPS_DB1200
 
 	select SOC_AU1200
 
 	select SOC_AU1200
 
 	select DMA_COHERENT
 
 	select DMA_COHERENT
 
 	select MIPS_DISABLE_OBSOLETE_IDE
 
 	select MIPS_DISABLE_OBSOLETE_IDE
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_MIRAGE
 
 config MIPS_MIRAGE
 
 	bool "AMD Alchemy Mirage board"
 
 	bool "AMD Alchemy Mirage board"
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select SOC_AU1500
 
 	select SOC_AU1500
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
 config MIPS_COBALT
 
 config MIPS_COBALT
 
@@ -115,6 +128,7 @@ config MIPS_COBALT
 
 	select I8259
 
 	select I8259
 
 	select IRQ_CPU
 
 	select IRQ_CPU
 
 	select MIPS_GT64111
 
 	select MIPS_GT64111
 
+	select SYS_HAS_CPU_NEVADA
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -125,6 +139,8 @@ config MACH_DECSTATION
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select EARLY_PRINTK
 
 	select EARLY_PRINTK
 
 	select IRQ_CPU
 
 	select IRQ_CPU
 
+	select SYS_HAS_CPU_R3000
 
+	select SYS_HAS_CPU_R4X00
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -149,6 +165,7 @@ config MIPS_EV64120
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select MIPS_GT64120
 
 	select MIPS_GT64120
 
+	select SYS_HAS_CPU_R5000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -168,6 +185,8 @@ config MIPS_EV96100
 
 	select MIPS_GT96100
 
 	select MIPS_GT96100
 
 	select RM7000_CPU_SCACHE
 
 	select RM7000_CPU_SCACHE
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_R5000
 
+	select SYS_HAS_CPU_RM7000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -182,6 +201,7 @@ config MIPS_IVR
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select ITE_BOARD_GEN
 
 	select ITE_BOARD_GEN
 
+	select SYS_HAS_CPU_NEVADA
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -197,6 +217,8 @@ config MIPS_ITE8172
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select ITE_BOARD_GEN
 
 	select ITE_BOARD_GEN
 
+	select SYS_HAS_CPU_R5432
 
+	select SYS_HAS_CPU_NEVADA
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -215,6 +237,7 @@ config MACH_JAZZ
 
 	select GENERIC_ISA_DMA
 
 	select GENERIC_ISA_DMA
 
 	select I8259
 
 	select I8259
 
 	select ISA
 
 	select ISA
 
+	select SYS_HAS_CPU_R4X00
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	help
 
 	help
 
@@ -230,6 +253,7 @@ config LASAT
 
 	select MIPS_GT64120
 
 	select MIPS_GT64120
 
 	select MIPS_NILE4
 
 	select MIPS_NILE4
 
 	select R5000_CPU_SCACHE
 
 	select R5000_CPU_SCACHE
 
+	select SYS_HAS_CPU_R5000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -246,6 +270,11 @@ config MIPS_ATLAS
 
 	select MIPS_MSC
 
 	select MIPS_MSC
 
 	select RM7000_CPU_SCACHE
 
 	select RM7000_CPU_SCACHE
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_MIPS32_R1
 
+	select SYS_HAS_CPU_MIPS32_R2
 
+	select SYS_HAS_CPU_MIPS64_R1
 
+	select SYS_HAS_CPU_NEVADA
 
+	select SYS_HAS_CPU_RM7000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -269,6 +298,11 @@ config MIPS_MALTA
 
 	select MIPS_GT64120
 
 	select MIPS_GT64120
 
 	select MIPS_MSC
 
 	select MIPS_MSC
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_MIPS32_R1
 
+	select SYS_HAS_CPU_MIPS32_R2
 
+	select SYS_HAS_CPU_MIPS64_R1
 
+	select SYS_HAS_CPU_NEVADA
 
+	select SYS_HAS_CPU_RM7000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -283,6 +317,9 @@ config MIPS_SEAD
 
 	select IRQ_CPU
 
 	select IRQ_CPU
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select MIPS_BOARDS_GEN
 
 	select MIPS_BOARDS_GEN
 
+	select SYS_HAS_CPU_MIPS32_R1
 
+	select SYS_HAS_CPU_MIPS32_R2
 
+	select SYS_HAS_CPU_MIPS64_R1
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -295,6 +332,8 @@ config MIPS_SIM
 
 	bool 'Support for MIPS simulator (MIPSsim)'
 
 	bool 'Support for MIPS simulator (MIPSsim)'
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select IRQ_CPU
 
 	select IRQ_CPU
 
+	select SYS_HAS_CPU_MIPS32_R1
 
+	select SYS_HAS_CPU_MIPS32_R2
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -314,6 +353,7 @@ config MOMENCO_JAGUAR_ATX
 
 	select PCI_MARVELL
 
 	select PCI_MARVELL
 
 	select RM7000_CPU_SCACHE
 
 	select RM7000_CPU_SCACHE
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_RM9000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -330,6 +370,7 @@ config MOMENCO_OCELOT
 
 	select MIPS_GT64120
 
 	select MIPS_GT64120
 
 	select RM7000_CPU_SCACHE
 
 	select RM7000_CPU_SCACHE
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_RM7000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -348,6 +389,7 @@ config MOMENCO_OCELOT_3
 
 	select PCI_MARVELL
 
 	select PCI_MARVELL
 
 	select RM7000_CPU_SCACHE
 
 	select RM7000_CPU_SCACHE
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_RM9000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -364,6 +406,7 @@ config MOMENCO_OCELOT_C
 
 	select PCI_MARVELL
 
 	select PCI_MARVELL
 
 	select RM7000_CPU_SCACHE
 
 	select RM7000_CPU_SCACHE
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_RM7000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -380,6 +423,7 @@ config MOMENCO_OCELOT_G
 
 	select PCI_MARVELL
 
 	select PCI_MARVELL
 
 	select RM7000_CPU_SCACHE
 
 	select RM7000_CPU_SCACHE
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_RM7000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -413,6 +457,7 @@ config DDB5074
 
 	select IRQ_CPU
 
 	select IRQ_CPU
 
 	select I8259
 
 	select I8259
 
 	select ISA
 
 	select ISA
 
+	select SYS_HAS_CPU_R5000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -429,6 +474,7 @@ config DDB5476
 
 	select IRQ_CPU
 
 	select IRQ_CPU
 
 	select I8259
 
 	select I8259
 
 	select ISA
 
 	select ISA
 
+	select SYS_HAS_CPU_R5432
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -447,6 +493,7 @@ config DDB5477
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select I8259
 
 	select I8259
 
 	select IRQ_CPU
 
 	select IRQ_CPU
 
+	select SYS_HAS_CPU_R5432
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -459,6 +506,7 @@ config DDB5477
 
 
 
 config MACH_VR41XX
 
 config MACH_VR41XX
 
 	bool "Support for NEC VR4100 series based machines"
 
 	bool "Support for NEC VR4100 series based machines"
 
+	select SYS_HAS_CPU_VR41XX
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 
 
@@ -470,6 +518,7 @@ config PMC_YOSEMITE
 
 	select IRQ_CPU_RM7K
 
 	select IRQ_CPU_RM7K
 
 	select IRQ_CPU_RM9K
 
 	select IRQ_CPU_RM9K
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_RM9000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -486,6 +535,7 @@ config QEMU
 
 	select I8259
 
 	select I8259
 
 	select ISA
 
 	select ISA
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	help
 
 	help
 
@@ -506,6 +556,8 @@ config SGI_IP22
 
 	select IP22_CPU_SCACHE
 
 	select IP22_CPU_SCACHE
 
 	select IRQ_CPU
 
 	select IRQ_CPU
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_R4X00
 
+	select SYS_HAS_CPU_R5000
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -522,6 +574,7 @@ config SGI_IP27
 
 	select DMA_IP27
 
 	select DMA_IP27
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select PCI_DOMAINS
 
 	select PCI_DOMAINS
 
+	select SYS_HAS_CPU_R10000
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	help
 
 	help
 
@@ -541,6 +594,9 @@ config SGI_IP32
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select R5000_CPU_SCACHE
 
 	select R5000_CPU_SCACHE
 
 	select RM7000_CPU_SCACHE
 
 	select RM7000_CPU_SCACHE
 
+	select SYS_HAS_CPU_R5000
 
+	select SYS_HAS_CPU_R10000 if BROKEN
 
+	select SYS_HAS_CPU_RM7000
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	help
 
 	help
 
@@ -550,11 +606,12 @@ config SIBYTE_BIGSUR
 
 	bool "Support for Sibyte BigSur"
 
 	bool "Support for Sibyte BigSur"
 
 	select BOOT_ELF32
 
 	select BOOT_ELF32
 
 	select DMA_COHERENT
 
 	select DMA_COHERENT
 
+	select PCI_DOMAINS
 
 	select SIBYTE_BCM1x80
 
 	select SIBYTE_BCM1x80
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_SB1
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
-	select PCI_DOMAINS
 
 
 
 config SIBYTE_SWARM
 
 config SIBYTE_SWARM
 
 	bool "Support for Sibyte BCM91250A-SWARM"
 
 	bool "Support for Sibyte BCM91250A-SWARM"
 
@@ -562,6 +619,7 @@ config SIBYTE_SWARM
 
 	select DMA_COHERENT
 
 	select DMA_COHERENT
 
 	select SIBYTE_SB1250
 
 	select SIBYTE_SB1250
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_SB1
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_HIGHMEM
 
 	select SYS_SUPPORTS_HIGHMEM
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -573,6 +631,7 @@ config SIBYTE_SENTOSA
 
 	select DMA_COHERENT
 
 	select DMA_COHERENT
 
 	select SIBYTE_SB1250
 
 	select SIBYTE_SB1250
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_SB1
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
@@ -583,6 +642,7 @@ config SIBYTE_RHONE
 
 	select DMA_COHERENT
 
 	select DMA_COHERENT
 
 	select SIBYTE_BCM1125H
 
 	select SIBYTE_BCM1125H
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_SB1
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
@@ -593,6 +653,7 @@ config SIBYTE_CARMEL
 
 	select DMA_COHERENT
 
 	select DMA_COHERENT
 
 	select SIBYTE_BCM1120
 
 	select SIBYTE_BCM1120
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_SB1
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
@@ -603,6 +664,7 @@ config SIBYTE_PTSWARM
 
 	select DMA_COHERENT
 
 	select DMA_COHERENT
 
 	select SIBYTE_SB1250
 
 	select SIBYTE_SB1250
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_SB1
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_HIGHMEM
 
 	select SYS_SUPPORTS_HIGHMEM
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -614,6 +676,7 @@ config SIBYTE_LITTLESUR
 
 	select DMA_COHERENT
 
 	select DMA_COHERENT
 
 	select SIBYTE_SB1250
 
 	select SIBYTE_SB1250
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_SB1
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_HIGHMEM
 
 	select SYS_SUPPORTS_HIGHMEM
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -625,6 +688,7 @@ config SIBYTE_CRHINE
 
 	select DMA_COHERENT
 
 	select DMA_COHERENT
 
 	select SIBYTE_BCM1120
 
 	select SIBYTE_BCM1120
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_SB1
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 
 
@@ -635,6 +699,7 @@ config SIBYTE_CRHONE
 
 	select DMA_COHERENT
 
 	select DMA_COHERENT
 
 	select SIBYTE_BCM1125
 
 	select SIBYTE_BCM1125
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_SB1
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_HIGHMEM
 
 	select SYS_SUPPORTS_HIGHMEM
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -652,6 +717,7 @@ config SNI_RM200_PCI
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select I8259
 
 	select I8259
 
 	select ISA
 
 	select ISA
 
+	select SYS_HAS_CPU_R4X00
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 	select SYS_SUPPORTS_BIG_ENDIAN if EXPERIMENTAL
 
 	select SYS_SUPPORTS_BIG_ENDIAN if EXPERIMENTAL
 
@@ -669,6 +735,7 @@ config TOSHIBA_JMR3927
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
 	select MIPS_TX3927
 
 	select MIPS_TX3927
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_TX39XX
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select TOSHIBA_BOARDS
 
 	select TOSHIBA_BOARDS
 
@@ -681,6 +748,7 @@ config TOSHIBA_RBTX4927
 
 	select I8259
 
 	select I8259
 
 	select ISA
 
 	select ISA
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_TX49XX
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_64BIT_KERNEL
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -699,6 +767,7 @@ config TOSHIBA_RBTX4938
 
 	select I8259
 
 	select I8259
 
 	select ISA
 
 	select ISA
 
 	select SWAP_IO_SPACE
 
 	select SWAP_IO_SPACE
 
+	select SYS_HAS_CPU_TX49XX
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
 	select SYS_SUPPORTS_BIG_ENDIAN
 
@@ -878,6 +947,7 @@ config SOC_AU1200
 
 
 
 config SOC_AU1X00
 
 config SOC_AU1X00
 
 	bool
 
 	bool
 
+	select SYS_HAS_CPU_MIPS32_R1
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select SYS_SUPPORTS_32BIT_KERNEL
 
 
 
 config PNX8550
 
 config PNX8550
 
@@ -886,9 +956,10 @@ config PNX8550
 
 
 
 config SOC_PNX8550
 
 config SOC_PNX8550
 
 	bool
 
 	bool
 
-	select SYS_SUPPORTS_32BIT_KERNEL
 
 	select DMA_NONCOHERENT
 
 	select DMA_NONCOHERENT
 
 	select HW_HAS_PCI
 
 	select HW_HAS_PCI
 
+	select SYS_HAS_CPU_R4X00
 
+	select SYS_SUPPORTS_32BIT_KERNEL
 
 
 
 config SWAP_IO_SPACE
 
 config SWAP_IO_SPACE
 
 	bool
 
 	bool
 
@@ -980,6 +1051,7 @@ choice
 
 
 
 config CPU_MIPS32_R1
 
 config CPU_MIPS32_R1
 
 	bool "MIPS32 Release 1"
 
 	bool "MIPS32 Release 1"
 
+	depends on SYS_HAS_CPU_MIPS32_R1
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	help
 
 	help
 
@@ -995,6 +1067,7 @@ config CPU_MIPS32_R1
 
 
 
 config CPU_MIPS32_R2
 
 config CPU_MIPS32_R2
 
 	bool "MIPS32 Release 2"
 
 	bool "MIPS32 Release 2"
 
+	depends on SYS_HAS_CPU_MIPS32_R2
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	help
 
 	help
 
@@ -1006,6 +1079,7 @@ config CPU_MIPS32_R2
 
 
 
 config CPU_MIPS64_R1
 
 config CPU_MIPS64_R1
 
 	bool "MIPS64 Release 1"
 
 	bool "MIPS64 Release 1"
 
+	depends on SYS_HAS_CPU_MIPS64_R1
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
@@ -1022,6 +1096,7 @@ config CPU_MIPS64_R1
 
 
 
 config CPU_MIPS64_R2
 
 config CPU_MIPS64_R2
 
 	bool "MIPS64 Release 2"
 
 	bool "MIPS64 Release 2"
 
+	depends on SYS_HAS_CPU_MIPS64_R2
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
@@ -1034,6 +1109,7 @@ config CPU_MIPS64_R2
 
 
 
 config CPU_R3000
 
 config CPU_R3000
 
 	bool "R3000"
 
 	bool "R3000"
 
+	depends on SYS_HAS_CPU_R3000
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_HIGHMEM
 
 	select CPU_SUPPORTS_HIGHMEM
 
 	help
 
 	help
 
@@ -1046,10 +1122,12 @@ config CPU_R3000
 
 
 
 config CPU_TX39XX
 
 config CPU_TX39XX
 
 	bool "R39XX"
 
 	bool "R39XX"
 
+	depends on SYS_HAS_CPU_TX39XX
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 
 
 config CPU_VR41XX
 
 config CPU_VR41XX
 
 	bool "R41xx"
 
 	bool "R41xx"
 
+	depends on SYS_HAS_CPU_VR41XX
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	help
 
 	help
 
@@ -1060,6 +1138,7 @@ config CPU_VR41XX
 
 
 
 config CPU_R4300
 
 config CPU_R4300
 
 	bool "R4300"
 
 	bool "R4300"
 
+	depends on SYS_HAS_CPU_R4300
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	help
 
 	help
 
@@ -1067,6 +1146,7 @@ config CPU_R4300
 
 
 
 config CPU_R4X00
 
 config CPU_R4X00
 
 	bool "R4x00"
 
 	bool "R4x00"
 
+	depends on SYS_HAS_CPU_R4X00
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	help
 
 	help
 
@@ -1075,11 +1155,13 @@ config CPU_R4X00
 
 
 
 config CPU_TX49XX
 
 config CPU_TX49XX
 
 	bool "R49XX"
 
 	bool "R49XX"
 
+	depends on SYS_HAS_CPU_TX49XX
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 
 
 config CPU_R5000
 
 config CPU_R5000
 
 	bool "R5000"
 
 	bool "R5000"
 
+	depends on SYS_HAS_CPU_R5000
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	help
 
 	help
 
@@ -1087,12 +1169,14 @@ config CPU_R5000
 
 
 
 config CPU_R5432
 
 config CPU_R5432
 
 	bool "R5432"
 
 	bool "R5432"
 
+	depends on SYS_HAS_CPU_R5432
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 
 
 config CPU_R6000
 
 config CPU_R6000
 
 	bool "R6000"
 
 	bool "R6000"
 
 	depends on EXPERIMENTAL
 
 	depends on EXPERIMENTAL
 
+	depends on SYS_HAS_CPU_R6000
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	help
 
 	help
 
 	  MIPS Technologies R6000 and R6000A series processors.  Note these
 
 	  MIPS Technologies R6000 and R6000A series processors.  Note these
 
@@ -1100,6 +1184,7 @@ config CPU_R6000
 
 
 
 config CPU_NEVADA
 
 config CPU_NEVADA
 
 	bool "RM52xx"
 
 	bool "RM52xx"
 
+	depends on SYS_HAS_CPU_NEVADA
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	help
 
 	help
 
@@ -1108,6 +1193,7 @@ config CPU_NEVADA
 
 config CPU_R8000
 
 config CPU_R8000
 
 	bool "R8000"
 
 	bool "R8000"
 
 	depends on EXPERIMENTAL
 
 	depends on EXPERIMENTAL
 
+	depends on SYS_HAS_CPU_R8000
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	help
 
 	help
 
@@ -1116,6 +1202,7 @@ config CPU_R8000
 
 
 
 config CPU_R10000
 
 config CPU_R10000
 
 	bool "R10000"
 
 	bool "R10000"
 
+	depends on SYS_HAS_CPU_R10000
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
@@ -1125,6 +1212,7 @@ config CPU_R10000
 
 
 
 config CPU_RM7000
 
 config CPU_RM7000
 
 	bool "RM7000"
 
 	bool "RM7000"
 
+	depends on SYS_HAS_CPU_RM7000
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
@@ -1132,6 +1220,7 @@ config CPU_RM7000
 
 
 
 config CPU_RM9000
 
 config CPU_RM9000
 
 	bool "RM9000"
 
 	bool "RM9000"
 
+	depends on SYS_HAS_CPU_RM9000
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_HAS_PREFETCH
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
@@ -1139,12 +1228,70 @@ config CPU_RM9000
 
 
 
 config CPU_SB1
 
 config CPU_SB1
 
 	bool "SB1"
 
 	bool "SB1"
 
+	depends on SYS_HAS_CPU_SB1
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_32BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_64BIT_KERNEL
 
 	select CPU_SUPPORTS_HIGHMEM
 
 	select CPU_SUPPORTS_HIGHMEM
 
 
 
 endchoice
 
 endchoice
 
 
 
+config SYS_HAS_CPU_MIPS32_R1
 
+	bool
 
+
 
+config SYS_HAS_CPU_MIPS32_R2
 
+	bool
 
+
 
+config SYS_HAS_CPU_MIPS64_R1
 
+	bool
 
+
 
+config SYS_HAS_CPU_MIPS64_R2
 
+	bool
 
+
 
+config SYS_HAS_CPU_R3000
 
+	bool
 
+
 
+config SYS_HAS_CPU_TX39XX
 
+	bool
 
+
 
+config SYS_HAS_CPU_VR41XX
 
+	bool
 
+
 
+config SYS_HAS_CPU_R4300
 
+	bool
 
+
 
+config SYS_HAS_CPU_R4X00
 
+	bool
 
+
 
+config SYS_HAS_CPU_TX49XX
 
+	bool
 
+
 
+config SYS_HAS_CPU_R5000
 
+	bool
 
+
 
+config SYS_HAS_CPU_R5432
 
+	bool
 
+
 
+config SYS_HAS_CPU_R6000
 
+	bool
 
+
 
+config SYS_HAS_CPU_NEVADA
 
+	bool
 
+
 
+config SYS_HAS_CPU_R8000
 
+	bool
 
+
 
+config SYS_HAS_CPU_R10000
 
+	bool
 
+
 
+config SYS_HAS_CPU_RM7000
 
+	bool
 
+
 
+config SYS_HAS_CPU_RM9000
 
+	bool
 
+
 
+config SYS_HAS_CPU_SB1
 
+	bool
 
+
 
 endmenu
 
 endmenu
 
 
 
 #
 
 #