diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-20 14:55:38 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-20 14:55:38 +0100 |
| commit | 636c578f8fd7124aa43b816969d135dd7d750c83 (patch) | |
| tree | 5e3d2c28b2357920d24156965543a4513f79a362 | |
| parent | a25f4fe115f18c2830526360db6ccdd7fa4b82fe (diff) | |
configs: Temporary disable STM traces for Snowball
There are conflicts with Snowball GPIOs
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/configs/u8500_android_defconfig | 1 | ||||
| -rwxr-xr-x | arch/arm/configs/u8500_defconfig | 2 | ||||
| -rw-r--r-- | debian.linaro/config/config.common.ubuntu | 15 |
3 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/configs/u8500_android_defconfig b/arch/arm/configs/u8500_android_defconfig index c5ed034a99e..3a1262379fe 100644 --- a/arch/arm/configs/u8500_android_defconfig +++ b/arch/arm/configs/u8500_android_defconfig @@ -128,7 +128,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/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index f239e146aad..300152899c7 100755 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -112,8 +112,6 @@ CONFIG_SENSORS_BH1780=y CONFIG_STE_TRACE_MODEM=y CONFIG_DISPDEV=y CONFIG_U8500_SIM_DETECT=y -CONFIG_STM_TRACE=y -CONFIG_STM_DEFAULT_MASTERS_MODES=0x20 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 5a6af58a18f..9b4d04990dd 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -1980,21 +1980,6 @@ 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_DEFAULT_MASTERS_MODES=0x20 -CONFIG_STM_FTRACE=y -CONFIG_STM_FTRACE_CHANNEL=254 -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 |