diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-20 14:48:19 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-20 14:48:19 +0100 |
| commit | 019d947ac621d4d9e919b76c504aeb64db51bf7a (patch) | |
| tree | 7f93545dac0dc145525e3a0c5b58c8648cb91506 | |
| parent | dd41dcc73105a7f3fd4e999716e3cd89e155f0c3 (diff) | |
configs: Temporary disable STM traces for Snowball
There are conflicts with Snowball GPIOs
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rwxr-xr-x | arch/arm/configs/u8500_defconfig | 1 | ||||
| -rw-r--r-- | debian.linaro/config/config.common.ubuntu | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index e929c8d2462..7a151c5cd15 100755 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -117,7 +117,6 @@ CONFIG_SENSORS_BH1780=y CONFIG_STE_TRACE_MODEM=y CONFIG_DISPDEV=y CONFIG_U8500_SIM_DETECT=y -CONFIG_STM_TRACE=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_MD=y diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu index a4b33169a59..0244e265f8c 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -1947,23 +1947,9 @@ CONFIG_STE_DMA40=y CONFIG_STE_TRACE_MODEM=y CONFIG_STLC2690_CHIP=y # CONFIG_STMMAC_ETH is not set -CONFIG_STM_CTX_SWITCH=y -CONFIG_STM_CTX_SWITCH_CHANNEL=253 -CONFIG_STM_FTRACE=y -CONFIG_STM_FTRACE_CHANNEL=254 CONFIG_STM_I2S=y CONFIG_STM_MSP_I2S=y # CONFIG_STM_MSP_SPI is not set -CONFIG_STM_NUMBER_OF_CHANNEL=512 -# CONFIG_STM_PRINTK is not set -CONFIG_STM_STACK_TRACE=y -CONFIG_STM_STACK_TRACE_CHANNEL=251 -CONFIG_STM_TRACE=y -CONFIG_STM_TRACE_BPRINTK_CHANNEL=249 -CONFIG_STM_TRACE_PRINTK=y -CONFIG_STM_TRACE_PRINTK_CHANNEL=250 -CONFIG_STM_WAKEUP=y -CONFIG_STM_WAKEUP_CHANNEL=252 CONFIG_STOP_MACHINE=y CONFIG_STRICT_DEVMEM=y # CONFIG_STRIP_ASM_SYMS is not set |