diff options
author | Oskar Schirmer <os@emlix.com> | 2009-05-11 09:43:37 -0400 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2009-05-12 01:00:22 -0400 |
commit | 866e514d6a584810dc3ae25364f823b890b7d312 (patch) | |
tree | 203fde201f09332d4d0fb92e420a3bc4b8a44649 /arch | |
parent | b070a03f6490b0ac8d95c51b55a64e433d9160ab (diff) |
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')
-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 | |||
115 | CONFIG_PREEMPT=y | 115 | CONFIG_PREEMPT=y |
116 | # CONFIG_MATH_EMULATION is not set | 116 | # CONFIG_MATH_EMULATION is not set |
117 | # CONFIG_HIGHMEM is not set | 117 | # CONFIG_HIGHMEM is not set |
118 | # CONFIG_XTENSA_CALIBRATE_CCOUNT is not set | 118 | CONFIG_XTENSA_CALIBRATE_CCOUNT=y |
119 | CONFIG_SERIAL_CONSOLE=y | 119 | CONFIG_SERIAL_CONSOLE=y |
120 | # CONFIG_XTENSA_ISS_NETWORK is not set | 120 | # CONFIG_XTENSA_ISS_NETWORK is not set |
121 | 121 | ||
@@ -131,7 +131,6 @@ CONFIG_SERIAL_CONSOLE=y | |||
131 | # CONFIG_XTENSA_PLATFORM_ISS is not set | 131 | # CONFIG_XTENSA_PLATFORM_ISS is not set |
132 | # CONFIG_XTENSA_PLATFORM_XT2000 is not set | 132 | # CONFIG_XTENSA_PLATFORM_XT2000 is not set |
133 | CONFIG_XTENSA_PLATFORM_S6105=y | 133 | CONFIG_XTENSA_PLATFORM_S6105=y |
134 | CONFIG_XTENSA_CPU_CLOCK=300 | ||
135 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 134 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
136 | CONFIG_CMDLINE_BOOL=y | 135 | CONFIG_CMDLINE_BOOL=y |
137 | CONFIG_CMDLINE="console=ttyS1,38400 debug bootmem_debug loglevel=7" | 136 | CONFIG_CMDLINE="console=ttyS1,38400 debug bootmem_debug loglevel=7" |