Commit 8653fe49 authored by Paul Mundt's avatar Paul Mundt

sh64: Tidy up Kconfig dependencies.

Now that the ROM-RAM and generic boards are killed off, refactor
the dependencies accordingly. Those were the only special cases,
so all of the Kconfig dependency hell gets much cleaner as a result.
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 049aa166
...@@ -36,6 +36,14 @@ config GENERIC_CALIBRATE_DELAY ...@@ -36,6 +36,14 @@ config GENERIC_CALIBRATE_DELAY
bool bool
default y default y
config GENERIC_HARDIRQS
bool
default y
config GENERIC_IRQ_PROBE
bool
default y
config RWSEM_XCHGADD_ALGORITHM config RWSEM_XCHGADD_ALGORITHM
bool bool
...@@ -146,60 +154,54 @@ comment "Memory options" ...@@ -146,60 +154,54 @@ comment "Memory options"
config CACHED_MEMORY_OFFSET config CACHED_MEMORY_OFFSET
hex "Cached Area Offset" hex "Cached Area Offset"
depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
default "20000000" default "20000000"
config MEMORY_START config MEMORY_START
hex "Physical memory start address" hex "Physical memory start address"
depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
default "80000000" default "80000000"
config MEMORY_SIZE_IN_MB config MEMORY_SIZE_IN_MB
int "Memory size (in MB)" if SH_HARP || SH_CAYMAN || SH_SIMULATOR int "Memory size (in MB)"
default "64" if SH_HARP || SH_CAYMAN
default "8" if SH_SIMULATOR default "8" if SH_SIMULATOR
default "64"
comment "Cache options" comment "Cache options"
config DCACHE_DISABLED
bool "DCache Disabling"
depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
choice choice
prompt "DCache mode" prompt "DCache mode"
depends on !DCACHE_DISABLED && !SH_SIMULATOR default DCACHE_DISABLED if SH_SIMULATOR
default DCACHE_WRITE_BACK default DCACHE_WRITE_BACK
config DCACHE_WRITE_BACK config DCACHE_WRITE_BACK
bool "Write-back" bool "Write-back"
depends on !SH_SIMULATOR
config DCACHE_WRITE_THROUGH config DCACHE_WRITE_THROUGH
bool "Write-through" bool "Write-through"
depends on !SH_SIMULATOR
config DCACHE_DISABLED
bool "Disabled"
endchoice endchoice
config ICACHE_DISABLED config ICACHE_DISABLED
bool "ICache Disabling" bool "ICache Disabling"
depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
config PCIDEVICE_MEMORY_START config PCIDEVICE_MEMORY_START
hex hex
depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
default "C0000000" default "C0000000"
config DEVICE_MEMORY_START config DEVICE_MEMORY_START
hex hex
depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
default "E0000000" default "E0000000"
config FLASH_MEMORY_START config FLASH_MEMORY_START
hex "Flash memory/on-chip devices start address" hex "Flash memory/on-chip devices start address"
depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
default "00000000" default "00000000"
config PCI_BLOCK_START config PCI_BLOCK_START
hex "PCI block start address" hex "PCI block start address"
depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
default "40000000" default "40000000"
comment "CPU Subtype specific options" comment "CPU Subtype specific options"
...@@ -208,8 +210,10 @@ config SH64_ID2815_WORKAROUND ...@@ -208,8 +210,10 @@ config SH64_ID2815_WORKAROUND
bool "Include workaround for SH5-101 cut2 silicon defect ID2815" bool "Include workaround for SH5-101 cut2 silicon defect ID2815"
comment "Misc options" comment "Misc options"
config HEARTBEAT config HEARTBEAT
bool "Heartbeat LED" bool "Heartbeat LED"
depends on SH_CAYMAN
config HDSP253_LED config HDSP253_LED
bool "Support for HDSP-253 LED" bool "Support for HDSP-253 LED"
...@@ -236,6 +240,7 @@ config SBUS ...@@ -236,6 +240,7 @@ config SBUS
config PCI config PCI
bool "PCI support" bool "PCI support"
depends on SH_CAYMAN
help help
Find out whether you have a PCI motherboard. PCI is the name of a Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside bus system, i.e. the way the CPU talks to the other stuff inside
...@@ -288,15 +293,3 @@ source "security/Kconfig" ...@@ -288,15 +293,3 @@ source "security/Kconfig"
source "crypto/Kconfig" source "crypto/Kconfig"
source "lib/Kconfig" source "lib/Kconfig"
#
# Use the generic interrupt handling code in kernel/irq/:
#
config GENERIC_HARDIRQS
bool
default y
config GENERIC_IRQ_PROBE
bool
default y
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment