linux-ti81xx-psp 2.6.37: update netra defconfig and SRCREV

Signed-off-by: Koen Kooi <k-kooi@ti.com>

3 files changed, 11 insertions, 20 deletions

diff --git a/recipes-kernel/linux/linux-ti81xx-psp-2.6.37/dm816x-evm/configs/psp b/recipes-kernel/linux/linux-ti81xx-psp-2.6.37/dm816x-evm/configs/psp
index fb59e068..b3b1a09d 100644
--- a/recipes-kernel/linux/linux-ti81xx-psp-2.6.37/dm816x-evm/configs/psp
+++ b/recipes-kernel/linux/linux-ti81xx-psp-2.6.37/dm816x-evm/configs/psp
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.37 Kernel Configuration
-# Thu Apr 14 14:58:05 2011
+# Mon Feb 14 12:41:09 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -37,7 +37,7 @@ CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_LZO=y
@@ -994,6 +994,7 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_TI816X_PCIE_BOOTDRV is not set
+# CONFIG_TI81XX_HDMI is not set
 # CONFIG_RAMOOPS is not set
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
@@ -1357,7 +1358,6 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_DAB is not set
 CONFIG_HAVE_TI_TILER=y
 # CONFIG_TI_TILER is not set
-CONFIG_VIDEO_TI81XX_VIDOUT=m
 
 #
 # Graphics support
@@ -1390,12 +1390,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 #
 # Frame buffer hardware drivers
 #
-CONFIG_TI81XX_VPSS=m
-CONFIG_TI81XX_VPSS_DEBUG_SUPPORT=y
-CONFIG_TI81XX_VPSS_VRAM_SIZE=50
-CONFIG_FB_TI81XX=m
-CONFIG_FB_TI81XX_DEBUG_SUPPORT=y
-CONFIG_FB_TI81XX_NUM_FBS=3
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
@@ -1424,14 +1418,9 @@ CONFIG_FB_TI81XX_NUM_FBS=3
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
+# CONFIG_TI81XX_VPSS is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
-
-#
-# TI81XX Display Device Drivers
-#
-CONFIG_TI81XX_HDMI=m
-
 #
 # Display device support
 #
diff --git a/recipes-kernel/linux/linux-ti81xx-psp-2.6.37/dm816x-evm/defconfig b/recipes-kernel/linux/linux-ti81xx-psp-2.6.37/dm816x-evm/defconfig
index 14436d4d..7fae0153 100644
--- a/recipes-kernel/linux/linux-ti81xx-psp-2.6.37/dm816x-evm/defconfig
+++ b/recipes-kernel/linux/linux-ti81xx-psp-2.6.37/dm816x-evm/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.37 Kernel Configuration
-# Mon Jul  4 13:54:08 2011
+# Tue Jul  5 12:28:44 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -45,7 +45,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_LZO is not set
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -79,6 +79,8 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
@@ -354,7 +356,7 @@ CONFIG_COMMON_CLKDEV=y
 CONFIG_PCI=y
 CONFIG_PCI_SYSCALL=y
 CONFIG_ARCH_SUPPORTS_MSI=y
-# CONFIG_PCI_MSI is not set
+CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCI_IOV is not set
diff --git a/recipes-kernel/linux/linux-ti81xx-psp_2.6.37.bb b/recipes-kernel/linux/linux-ti81xx-psp_2.6.37.bb
index 79c01447..55a79cd6 100644
--- a/recipes-kernel/linux/linux-ti81xx-psp_2.6.37.bb
+++ b/recipes-kernel/linux/linux-ti81xx-psp_2.6.37.bb
@@ -6,10 +6,10 @@ KERNEL_IMAGETYPE = "uImage"
 COMPATIBLE_MACHINE = "am387x-evm|am389x-evm|c6a814x-evm|c6a816x-evm|dm814x-evm"
 
 # This is on the ti81xx-master branch
-SRCREV = "18649360f3e7bfcdc3eb7afd89e20e7a786931ef"
+SRCREV = "d686b2da5d2e7337c9759f910c3a665c27b0ec31"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
-MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}"
+MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}"
 
 SRC_URI += "git://arago-project.org/git/projects/linux-omap3.git;protocol=git;branch=ti81xx-master \
            file://defconfig"