VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / arch / arm / mach-lh7a40x / Kconfig

diff --git a/arch/arm/mach-lh7a40x/Kconfig b/arch/arm/mach-lh7a40x/Kconfig
index 4475dba..8a17867 100644 (file)
--- a/arch/arm/mach-lh7a40x/Kconfig
+++ b/arch/arm/mach-lh7a40x/Kconfig
@@ -1,9 +1,9 @@
+if ARCH_LH7A40X
 
 menu "LH7A40X Implementations"
 
 config MACH_KEV7A400
        bool "KEV7A400"
-       depends on ARCH_LH7A40X
        select ARCH_LH7A400
        help
          Say Y here if you are using the Sharp KEV7A400 development
@@ -12,9 +12,8 @@ config MACH_KEV7A400
 
 config MACH_LPD7A400
        bool "LPD7A400 Card Engine"
-       depends on ARCH_LH7A40X
        select ARCH_LH7A400
-       select IDE_POLL
+#      select IDE_POLL
        help
          Say Y here if you are using Logic Product Development's
          LPD7A400 CardEngine.  For the time being, the LPD7A400 and
@@ -22,9 +21,8 @@ config MACH_LPD7A400
 
 config MACH_LPD7A404
        bool "LPD7A404 Card Engine"
-       depends on ARCH_LH7A40X
        select ARCH_LH7A404
-       select IDE_POLL
+#      select IDE_POLL
        help
          Say Y here if you are using Logic Product Development's
          LPD7A404 CardEngine. For the time being, the LPD7A400 and
@@ -36,4 +34,37 @@ config ARCH_LH7A400
 config ARCH_LH7A404
        bool
 
+config LH7A40X_CONTIGMEM
+       bool "Disable NUMA Support"
+       depends on ARCH_LH7A40X
+       help
+         Say Y here if your bootloader sets the SROMLL bit(s) in
+         the SDRAM controller, organizing memory as a contiguous
+         array.  This option will disable CONFIG_DISCONTIGMEM and
+          force the kernel to manage all memory in one node.
+
+         Setting this option incorrectly may prevent the kernel from
+         booting.  It is OK to leave it N.
+
+         For more information, consult
+           <file:Documentation/arm/Sharp-LH/SDRAM>.
+
+config LH7A40X_ONE_BANK_PER_NODE
+       bool "Optimize NUMA Node Tables for Size"
+       depends on ARCH_LH7A40X && !LH7A40X_CONTIGMEM
+       help
+         Say Y here to produce compact memory node tables.  By
+         default pairs of adjacent physical RAM banks are managed
+         together in a single node, incurring some wasted overhead
+         in the node tables, however also maintaining compatibility
+         with systems where physical memory is truly contiguous.
+
+         Setting this option incorrectly may prevent the kernel from
+         booting.  It is OK to leave it N.
+
+         For more information, consult
+           <file:Documentation/arm/Sharp-LH/SDRAM>.
+
 endmenu
+
+endif