diff options
| author | Oskar Schirmer <os@emlix.com> | 2009-05-11 15:43:37 +0200 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-05-12 07:00:22 +0200 |
| commit | 866e514d6a584810dc3ae25364f823b890b7d312 (patch) | |
| tree | 203fde201f09332d4d0fb92e420a3bc4b8a44649 /arch/xtensa/configs | |
| parent | xtensa: implement ccount calibration for s6000 (diff) | |
| download | linux-866e514d6a584810dc3ae25364f823b890b7d312.tar.xz linux-866e514d6a584810dc3ae25364f823b890b7d312.zip | |
xtensa: update s6105_defconfig for ccount calibration
The previous patch enabled ccount calibration for the s6000 variant.
This patch updates the defconfig for the s6105 platform to reflect this
change.
Signed-off-by: Oskar Schirmer <os@emlix.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa/configs')
| -rw-r--r-- | arch/xtensa/configs/s6105_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig index 6e1deff41590..768bee006037 100644 --- a/arch/xtensa/configs/s6105_defconfig +++ b/arch/xtensa/configs/s6105_defconfig @@ -115,7 +115,7 @@ CONFIG_XTENSA_VARIANT_S6000=y CONFIG_PREEMPT=y # CONFIG_MATH_EMULATION is not set # CONFIG_HIGHMEM is not set -# CONFIG_XTENSA_CALIBRATE_CCOUNT is not set +CONFIG_XTENSA_CALIBRATE_CCOUNT=y CONFIG_SERIAL_CONSOLE=y # CONFIG_XTENSA_ISS_NETWORK is not set @@ -131,7 +131,6 @@ CONFIG_SERIAL_CONSOLE=y # CONFIG_XTENSA_PLATFORM_ISS is not set # CONFIG_XTENSA_PLATFORM_XT2000 is not set CONFIG_XTENSA_PLATFORM_S6105=y -CONFIG_XTENSA_CPU_CLOCK=300 CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS1,38400 debug bootmem_debug loglevel=7" |