aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-03-09 21:02:01 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-03-16 16:06:18 -0600
commit0d2c76ddfe71d0d1d84bcf5b47c5ce9691658e07 (patch)
tree3c3d616c4afd91bc0ff3a4382bf57f74a92c797c
parentf9edf9b0c237950a7d0bff7050472a5b4bbb7041 (diff)
LINARO: update configs
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-mx512
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-omap2
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-s5pv3102
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-u85002
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-vexpress2
-rw-r--r--debian.linaro/config/config.common.ubuntu7
6 files changed, 16 insertions, 1 deletions
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 290bab806337..ca79d7187e6b 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -149,6 +149,8 @@ CONFIG_FUSE_FS=y
CONFIG_GPIOLIB=y
# CONFIG_GPIO_BASIC_MMIO is not set
# CONFIG_HAMRADIO is not set
+# CONFIG_HAVE_TRACE_CLOCK is not set
+CONFIG_HAVE_TRACE_CLOCK_GENERIC=y
# CONFIG_HFSPLUS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HIDRAW is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index f9ac9b1232d7..3d39df2f1bab 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -164,6 +164,8 @@ CONFIG_GFS2_FS=m
CONFIG_GPIOLIB=y
CONFIG_GPIO_BASIC_MMIO=y
CONFIG_HAMRADIO=y
+CONFIG_HAVE_TRACE_CLOCK=y
+# CONFIG_HAVE_TRACE_CLOCK_GENERIC is not set
CONFIG_HFSPLUS_FS=m
CONFIG_HFS_FS=m
CONFIG_HIDRAW=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index 547683574396..be3fc3ef27b1 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -154,6 +154,8 @@ CONFIG_FUSE_FS=y
CONFIG_GPIOLIB=y
# CONFIG_GPIO_BASIC_MMIO is not set
# CONFIG_HAMRADIO is not set
+# CONFIG_HAVE_TRACE_CLOCK is not set
+CONFIG_HAVE_TRACE_CLOCK_GENERIC=y
# CONFIG_HFSPLUS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HIDRAW is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index 41bcf2148534..3c4ac2ac2bdf 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -158,6 +158,8 @@ CONFIG_FUSE_FS=y
CONFIG_GPIOLIB=y
# CONFIG_GPIO_BASIC_MMIO is not set
# CONFIG_HAMRADIO is not set
+# CONFIG_HAVE_TRACE_CLOCK is not set
+CONFIG_HAVE_TRACE_CLOCK_GENERIC=y
# CONFIG_HFSPLUS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HIDRAW is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index cdaf6de33df9..230386f199e7 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -155,6 +155,8 @@ CONFIG_FREEZER=y
# CONFIG_GFS2_FS is not set
# CONFIG_GPIOLIB is not set
# CONFIG_HAMRADIO is not set
+# CONFIG_HAVE_TRACE_CLOCK is not set
+CONFIG_HAVE_TRACE_CLOCK_GENERIC=y
# CONFIG_HFSPLUS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HIDRAW is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index ace9ea89f22d..ffd527e34df0 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -542,6 +542,7 @@ CONFIG_DEBUG_S3C_UART=1
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_TRACE_CLOCK is not set
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_WRITECOUNT is not set
@@ -889,6 +890,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_GET_CYCLES is not set
CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_HAVE_IDE=y
CONFIG_HAVE_IRQ_WORK=y
@@ -898,6 +900,7 @@ CONFIG_HAVE_KERNEL_LZO=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_HAVE_LTT_DUMP_TABLES=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_HAVE_OPROFILE=y
@@ -908,6 +911,8 @@ CONFIG_HAVE_S3C2410_I2C=y
CONFIG_HAVE_S3C_RTC=y
CONFIG_HAVE_SCHED_CLOCK=y
CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_HAVE_TRACE_CLOCK_32_TO_64=y
+# CONFIG_HAVE_UNSYNCHRONIZED_TSC is not set
CONFIG_HDLC=m
CONFIG_HDLC_CISCO=m
CONFIG_HDLC_FR=m
@@ -1493,6 +1498,7 @@ CONFIG_MACH_U8500=y
# CONFIG_MACVTAP is not set
CONFIG_MAC_PARTITION=y
CONFIG_MAGIC_SYSRQ=y
+CONFIG_MARKERS=y
CONFIG_MAX1363=m
CONFIG_MAX1363_RING_BUFFER=y
CONFIG_MAX63XX_WATCHDOG=m
@@ -1998,7 +2004,6 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_LDISC=m
# CONFIG_PPS_CLIENT_PARPORT is not set
# CONFIG_PPS_DEBUG is not set
-# CONFIG_PPS_GENERATOR_PARPORT is not set
# CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_RCU is not set
CONFIG_PREVENT_FIRMWARE_BUILD=y