X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2FKconfig;h=d05e02497c11d5263b0f7f550f9606bac7ce900d;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=096ea1dd3de94cdcac9965f1f04902114e3fcba4;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 096ea1dd3..d05e02497 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -57,6 +57,10 @@ config RWSEM_GENERIC_SPINLOCK
config RWSEM_XCHGADD_ALGORITHM
bool
+config GENERIC_CALIBRATE_DELAY
+ bool
+ default y
+
config GENERIC_BUST_SPINLOCK
bool
@@ -83,6 +87,8 @@ config ARCH_CLPS711X
config ARCH_CO285
bool "Co-EBSA285"
+ select FOOTBRIDGE
+ select FOOTBRIDGE_ADDIN
config ARCH_EBSA110
bool "EBSA-110"
@@ -101,6 +107,7 @@ config ARCH_CAMELOT
config ARCH_FOOTBRIDGE
bool "FootBridge"
+ select FOOTBRIDGE
config ARCH_INTEGRATOR
bool "Integrator"
@@ -124,7 +131,7 @@ config ARCH_L7200
If you have any questions or comments about the Linux kernel port
- to this board, send e-mail to sjhill@cotw.com.
+ to this board, send e-mail to .
config ARCH_PXA
bool "PXA2xx-based"
@@ -142,7 +149,7 @@ config ARCH_S3C2410
bool "Samsung S3C2410"
help
Samsung S3C2410X CPU based systems, such as the Simtec Electronics
- BAST (http://www.simtec.co.uk/products/EB110ITX/), the IPAQ 1940 or
+ BAST (), the IPAQ 1940 or
the Samsung SMDK2410 development board (and derviatives).
config ARCH_SHARK
@@ -159,10 +166,10 @@ config ARCH_LH7A40X
config ARCH_OMAP
bool "TI OMAP"
-config ARCH_VERSATILE_PB
- bool "Versatile PB"
+config ARCH_VERSATILE
+ bool "Versatile"
help
- This enables support for ARM Ltd Versatile PB board.
+ This enables support for ARM Ltd Versatile board.
config ARCH_IMX
bool "IMX"
@@ -202,6 +209,8 @@ source "arch/arm/mach-imx/Kconfig"
source "arch/arm/mach-h720x/Kconfig"
+source "arch/arm/mach-versatile/Kconfig"
+
# Definitions to make life easier
config ARCH_ACORN
bool
@@ -213,28 +222,6 @@ config TIMER_ACORN
depends on ARCH_ACORN || ARCH_CLPS7500
default y
-#####################################################################
-# Footbridge support
-config FOOTBRIDGE
- bool
- depends on ARCH_CO285 || ARCH_FOOTBRIDGE
- default y
-
-config FOOTBRIDGE_HOST
- bool
- depends on ARCH_CATS || ARCH_EBSA285_HOST || ARCH_NETWINDER || ARCH_PERSONAL_SERVER
- default y
-
-config FOOTBRIDGE_ADDIN
- bool
- depends on ARCH_CO285 || ARCH_EBSA285_ADDIN
- default y
-
-config ARCH_EBSA285
- bool
- depends on ARCH_EBSA285_HOST || ARCH_EBSA285_ADDIN
- default y
-
#####################################################################
# SA1111 support
config SA1111
@@ -247,6 +234,11 @@ config SHARP_LOCOMO
depends on SA1100_COLLIE
default y
+config SHARP_SCOOP
+ bool
+ depends on PXA_SHARPSL || SA1100_COLLIE
+ default y
+
config FORCE_MAX_ZONEORDER
int
depends on SA1111
@@ -270,6 +262,33 @@ endmenu
menu "General setup"
# Select various configuration options depending on the machine type
+
+config SMP
+ bool "Symmetric Multi-Processing (EXPERIMENTAL)"
+ depends on EXPERIMENTAL && n
+ help
+ This enables support for systems with more than one CPU. If you have
+ a system with only one CPU, like most personal computers, say N. If
+ you have a system with more than one CPU, say Y.
+
+ If you say N here, the kernel will run on single and multiprocessor
+ machines, but will use only one CPU of a multiprocessor machine. If
+ you say Y here, the kernel will run on many, but not all, single
+ processor machines. On a single processor machine, the kernel will
+ run faster if you say N here.
+
+ See also the ,
+ , ,
+ and the SMP-HOWTO available at
+ .
+
+ If you don't know what to do here, say N.
+
+config NR_CPUS
+ int "Maximum number of CPUs (2-32)"
+ depends on SMP
+ default "4"
+
config DISCONTIGMEM
bool
depends on ARCH_EDB7211 || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
@@ -306,9 +325,14 @@ config ICST525
depends on ARCH_INTEGRATOR
default y
+config ICST307
+ bool
+ depends on ARCH_VERSATILE
+ default y
+
config ARM_AMBA
bool
- depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB
+ depends on ARCH_INTEGRATOR || ARCH_VERSATILE
default y
config ISA
@@ -329,58 +353,84 @@ config ISA_DMA
config FIQ
bool
- depends on ARCH_ACORN || ARCH_L7200 || ARCH_LH7A400
+ depends on ARCH_ACORN || ARCH_L7200
default y
# Compressed boot loader in ROM. Yes, we really want to ask about
# TEXT and BSS so we preserve their values in the config files.
-config ZBOOT_ROM
- bool "Compressed boot loader in ROM/flash"
- help
- Say Y here if you intend to execute your compressed kernel image (zImage)
- directly from ROM or flash. If unsure, say N.
-
config ZBOOT_ROM_TEXT
hex "Compressed ROM boot loader base address"
default "0"
help
- The base address for zImage. Unless you have special requirements, you
- should not change this value.
+ The physical address at which the ROM-able zImage is to be
+ placed in the target. Platforms which normally make use of
+ ROM-able zImage formats normally set this to a suitable
+ value in their defconfig file.
+
+ If ZBOOT_ROM is not enabled, this has no effect.
config ZBOOT_ROM_BSS
hex "Compressed ROM boot loader BSS address"
default "0"
help
- The base address of 64KiB of read/write memory, which must be available
- while the decompressor is running. Unless you have special requirements,
- you should not change this value.
+ The base address of 64KiB of read/write memory in the target
+ for the ROM-able zImage, which must be available while the
+ decompressor is running. Platforms which normally make use of
+ ROM-able zImage formats normally set this to a suitable
+ value in their defconfig file.
+
+ If ZBOOT_ROM is not enabled, this has no effect.
-config CPU_FREQ
- bool "Support CPU clock change (EXPERIMENTAL)"
- depends on (ARCH_SA1100 || ARCH_INTEGRATOR) && EXPERIMENTAL
+config ZBOOT_ROM
+ bool "Compressed boot loader in ROM/flash"
+ depends on ZBOOT_ROM_TEXT != ZBOOT_ROM_BSS
help
- CPU clock scaling allows you to change the clock speed of the
- running CPU on the fly. This is a nice method to save battery power,
- because the lower the clock speed, the less power the CPU
- consumes. Note that this driver doesn't automatically change the CPU
- clock speed, you need some userland tools (which still have to be
- written) to implement the policy. If you don't understand what this
- is all about, it's safe to say 'N'.
+ Say Y here if you intend to execute your compressed kernel image
+ (zImage) directly from ROM or flash. If unsure, say N.
+config XIP_KERNEL
+ bool "Kernel Execute-In-Place from ROM"
+ depends on !ZBOOT_ROM
+ help
+ Execute-In-Place allows the kernel to run from non-volatile storage
+ directly addressable by the CPU, such as NOR flash. This saves RAM
+ space since the text section of the kernel is not loaded from flash
+ to RAM. Read-write sections, such as the data section and stack,
+ are still copied to RAM. The XIP kernel is not compressed since
+ it has to run directly from flash, so it will take more space to
+ store it. The flash address used to link the kernel object files,
+ and for storing it, is configuration dependent. Therefore, if you
+ say Y here, you must know the proper physical address where to
+ store the kernel image depending on your own flash memory usage.
+
+ Also note that the make target becomes "make xipImage" rather than
+ "make zImage" or "make Image". The final kernel binary to put in
+ ROM memory will be arch/arm/boot/xipImage.
+
+ If unsure, say N.
+
+config XIP_PHYS_ADDR
+ hex "XIP Kernel Physical Location"
+ depends on XIP_KERNEL
+ default "0x00080000"
+ help
+ This is the physical address in your flash memory the kernel will
+ be linked for and stored to. This address is dependent on your
+ own flash usage.
-# CPUfreq on SA11x0 is special -- it _needs_ the userspace governor
+if (ARCH_SA1100 || ARCH_INTEGRATOR)
+
+source "drivers/cpufreq/Kconfig"
config CPU_FREQ_SA1100
bool
- depends on CPU_FREQ && SA1100_LART
+ depends on CPU_FREQ && (SA1100_LART || SA1100_PLEB)
default y
- select CPU_FREQ_24_API if SYSCTL
config CPU_FREQ_SA1110
bool
depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3)
default y
- select CPU_FREQ_24_API if SYSCTL
config CPU_FREQ_INTEGRATOR
tristate "CPUfreq driver for ARM Integrator CPUs"
@@ -393,10 +443,6 @@ config CPU_FREQ_INTEGRATOR
If in doubt, say Y.
-if (CPU_FREQ_INTEGRATOR) || (CPU_FREQ_SA1110) || (CPU_FREQ_SA1100)
-
-source "drivers/cpufreq/Kconfig"
-
endif
source "drivers/pci/Kconfig"
@@ -572,7 +618,7 @@ config CMDLINE
config LEDS
bool "Timer and CPU usage LEDs"
- depends on ARCH_NETWINDER || ARCH_EBSA110 || ARCH_EBSA285 || ARCH_SHARK || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_CDB89712 || ARCH_P720T || ARCH_OMAP || ARCH_VERSATILE_PB || ARCH_IMX
+ depends on ARCH_NETWINDER || ARCH_EBSA110 || ARCH_EBSA285 || ARCH_SHARK || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_CDB89712 || ARCH_P720T || ARCH_OMAP || ARCH_VERSATILE || ARCH_IMX
help
If you say Y here, the LEDs on your machine will be used
to provide useful information about your current system status.
@@ -585,8 +631,8 @@ config LEDS
system, but the driver will do nothing.
config LEDS_TIMER
- bool "Timer LED" if LEDS && (ARCH_NETWINDER || ARCH_EBSA285 || ARCH_SHARK || MACH_MAINSTONE || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_P720T || ARCH_VERSATILE_PB || ARCH_IMX)
- depends on ARCH_NETWINDER || ARCH_EBSA110 || ARCH_EBSA285 || ARCH_SHARK || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_CDB89712 || ARCH_P720T || ARCH_OMAP || ARCH_VERSATILE_PB || ARCH_IMX
+ bool "Timer LED" if LEDS && (ARCH_NETWINDER || ARCH_EBSA285 || ARCH_SHARK || MACH_MAINSTONE || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_P720T || ARCH_VERSATILE || ARCH_IMX || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2)
+ depends on ARCH_NETWINDER || ARCH_EBSA110 || ARCH_EBSA285 || ARCH_SHARK || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_CDB89712 || ARCH_P720T || ARCH_OMAP || ARCH_VERSATILE || ARCH_IMX
default y if ARCH_EBSA110
help
If you say Y here, one of the system LEDs (the green one on the
@@ -601,7 +647,7 @@ config LEDS_TIMER
config LEDS_CPU
bool "CPU usage LED"
- depends on LEDS && (ARCH_NETWINDER || ARCH_EBSA285 || ARCH_SHARK || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_P720T || ARCH_VERSATILE_PB || ARCH_IMX)
+ depends on LEDS && (ARCH_NETWINDER || ARCH_EBSA285 || ARCH_SHARK || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_P720T || ARCH_VERSATILE || ARCH_IMX || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2)
help
If you say Y here, the red LED will be used to give a good real
time indication of CPU usage, by lighting whenever the idle task