aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-08-01 16:40:00 +0100
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 09:00:35 -0600
commit5eced174fefa78fb322b7086469a403442bae3fc (patch)
treead6ddafadaacbeb602fd9a26eb04b60303646c42
parentffee1ae077a7bb9ecfaf2ecec0f3817f8adcff36 (diff)
downloadlinux-linaro-5eced174fefa78fb322b7086469a403442bae3fc.tar.gz
LINARO: CONFIG: Enable basic profiling and tracing options
Enabled for all platforms and added to enforce script so they will not be forgotten in future. BugLink: http://bugs.launchpad.net/bugs/764796 Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-mx516
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-omap9
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-s5pv3106
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-u85007
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-vexpress9
-rw-r--r--debian.linaro/config/config.common.ubuntu17
-rw-r--r--debian.linaro/config/enforce8
7 files changed, 31 insertions, 31 deletions
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 21ba3c59fc4..9c1ea66a1ed 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -15,7 +15,6 @@ CONFIG_ATA=m
CONFIG_AUTOFS4_FS=y
# CONFIG_AVERAGE is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_BINARY_PRINTF=y
CONFIG_BINFMT_MISC=m
CONFIG_BLK_DEV_LOOP=y
CONFIG_BROADCOM_PHY=y
@@ -48,7 +47,6 @@ CONFIG_CRYPTO_LZO=m
# CONFIG_CRYPTO_MICHAEL_MIC is not set
CONFIG_DAVICOM_PHY=y
# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_INFO is not set
CONFIG_DEBUG_LL=y
@@ -82,7 +80,6 @@ CONFIG_EXT4_FS=y
# CONFIG_FONTS is not set
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
CONFIG_FUSE_FS=y
CONFIG_GPIOLIB=y
@@ -172,10 +169,10 @@ CONFIG_NLS_DEFAULT="cp437"
CONFIG_NLS_UTF8=y
# CONFIG_NOP_USB_XCEIV is not set
CONFIG_NO_HZ=y
+# CONFIG_OC_ETM is not set
CONFIG_PACKET=y
CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PERF_EVENTS is not set
# CONFIG_PHONET is not set
# CONFIG_PM_RUNTIME is not set
CONFIG_PM_TEST_SUSPEND=y
@@ -186,7 +183,6 @@ CONFIG_PM_TEST_SUSPEND=y
# CONFIG_PREEMPT_RCU is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_PROFILING=y
# CONFIG_PROVE_LOCKING is not set
# CONFIG_QFMT_V2 is not set
CONFIG_QSEMI_PHY=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index bf05df755d8..f29de4225b5 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -2,6 +2,7 @@
# Config options for config.flavour.linaro-omap automatically generated by splitconfig.pl
#
# CONFIG_ABX500_CORE is not set
+CONFIG_AC97_BUS=m
# CONFIG_ARCH_EXYNOS4 is not set
# CONFIG_ARCH_MXC is not set
CONFIG_ARCH_OMAP=y
@@ -18,7 +19,6 @@ CONFIG_ARM_THUMBEE=y
# CONFIG_AUTOFS4_FS is not set
CONFIG_AVERAGE=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BINARY_PRINTF=y
CONFIG_BINFMT_MISC=y
CONFIG_BLK_DEV_LOOP=y
# CONFIG_BROADCOM_PHY is not set
@@ -52,7 +52,6 @@ CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_MICHAEL_MIC=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DEBUG_FS=y
CONFIG_DEBUG_GPIO=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_LL is not set
@@ -85,7 +84,6 @@ CONFIG_FIRMWARE_EDID=y
CONFIG_FONTS=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
# CONFIG_FUSE_FS is not set
CONFIG_GPIOLIB=y
@@ -215,10 +213,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
CONFIG_NOP_USB_XCEIV=y
CONFIG_NO_HZ=y
CONFIG_NR_CPUS=2
+CONFIG_OC_ETM=y
CONFIG_PACKET=y
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PERF_EVENTS=y
# CONFIG_PHONET is not set
CONFIG_PL310_ERRATA_588369=y
CONFIG_PL310_ERRATA_727915=y
@@ -231,7 +229,6 @@ CONFIG_PREEMPT=y
CONFIG_PREEMPT_RCU=y
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PRINT_QUOTA_WARNING=y
-CONFIG_PROFILING=y
CONFIG_PROVE_LOCKING=y
CONFIG_QFMT_V2=y
# CONFIG_QSEMI_PHY is not set
@@ -269,6 +266,8 @@ CONFIG_SMC91X=y
CONFIG_SMSC911X=y
CONFIG_SMSC_PHY=y
CONFIG_SND=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_ARMAACI=m
CONFIG_SND_DEBUG=y
CONFIG_SND_DRIVERS=y
CONFIG_SND_MIXER_OSS=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index f1721f7a20b..b66dc146be0 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -17,7 +17,6 @@ CONFIG_ARM_L1_CACHE_SHIFT=5
# CONFIG_AUTOFS4_FS is not set
CONFIG_AVERAGE=y
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BINARY_PRINTF is not set
# CONFIG_BINFMT_MISC is not set
CONFIG_BLK_DEV_LOOP=y
CONFIG_BSD_DISKLABEL=y
@@ -48,7 +47,6 @@ CONFIG_CRYPTO_MANAGER=m
CONFIG_CRYPTO_MANAGER2=y
# CONFIG_CRYPTO_MICHAEL_MIC is not set
CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_LL=y
@@ -79,7 +77,6 @@ CONFIG_DETECT_HUNG_TASK=y
# CONFIG_FONTS is not set
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FTRACE=y
# CONFIG_FUNCTION_TRACER is not set
# CONFIG_FUSE_FS is not set
CONFIG_GPIOLIB=y
@@ -152,10 +149,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NOP_USB_XCEIV is not set
CONFIG_NO_HZ=y
CONFIG_NR_CPUS=2
+# CONFIG_OC_ETM is not set
# CONFIG_PACKET is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PERF_EVENTS is not set
# CONFIG_PHONET is not set
CONFIG_PID_NS=y
# CONFIG_PL310_ERRATA_588369 is not set
@@ -167,7 +164,6 @@ CONFIG_PREEMPT=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_RCU=y
# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PROFILING is not set
# CONFIG_PROVE_LOCKING is not set
# CONFIG_QUOTA is not set
# CONFIG_QUOTACTL is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index 123022b52a6..47e92219539 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -18,7 +18,6 @@ CONFIG_ARM_L1_CACHE_SHIFT=5
# CONFIG_AUTOFS4_FS is not set
# CONFIG_AVERAGE is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BINARY_PRINTF is not set
# CONFIG_BINFMT_MISC is not set
# CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BSD_PROCESS_ACCT is not set
@@ -46,7 +45,6 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_MANAGER2 is not set
# CONFIG_CRYPTO_MICHAEL_MIC is not set
CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_LL is not set
@@ -81,7 +79,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FONTS is not set
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FTRACE is not set
+CONFIG_FUNCTION_TRACER=y
# CONFIG_FUSE_FS is not set
CONFIG_GPIOLIB=y
# CONFIG_GPIO_SYSFS is not set
@@ -160,10 +158,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NOP_USB_XCEIV is not set
CONFIG_NO_HZ=y
CONFIG_NR_CPUS=2
+# CONFIG_OC_ETM is not set
# CONFIG_PACKET is not set
CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PERF_EVENTS is not set
CONFIG_PHONET=y
CONFIG_PID_NS=y
# CONFIG_PL310_ERRATA_588369 is not set
@@ -176,7 +174,6 @@ CONFIG_PREEMPT=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_RCU=y
# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PROFILING is not set
# CONFIG_PROVE_LOCKING is not set
# CONFIG_QUOTA is not set
# CONFIG_QUOTACTL is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 0f87d395db6..8a488efd338 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -2,6 +2,7 @@
# Config options for config.flavour.linaro-vexpress automatically generated by splitconfig.pl
#
# CONFIG_ABX500_CORE is not set
+CONFIG_AC97_BUS=y
# CONFIG_ARCH_EXYNOS4 is not set
# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_OMAP is not set
@@ -18,7 +19,6 @@ CONFIG_ATA=y
# CONFIG_AUTOFS4_FS is not set
# CONFIG_AVERAGE is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_BINARY_PRINTF=y
# CONFIG_BINFMT_MISC is not set
# CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BROADCOM_PHY is not set
@@ -50,7 +50,6 @@ CONFIG_CRAMFS=y
# CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_DAVICOM_PHY is not set
CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_FS=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_LL=y
# CONFIG_DEBUG_LOCK_ALLOC is not set
@@ -81,7 +80,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FONTS is not set
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
# CONFIG_FUSE_FS is not set
# CONFIG_GPIOLIB is not set
@@ -202,10 +200,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NOP_USB_XCEIV is not set
# CONFIG_NO_HZ is not set
CONFIG_NR_CPUS=4
+# CONFIG_OC_ETM is not set
CONFIG_PACKET=y
CONFIG_PAGE_OFFSET=0x80000000
# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_PERF_EVENTS=y
# CONFIG_PHONET is not set
# CONFIG_PID_NS is not set
# CONFIG_PL310_ERRATA_588369 is not set
@@ -218,7 +216,6 @@ CONFIG_PERF_EVENTS=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_RCU is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PROFILING=y
# CONFIG_PROVE_LOCKING is not set
# CONFIG_QSEMI_PHY is not set
# CONFIG_QUOTA is not set
@@ -251,6 +248,8 @@ CONFIG_SLUB_DEBUG=y
CONFIG_SMSC911X=y
# CONFIG_SMSC_PHY is not set
CONFIG_SND=y
+CONFIG_SND_AC97_CODEC=y
+CONFIG_SND_ARMAACI=y
# CONFIG_SND_DEBUG is not set
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_MIXER_OSS=y
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 3775468b72c..b6bdd0924ea 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -9,7 +9,6 @@ CONFIG_AB8500_GPADC=y
CONFIG_AB8500_I2C_CORE=y
CONFIG_AB8500_PWM=y
# CONFIG_AB8500_USB is not set
-CONFIG_AC97_BUS=y
# CONFIG_ACCESSIBILITY is not set
# CONFIG_ACORN_PARTITION is not set
# CONFIG_AD525X_DPOT is not set
@@ -119,6 +118,7 @@ CONFIG_ARM_DMA_MEM_BUFFERABLE=y
CONFIG_ARM_GIC=y
CONFIG_ARM_L1_CACHE_SHIFT_6=y
# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_ARM_SP805_WATCHDOG is not set
CONFIG_ARM_THUMB=y
CONFIG_ARM_TIMER_SP804=y
CONFIG_ARM_UNWIND=y
@@ -165,6 +165,7 @@ CONFIG_BCMA_POSSIBLE=y
# CONFIG_BCM_WIMAX is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
+CONFIG_BINARY_PRINTF=y
# CONFIG_BINFMT_AOUT is not set
CONFIG_BINFMT_ELF=y
CONFIG_BITREVERSE=y
@@ -368,6 +369,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_HIGHMEM is not set
# CONFIG_DEBUG_ICEDCC is not set
# CONFIG_DEBUG_INFO_REDUCED is not set
@@ -456,7 +458,7 @@ CONFIG_EARLY_PRINTK=y
# CONFIG_EFS_FS is not set
CONFIG_ELF_CORE=y
# CONFIG_EMBEDDED is not set
-# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+CONFIG_ENABLE_DEFAULT_TRACERS=y
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_ENABLE_WARN_DEPRECATED=y
# CONFIG_ENC28J60 is not set
@@ -552,6 +554,7 @@ CONFIG_FS_POSIX_ACL=y
# CONFIG_FT1000 is not set
# CONFIG_FTL is not set
# CONFIG_FTMAC100 is not set
+CONFIG_FTRACE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_FUNCTION_PROFILER is not set
@@ -1229,7 +1232,6 @@ CONFIG_NO_IOPORT=y
# CONFIG_NTFS_FS is not set
# CONFIG_N_GSM is not set
# CONFIG_OCFS2_FS is not set
-# CONFIG_OC_ETM is not set
CONFIG_OF=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_DEVICE=y
@@ -1256,7 +1258,7 @@ CONFIG_OMAP2_DSS_VENC=y
CONFIG_OMAP2_VRAM=y
CONFIG_OMAP2_VRAM_SIZE=32
CONFIG_OMAP2_VRFB=y
-# CONFIG_OMAP3_EMU is not set
+CONFIG_OMAP3_EMU=y
# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
# CONFIG_OMAP3_SDRC_AC_TIMING is not set
CONFIG_OMAP4_DSS_HDMI=y
@@ -1299,6 +1301,7 @@ CONFIG_PANEL_TAAL=y
# CONFIG_PCI_SYSCALL is not set
# CONFIG_PDA_POWER is not set
# CONFIG_PERF_COUNTERS is not set
+CONFIG_PERF_EVENTS=y
CONFIG_PERF_USE_VMALLOC=y
# CONFIG_PHONE is not set
CONFIG_PHYLIB=y
@@ -1338,6 +1341,7 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_PROC_SYSCTL=y
# CONFIG_PROFILE_ALL_BRANCHES is not set
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_PROFILING=y
# CONFIG_PROVE_RCU is not set
# CONFIG_PSTORE is not set
# CONFIG_QFMT_V1 is not set
@@ -1667,10 +1671,9 @@ CONFIG_SMP=y
CONFIG_SMP_ON_UP=y
# CONFIG_SMSC911X_ARCH_HOOKS is not set
# CONFIG_SM_FTL is not set
-CONFIG_SND_AC97_CODEC=y
+# CONFIG_SND_AC97_POWER_SAVE is not set
# CONFIG_SND_ALOOP is not set
CONFIG_SND_ARM=y
-CONFIG_SND_ARMAACI=y
# CONFIG_SND_DEBUG_VERBOSE is not set
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_DYNAMIC_MINORS is not set
@@ -1826,6 +1829,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_W90X900 is not set
# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
# CONFIG_TPS65010 is not set
# CONFIG_TPS6507X is not set
CONFIG_TRACEPOINTS=y
@@ -1856,6 +1860,7 @@ CONFIG_UBIFS_FS=y
CONFIG_UBIFS_FS_LZO=y
# CONFIG_UBIFS_FS_XATTR is not set
CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UCB1400_CORE is not set
CONFIG_UDF_NLS=y
# CONFIG_UFS_FS is not set
CONFIG_UID16=y
diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce
index 7fcf9aa9742..05479c5bed4 100644
--- a/debian.linaro/config/enforce
+++ b/debian.linaro/config/enforce
@@ -86,3 +86,11 @@ value CONFIG_LIBCRC32C y
# LINARO kernels should have TIMER_STATS on (LP: 718677)
value CONFIG_TIMER_STATS y
+
+# LINARO kernels should have basic profiling and tracing options on (LP: 764796)
+value CONFIG_PROFILING y
+value CONFIG_PERF_EVENTS y
+value CONFIG_HW_PERF_EVENTS y
+value CONFIG_FTRACE y
+value CONFIG_ENABLE_DEFAULT_TRACERS y | value CONFIG_GENERIC_TRACER y
+value CONFIG_HIGH_RES_TIMERS y