aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2012-05-04 22:39:01 -0300
committerRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2012-05-04 23:44:23 -0300
commit9408812bfd2aa1253d1d59635f24c6fae885362a (patch)
tree9daa09ea7a9cff22d33870c85ddf11188bf97ef7
parent1a20777e0b1889903778329d1918b816cdf21b7f (diff)
downloadlinux-lt-ci-pack-info-9408812bfd2aa1253d1d59635f24c6fae885362a.tar.gz
LINARO: CONFIG: Sync config with omap4plus_defconfig and disable sched_mc
SCHED_MC seems to be causing boot issues with Pandaboard, more details at https://bugs.launchpad.net/linaro-landing-team-ti/+bug/989349. Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
-rw-r--r--debian.linaro/config/config.common.ubuntu16
1 files changed, 10 insertions, 6 deletions
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 3edbda3..4ac741d 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -148,7 +148,7 @@ CONFIG_ARCH_OMAP2PLUS=y
CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
# CONFIG_ARCH_OMAP3 is not set
CONFIG_ARCH_OMAP4=y
-# CONFIG_ARCH_OMAP5 is not set
+CONFIG_ARCH_OMAP5=y
# CONFIG_ARCH_ORION5X is not set
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
# CONFIG_ARCH_PICOXCELL is not set
@@ -182,14 +182,14 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ARCNET is not set
CONFIG_ARM=y
# CONFIG_ARM_APPENDED_DTB is not set
-# CONFIG_ARM_ARCH_TIMER is not set
+CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_CPU_SUSPEND=y
CONFIG_ARM_CPU_TOPOLOGY=y
CONFIG_ARM_DMA_MEM_BUFFERABLE=y
# CONFIG_ARM_ERRATA_430973 is not set
# CONFIG_ARM_ERRATA_458693 is not set
# CONFIG_ARM_ERRATA_460075 is not set
-# CONFIG_ARM_ERRATA_4668 is not set
+CONFIG_ARM_ERRATA_4668=y
CONFIG_ARM_ERRATA_720789=y
# CONFIG_ARM_ERRATA_742230 is not set
# CONFIG_ARM_ERRATA_742231 is not set
@@ -197,7 +197,7 @@ CONFIG_ARM_ERRATA_720789=y
# CONFIG_ARM_ERRATA_751472 is not set
# CONFIG_ARM_ERRATA_754322 is not set
# CONFIG_ARM_ERRATA_754327 is not set
-# CONFIG_ARM_ERRATA_761171 is not set
+CONFIG_ARM_ERRATA_761171=y
CONFIG_ARM_ERRATA_764369=y
# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
CONFIG_ARM_GIC=y
@@ -1913,6 +1913,7 @@ CONFIG_MAC80211_RC_PID=y
# CONFIG_MAC80211_VERBOSE_TDLS_DEBUG is not set
CONFIG_MACH_OMAP4_PANDA=y
CONFIG_MACH_OMAP4_PANDA_CAMERA_SUPPORT=y
+CONFIG_MACH_OMAP5_SEVM=y
CONFIG_MACH_OMAP_4430SDP=y
# CONFIG_MACH_OMAP_4430SDP_CAMERA_SUPPORT is not set
CONFIG_MACH_OMAP_GENERIC=y
@@ -2511,6 +2512,8 @@ CONFIG_OMAP2_VRAM_SIZE=0
# CONFIG_OMAP4460_SEVM_PALMAS is not set
CONFIG_OMAP4_DSS_HDMI=y
# CONFIG_OMAP4_ERRATA_I688 is not set
+CONFIG_OMAP5_DSS_HDMI=y
+CONFIG_OMAP5_SEVM_PALMAS=y
CONFIG_OMAP_32K_TIMER=y
CONFIG_OMAP_32K_TIMER_HZ=128
# CONFIG_OMAP_ALLOW_OSWR is not set
@@ -2910,8 +2913,8 @@ CONFIG_SCA3000=m
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_AUTOGROUP=y
CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
+# CONFIG_SCHED_MC is not set
+# CONFIG_SCHED_SMT is not set
CONFIG_SCHED_TRACER=y
CONFIG_SCSI=y
CONFIG_SCSI_CONSTANTS=y
@@ -2954,6 +2957,7 @@ CONFIG_SCTP_HMAC_MD5=y
# CONFIG_SCTP_HMAC_SHA1 is not set
CONFIG_SDIO_UART=m
CONFIG_SECCOMP=y
+CONFIG_SECURE_REGS=y
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
CONFIG_SECURITY_APPARMOR=y