summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <k-kooi@ti.com>2010-03-10 16:58:41 +0100
committerKoen Kooi <koen@openembedded.org>2010-04-12 19:43:23 +0200
commit534b38aaa7de65dd4aa08c91d86dbede24d853dd (patch)
treefbd3843164e2e9d7dea4dd4d0d87065ce1992599
parentb51ce4a3bb93edf9d77a5f6619db533052fd0dba (diff)
downloadopenembedded-534b38aaa7de65dd4aa08c91d86dbede24d853dd.tar.gz
linux-omap-psp 2.6.32: update SRCREV and fix DSI_PLL in beagleboard defconfig
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig10
-rw-r--r--recipes/linux/linux-omap-psp_2.6.32.bb2
3 files changed, 9 insertions, 5 deletions
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 8db0bee1e7..eac4676d43 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = "omap3"
require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r64"
+MACHINE_KERNEL_PR = "r65"
KERNEL_IMAGETYPE = "uImage"
diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig
index 67ae51069f..aafdda6b10 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32
-# Thu Feb 25 19:07:26 2010
+# Wed Mar 10 13:51:49 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -388,7 +388,9 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-# CONFIG_CPU_IDLE is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
#
# Floating point emulation
@@ -2000,7 +2002,8 @@ CONFIG_OMAP2_DSS_VENC=y
CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO=y
# CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE is not set
# CONFIG_OMAP2_DSS_SDI is not set
-# CONFIG_OMAP2_DSS_DSI is not set
+CONFIG_OMAP2_DSS_DSI=y
+CONFIG_OMAP2_DSS_USE_DSI_PLL=y
# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
CONFIG_FB_OMAP2=y
@@ -2016,6 +2019,7 @@ CONFIG_PANEL_GENERIC=y
# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set
CONFIG_PANEL_SHARP_LS037V7DW01=y
# CONFIG_PANEL_SHARP_LQ043T1DG01 is not set
+# CONFIG_PANEL_TAAL is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb
index 91a36e5760..82ef91bb7a 100644
--- a/recipes/linux/linux-omap-psp_2.6.32.bb
+++ b/recipes/linux/linux-omap-psp_2.6.32.bb
@@ -5,7 +5,7 @@ KERNEL_IMAGETYPE = "uImage"
COMPATIBLE_MACHINE = "beagleboard|omap3evm|am3517-evm|omap3-touchbook"
-SRCREV = "c2aae3e0e6d03a5716965cb504589cb2d918b904"
+SRCREV = "227037c2b6c28a632e0bffd2681445a61c7f84bc"
# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
MACHINE_KERNEL_PR_append = "+gitr${SRCREV}"