Merge remote branch 'denzil' into master

* freescale/denzil:
  linux-imx (2.6.35.3): enable SPDIF support for imx53qsb
  imx-test: depends on imx-lib so vpu testing application is build
  imx-lib: fix packaging of libraries
  linux-imx (2.6.35.3): enable support for NFS v4

6 files changed, 9 insertions, 7 deletions

diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig b/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig
index 852e2e8..57c027a 100644
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig
+++ b/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig
@@ -1744,7 +1744,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
+CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 # CONFIG_NFSD is not set
 CONFIG_LOCKD=y
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig b/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig
index 41a061e..8fa8d4b 100644
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig
+++ b/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig
@@ -1863,7 +1863,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
+CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 # CONFIG_NFSD is not set
 CONFIG_LOCKD=y
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/imx51evk/defconfig b/recipes-kernel/linux/linux-imx-2.6.35.3/imx51evk/defconfig
index 7aa8c28..f61aa48 100644
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/imx51evk/defconfig
+++ b/recipes-kernel/linux/linux-imx-2.6.35.3/imx51evk/defconfig
@@ -2248,7 +2248,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
+CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 # CONFIG_NFSD is not set
 CONFIG_LOCKD=y
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/imx53ard/defconfig b/recipes-kernel/linux/linux-imx-2.6.35.3/imx53ard/defconfig
index f6f1b9b..fda49eb 100644
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/imx53ard/defconfig
+++ b/recipes-kernel/linux/linux-imx-2.6.35.3/imx53ard/defconfig
@@ -2280,7 +2280,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
+CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 # CONFIG_NFSD is not set
 CONFIG_LOCKD=y
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/imx53qsb/defconfig b/recipes-kernel/linux/linux-imx-2.6.35.3/imx53qsb/defconfig
index b0c88fb..f0a99c5 100644
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/imx53qsb/defconfig
+++ b/recipes-kernel/linux/linux-imx-2.6.35.3/imx53qsb/defconfig
@@ -1683,18 +1683,20 @@ CONFIG_SND_MXC_SOC=y
 CONFIG_SND_MXC_SOC_SSI=y
 CONFIG_SND_MXC_SOC_ESAI=y
 CONFIG_SND_MXC_SOC_IRAM=y
+CONFIG_SND_MXC_SOC_SPDIF_DAI=y
 CONFIG_SND_SOC_IMX_3STACK_SGTL5000=y
 # CONFIG_SND_SOC_IMX_3STACK_AK4647 is not set
 # CONFIG_SND_SOC_IMX_3STACK_WM8580 is not set
 # CONFIG_SND_SOC_IMX_3STACK_AK5702 is not set
 # CONFIG_SND_SOC_IMX_3STACK_BLUETOOTH is not set
 CONFIG_SND_SOC_IMX_3STACK_CS42888=y
-# CONFIG_SND_SOC_IMX_SPDIF is not set
+CONFIG_SND_SOC_IMX_SPDIF=y
 # CONFIG_MXC_SSI_DUAL_FIFO is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
 CONFIG_SND_SOC_CS42888=y
 CONFIG_SND_SOC_SGTL5000=y
+CONFIG_SND_SOC_MXC_SPDIF=y
 # CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
@@ -2277,7 +2279,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
+CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 # CONFIG_NFSD is not set
 CONFIG_LOCKD=y
diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index 552c9a8..998851b 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -4,7 +4,7 @@
 DESCRIPTION = "Linux kernel for imx platforms"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-PR = "r26"
+PR = "r28"
 
 inherit kernel
 COMPATIBLE_MACHINE = "(mxs|mx5)"