patch-2.4.15 linux/arch/arm/config.in

Next file: linux/arch/arm/kernel/setup.c
Previous file: linux/arch/arm/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.14/linux/arch/arm/config.in linux/arch/arm/config.in
@@ -12,7 +12,7 @@
 define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y
 define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
 define_bool CONFIG_GENERIC_BUST_SPINLOCK n
-
+define_bool CONFIG_GENERIC_ISA_DMA n
 
 mainmenu_option next_comment
 comment 'Code maturity level options'
@@ -261,19 +261,42 @@
    fi
 fi
 
+# ARM926T
+if [ "$CONFIG_ARCH_INTEGRATOR" = "y" ]; then
+   bool 'Support ARM926T processor' CONFIG_CPU_ARM926T
+else
+   define_bool CONFIG_CPU_ARM926T n
+fi
+if [ "$CONFIG_CPU_ARM926T" = "y" ]; then
+   bool '  ARM926T CPU idle' CONFIG_CPU_ARM926_CPU_IDLE
+   bool '  ARM926T I-Cache on' CONFIG_CPU_ARM926_I_CACHE_ON
+   bool '  ARM926T D-Cache on' CONFIG_CPU_ARM926_D_CACHE_ON
+   if [ "$CONFIG_CPU_ARM926_D_CACHE_ON" = "y" ] ; then
+      bool '  Force write through caches on ARM926T' CONFIG_CPU_ARM926_WRITETHROUGH
+   fi
+   if [ "$CONFIG_CPU_ARM926_I_CACHE_ON" = "y" -o \
+        "$CONFIG_CPU_ARM926_D_CACHE_ON" = "y" ]; then
+      bool '  Round robin I and D cache replacement algorithm' CONFIG_CPU_ARM926_ROUND_ROBIN
+   fi
+fi
+
 # ARM1020
-#if [ "$CONFIG_ARCH_INTEGRATOR" = "y" ]; then
-#   bool 'Support ARM1020 processor' CONFIG_CPU_ARM1020
-#else
+if [ "$CONFIG_ARCH_INTEGRATOR" = "y" ]; then
+   bool 'Support ARM1020 processor' CONFIG_CPU_ARM1020
+else
     define_bool CONFIG_CPU_ARM1020 n
-#fi
-#if [ "$CONFIG_CPU_ARM1020" = "y" ]; then
-#   bool '  ARM10 I-Cache on' CONFIG_CPU_ARM10_I_CACHE_ON
-#   bool '  ARM10 D-Cache on' CONFIG_CPU_ARM10_D_CACHE_ON
-#   if [ "$CONFIG_CPU_ARM10_D_CACHE_ON" = "y" ] ; then
-#      bool '  Force write through caches on ARM10' CONFIG_CPU_ARM10_FORCE_WRITE_THROUGH
-#   fi
-#fi
+fi
+if [ "$CONFIG_CPU_ARM1020" = "y" ]; then
+   bool '  ARM1020 I-Cache on' CONFIG_CPU_ARM1020_I_CACHE_ON
+   bool '  ARM10 D-Cache on' CONFIG_CPU_ARM1020_D_CACHE_ON
+   if [ "$CONFIG_CPU_ARM1020_D_CACHE_ON" = "y" ] ; then
+      bool '  Force write through caches on ARM1020' CONFIG_CPU_ARM1020_FORCE_WRITE_THROUGH
+   fi
+   if [ "$CONFIG_CPU_ARM1020_I_CACHE_ON" = "y" -o \
+        "$CONFIG_CPU_ARM1020_D_CACHE_ON" = "y" ]; then
+      bool '  Round robin I and D cache replacement algorithm' CONFIG_CPU_ARM1020_ROUND_ROBIN
+   fi
+fi
 
 # SA110
 if [ "$CONFIG_ARCH_EBSA110"  = "y" -o "$CONFIG_FOOTBRIDGE" = "y" -o \

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)