Menu
▾
▴
[Linuxconsole-commit]CVS: ruby/linux/arch/arm config.in,1.22,1.23
|
From: James S. <jsi...@us...> - 2002-04-16 19:37:13
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/arm
In directory usw-pr-cvs1:/tmp/cvs-serv13887/linux/arch/arm
Modified Files:
config.in
Log Message:
Synced to 2.5.8.
Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/arm/config.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- config.in 22 Mar 2002 20:13:57 -0000 1.22
+++ config.in 16 Apr 2002 17:41:46 -0000 1.23
@@ -14,20 +14,7 @@
define_bool CONFIG_GENERIC_BUST_SPINLOCK n
define_bool CONFIG_GENERIC_ISA_DMA n
-mainmenu_option next_comment
-comment 'Code maturity level options'
-bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
-bool 'Prompt for obsolete code/drivers' CONFIG_OBSOLETE
-endmenu
-
-
-mainmenu_option next_comment
-comment 'Loadable module support'
-bool 'Enable loadable module support' CONFIG_MODULES
-dep_bool ' Set version information on all module symbols' CONFIG_MODVERSIONS $CONFIG_MODULES
-dep_bool ' Kernel module loader' CONFIG_KMOD $CONFIG_MODULES
-endmenu
-
+source init/Config.in
mainmenu_option next_comment
comment 'System Type'
@@ -104,6 +91,7 @@
dep_bool ' FreeBird-v1.1' CONFIG_SA1100_FREEBIRD $CONFIG_ARCH_SA1100
dep_bool ' GraphicsClient Plus' CONFIG_SA1100_GRAPHICSCLIENT $CONFIG_ARCH_SA1100
dep_bool ' GraphicsMaster' CONFIG_SA1100_GRAPHICSMASTER $CONFIG_ARCH_SA1100
+dep_bool ' HP Labs BadgePAD 4' CONFIG_SA1100_BADGE4 $CONFIG_ARCH_SA1100
dep_bool ' HP Jornada 720' CONFIG_SA1100_JORNADA720 $CONFIG_ARCH_SA1100
dep_bool ' HuW WebPanel' CONFIG_SA1100_HUW_WEBPANEL $CONFIG_ARCH_SA1100
dep_bool ' Itsy' CONFIG_SA1100_ITSY $CONFIG_ARCH_SA1100
@@ -120,6 +108,7 @@
dep_bool ' Victor' CONFIG_SA1100_VICTOR $CONFIG_ARCH_SA1100
dep_bool ' XP860' CONFIG_SA1100_XP860 $CONFIG_ARCH_SA1100
dep_bool ' Yopy' CONFIG_SA1100_YOPY $CONFIG_ARCH_SA1100
+dep_bool ' Stork' CONFIG_SA1100_STORK $CONFIG_ARCH_SA1100
# Determine if SA1111 support is required
if [ "$CONFIG_ASSABET_NEPONSET" = "y" -o \
@@ -128,7 +117,8 @@
"$CONFIG_SA1100_XP860" = "y" -o \
"$CONFIG_SA1100_GRAPHICSMASTER" = "y" -o \
"$CONFIG_SA1100_PT_SYSTEM3" = "y" -o \
- "$CONFIG_SA1100_ADSBITSY" = "y" ]; then
+ "$CONFIG_SA1100_ADSBITSY" = "y" -o \
+ "$CONFIG_SA1100_BADGE4" = "y" ]; then
define_bool CONFIG_SA1111 y
define_int CONFIG_FORCE_MAX_ZONEORDER 9
fi
@@ -147,6 +137,7 @@
dep_bool ' CLEP7312' CONFIG_ARCH_CLEP7312 $CONFIG_ARCH_CLPS711X
dep_bool ' EDB7211' CONFIG_ARCH_EDB7211 $CONFIG_ARCH_CLPS711X
dep_bool ' P720T' CONFIG_ARCH_P720T $CONFIG_ARCH_CLPS711X
+dep_bool ' FORTUNET' CONFIG_ARCH_FORTUNET $CONFIG_ARCH_CLPS711X
# XXX Maybe these should indicate register compatibility
# instead of being mutually exclusive.
@@ -227,7 +218,7 @@
comment 'Processor Type'
# Firstly, figure out what processor architecture version we should be using.
-# This depends more on the machine type than anything else.
+# This defines the compiler instruction set which depends on the machine type.
if [ "$CONFIG_ARCH_RPC" = "y" -o "$CONFIG_ARCH_CLPS7500" = "y" ]; then
define_bool CONFIG_CPU_32v3 y
@@ -244,10 +235,15 @@
else
define_bool CONFIG_CPU_32v4 n
fi
+if [ "$CONFIG_ARCH_IOP310" = "y" -o "$CONFIG_ARCH_ADIFCC" = "y" ]; then
+ define_bool CONFIG_CPU_32v5 y
+else
+ define_bool CONFIG_CPU_32v5 n
+fi
-# Select CPU types depending on the architecture selected.
-# We use this to select which CPUs are supported, and to select
-# the compiler tuning options.
+# Select CPU types depending on the architecture selected. This selects
+# which CPUs we support in the kernel image, and the compiler instruction
+# optimiser behaviour.
# ARM610
if [ "$CONFIG_ARCH_RPC" = "y" ]; then
@@ -286,14 +282,6 @@
else
define_bool CONFIG_CPU_ARM920T n
fi
-if [ "$CONFIG_CPU_ARM920T" = "y" ]; then
- bool ' ARM920T CPU idle' CONFIG_CPU_ARM920_CPU_IDLE
- bool ' ARM920T I-Cache on' CONFIG_CPU_ARM920_I_CACHE_ON
- bool ' ARM920T D-Cache on' CONFIG_CPU_ARM920_D_CACHE_ON
- if [ "$CONFIG_CPU_ARM920_D_CACHE_ON" = "y" ] ; then
- bool ' Force write through caches on ARM920T' CONFIG_CPU_ARM920_WRITETHROUGH
- fi
-fi
# ARM922T
if [ "$CONFIG_ARCH_CAMELOT" = "y" ]; then
@@ -301,14 +289,6 @@
else
define_bool CONFIG_CPU_ARM922T n
fi
-if [ "$CONFIG_CPU_ARM922T" = "y" ]; then
- bool ' ARM922T CPU idle' CONFIG_CPU_ARM922_CPU_IDLE
- bool ' ARM922T I-Cache on' CONFIG_CPU_ARM922_I_CACHE_ON
- bool ' ARM922T D-Cache on' CONFIG_CPU_ARM922_D_CACHE_ON
- if [ "$CONFIG_CPU_ARM922_D_CACHE_ON" = "y" ] ; then
- bool ' Force write through caches on ARM922T' CONFIG_CPU_ARM922_WRITETHROUGH
- fi
-fi
# ARM926T
if [ "$CONFIG_ARCH_INTEGRATOR" = "y" ]; then
@@ -316,18 +296,6 @@
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
@@ -335,17 +303,6 @@
else
define_bool CONFIG_CPU_ARM1020 n
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 \
@@ -369,8 +326,9 @@
# XScale
if [ "$CONFIG_ARCH_IOP310" = "y" -o "$CONFIG_ARCH_ADIFCC" = "y" ]; then
- define_bool CONFIG_CPU_32v5 y
define_bool CONFIG_CPU_XSCALE y
+else
+ define_bool CONFIG_CPU_XSCALE n
fi
#if [ "$CONFIG_CPU_XSCALE" = "y" ]; then
@@ -383,9 +341,34 @@
define_bool CONFIG_XSCALE_PMU n
fi
-if [ "$CONFIG_CPU_32" = "y" ]; then
+comment 'Processor Features'
+
+if [ "$CONFIG_CPU_ARM720T" = "y" -o "$CONFIG_CPU_ARM920T" = "y" -o \
+ "$CONFIG_CPU_ARM922T" = "y" -o "$CONFIG_CPU_ARM926T" = "y" -o \
+ "$CONFIG_CPU_ARM1020" = "y" -o "$CONFIG_CPU_XSCALE" = "y" ]; then
dep_bool 'Support Thumb instructions (experimental)' CONFIG_ARM_THUMB $CONFIG_EXPERIMENTAL
fi
+if [ "$CONFIG_CPU_ARM920T" = "y" -o "$CONFIG_CPU_ARM922T" = "y" -o \
+ "$CONFIG_CPU_ARM926T" = "y" -o "$CONFIG_CPU_ARM1020" = "y" ]; then
+ bool 'Disable I-Cache' CONFIG_CPU_ICACHE_DISABLE
+ bool 'Disable D-Cache' CONFIG_CPU_DCACHE_DISABLE
+ if [ "$CONFIG_CPU_DISABLE_DCACHE" = "n" ]; then
+ bool 'Force write through D-cache' CONFIG_CPU_DCACHE_WRITETHROUGH
+ fi
+fi
+if [ "$CONFIG_CPU_ARM926T" = "y" -o "$CONFIG_CPU_ARM1020" = "y" ]; then
+ if [ "$CONFIG_CPU_ICACHE_DISABLE" = "n" -o "$CONFIG_CPU_DCACHE_DISABLE" = "n" ]; then
+ bool 'Round robin I and D cache replacement algorithm' CONFIG_CPU_CACHE_ROUND_ROBIN
+ fi
+fi
+if [ "$CONFIG_CPU_ARM1020" = "y" ]; then
+ bool 'Disable branch prediction' CONFIG_CPU_BPREDICT_DISABLE
+fi
+
+endmenu
+
+mainmenu_option next_comment
+comment 'General setup'
# Select various configuration options depending on the machine type
if [ "$CONFIG_ARCH_EDB7211" = "y" -o \
@@ -395,11 +378,6 @@
define_bool CONFIG_DISCONTIGMEM n
fi
-endmenu
-
-mainmenu_option next_comment
-comment 'General setup'
-
# Now handle the bus types
if [ "$CONFIG_ARCH_FTVPCI" = "y" -o \
"$CONFIG_ARCH_SHARK" = "y" -o \
@@ -467,10 +445,6 @@
else
define_bool CONFIG_PCMCIA n
fi
-bool 'Networking support' CONFIG_NET
-bool 'System V IPC' CONFIG_SYSVIPC
-bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
-bool 'Sysctl support' CONFIG_SYSCTL
comment 'At least one math emulation must be selected'
tristate 'NWFPE math emulation' CONFIG_FPE_NWFPE
dep_tristate 'FastFPE math emulation (experimental)' CONFIG_FPE_FASTFPE $CONFIG_EXPERIMENTAL
@@ -481,6 +455,7 @@
tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
bool 'Power Management support' CONFIG_PM
+dep_bool 'Preemptible Kernel (experimental)' CONFIG_PREEMPT $CONFIG_CPU_32 $CONFIG_EXPERIMENTAL
dep_tristate 'Advanced Power Management Emulation' CONFIG_APM $CONFIG_PM
dep_tristate 'RISC OS personality' CONFIG_ARTHUR $CONFIG_CPU_32
@@ -537,7 +512,6 @@
fi
endmenu
-source drivers/serial/Config.in
source drivers/parport/Config.in
if [ "$CONFIG_ALIGNMENT_TRAP" = "y" ]; then
@@ -611,11 +585,15 @@
#
# input before char - char/joystick depends on it. As does USB.
#
-source drivers/usb/Config.in
source drivers/input/Config.in
+source drivers/char/Config.in
+
+source drivers/media/Config.in
source fs/Config.in
+source drivers/video/Config.in
+
if [ "$CONFIG_ARCH_ACORN" = "y" -o \
"$CONFIG_ARCH_CLPS7500" = "y" -o \
"$CONFIG_ARCH_TBOX" = "y" -o \
@@ -627,14 +605,14 @@
tristate 'Sound support' CONFIG_SOUND
if [ "$CONFIG_SOUND" != "n" ]; then
- source drivers/sound/Config.in
+ source sound/Config.in
fi
endmenu
fi
source drivers/misc/Config.in
-source drivers/media/Config.in
-source drivers/video/Config.in
+
+source drivers/usb/Config.in
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
source net/bluetooth/Config.in
@@ -648,7 +626,6 @@
bool 'Compile kernel without frame pointer' CONFIG_NO_FRAME_POINTER
bool 'Verbose user fault messages' CONFIG_DEBUG_USER
bool 'Include debugging information in kernel binary' CONFIG_DEBUG_INFO
-dep_bool 'Disable pgtable cache' CONFIG_NO_PGT_CACHE $CONFIG_CPU_26
bool 'Kernel debugging' CONFIG_DEBUG_KERNEL
dep_bool ' Debug memory allocations' CONFIG_DEBUG_SLAB $CONFIG_DEBUG_KERNEL
@@ -661,7 +638,6 @@
dep_bool ' Kernel low-level debugging functions' CONFIG_DEBUG_LL $CONFIG_DEBUG_KERNEL
dep_bool ' Kernel low-level debugging messages via footbridge serial port' CONFIG_DEBUG_DC21285_PORT $CONFIG_DEBUG_LL $CONFIG_FOOTBRIDGE
dep_bool ' Kernel low-level debugging messages via UART2' CONFIG_DEBUG_CLPS711X_UART2 $CONFIG_DEBUG_LL $CONFIG_ARCH_CLPS711X
-dep_bool ' Kernel low-level debugging messages via SA1100 Ser3 (otherwise Ser1)' CONFIG_DEBUG_LL_SER3 $CONFIG_DEBUG_LL $CONFIG_ARCH_SA1100
endmenu
source lib/Config.in
|
