Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / v850 / Kconfig

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index bcf825875d1706f4c108d4d75a5f24bbd814ba6b..4379f43505efafe27f1c50dca47b970f3fdad3df 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -10,6 +10,9 @@ mainmenu "uClinux/v850 (w/o MMU) Kernel Configuration"
 config MMU
                bool
        default n
+config ZONE_DMA
+       bool
+       default y
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
@@ -34,6 +37,10 @@ config GENERIC_IRQ_PROBE
        bool
        default y
 
+config GENERIC_TIME
+       bool
+       default y
+
 config TIME_LOW_RES
        bool
        default y
@@ -46,6 +53,9 @@ config ARCH_HAS_ILOG2_U64
        bool
        default n
 
+config ARCH_SUPPORTS_AOUT
+       def_bool y
+
 # Turn off some random 386 crap that can affect device config
 config ISA
        bool
@@ -68,6 +78,7 @@ config MCA
 config V850
        bool
        default y
+       select HAVE_IDE
 
 menu "Processor type and features"
 
@@ -105,17 +116,17 @@ menu "Processor type and features"
    # currently support
    config V850E_MA1
          bool
-         depends RTE_CB_MA1
+         depends on RTE_CB_MA1
          default y
    # Similarly for the RTE-V850E/NB85E-CB - V850E/TEG
    config V850E_TEG
          bool
-         depends RTE_CB_NB85E
+         depends on RTE_CB_NB85E
          default y
    # ... and the RTE-V850E/ME2-CB - V850E/ME2
    config V850E_ME2
          bool
-         depends RTE_CB_ME2
+         depends on RTE_CB_ME2
          default y
 
 
@@ -123,7 +134,7 @@ menu "Processor type and features"
 
    config V850E2_SIM85E2
          bool
-         depends V850E2_SIM85E2C || V850E2_SIM85E2S
+         depends on V850E2_SIM85E2C || V850E2_SIM85E2S
          default y
 
 
@@ -132,7 +143,7 @@ menu "Processor type and features"
    # V850E2 processors
    config V850E2
          bool
-         depends V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
+         depends on V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
          default y
 
 
@@ -141,7 +152,7 @@ menu "Processor type and features"
    # Boards in the RTE-x-CB series
    config RTE_CB
          bool
-         depends RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
+         depends on RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
          default y
 
    config RTE_CB_MULTI
@@ -149,28 +160,28 @@ menu "Processor type and features"
          # RTE_CB_NB85E can either have multi ROM support or not, but
          # other platforms (currently only RTE_CB_MA1) require it.
          prompt "Multi monitor ROM support" if RTE_CB_NB85E
-         depends RTE_CB_MA1 || RTE_CB_NB85E
+         depends on RTE_CB_MA1 || RTE_CB_NB85E
          default y
 
    config RTE_CB_MULTI_DBTRAP
          bool "Pass illegal insn trap / dbtrap to kernel"
-         depends RTE_CB_MULTI
+         depends on RTE_CB_MULTI
          default n
 
    config RTE_CB_MA1_KSRAM
          bool "Kernel in SRAM (limits size of kernel)"
-         depends RTE_CB_MA1 && RTE_CB_MULTI
+         depends on RTE_CB_MA1 && RTE_CB_MULTI
          default n
 
    config RTE_MB_A_PCI
          bool "Mother-A PCI support"
-         depends RTE_CB
+         depends on RTE_CB
          default y
 
    # The GBUS is used to talk to the RTE-MOTHER-A board
    config RTE_GBUS_INT
          bool
-         depends RTE_MB_A_PCI
+         depends on RTE_MB_A_PCI
          default y
 
    # The only PCI bus we support is on the RTE-MOTHER-A board
@@ -205,16 +216,23 @@ menu "Processor type and features"
          bool
          default !V850E_CACHE && !V850E2_CACHE
 
+   # HZ depends on the platform
+   config HZ
+         int
+         default 24  if V850E_SIM || V850E2_SIM85E2
+         default 122 if V850E2_FPGA85E2C
+         default 100
+
    #### Misc config
 
    config ROM_KERNEL
          bool "Kernel in ROM"
-         depends V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2
+         depends on V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2
 
    # Some platforms pre-zero memory, in which case the kernel doesn't need to
    config ZERO_BSS
          bool
-         depends !V850E2_SIM85E2C
+         depends on !V850E2_SIM85E2C
          default y
 
    # The crappy-ass zone allocator requires that the start of allocatable
@@ -225,22 +243,14 @@ menu "Processor type and features"
 
    config V850E_HIGHRES_TIMER
          bool "High resolution timer support"
-         depends V850E_TIMER_D
+         depends on V850E_TIMER_D
    config TIME_BOOTUP
          bool "Time bootup"
-         depends V850E_HIGHRES_TIMER
+         depends on V850E_HIGHRES_TIMER
 
    config RESET_GUARD
          bool "Reset Guard"
 
-   config LARGE_ALLOCS
-         bool "Allow allocating large blocks (> 1MB) of memory"
-         help
-            Allow the slab memory allocator to keep chains for very large
-            memory sizes - upto 32MB. You may need this if your system has
-            a lot of RAM, and you need to able to allocate very large
-            contiguous chunks. If unsure, say N.
-
 source "mm/Kconfig"
 
 endmenu