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

10 files changed, 16 insertions, 162 deletions

diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index 4a75c59..8a079f8 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/recipes-bsp/imx-test/imx-test.inc
@@ -1,11 +1,11 @@
 SUMMARY = "Test programs for IMX BSP"
 DESCRIPTION = "Unit tests for the IMX BSP"
 SECTION = "base"
-DEPENDS = "virtual/kernel"
+DEPENDS = "virtual/kernel imx-lib"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-INC_PR = "r3"
+INC_PR = "r4"
 
 PLATFORM_imx53ard = "IMX53"
 PLATFORM_imx53qsb = "IMX53"
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)"
diff --git a/recipes-multimedia/fsl-mm-core/imx-lib.inc b/recipes-multimedia/fsl-mm-core/imx-lib.inc
index 52e25d0..554df15 100644
--- a/recipes-multimedia/fsl-mm-core/imx-lib.inc
+++ b/recipes-multimedia/fsl-mm-core/imx-lib.inc
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1"
 SECTION = "multimedia"
 DEPENDS = "virtual/kernel"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e"
 
@@ -27,7 +27,7 @@ do_install () {
     oe_runmake DEST_DIR="${D}" install
 }
 
-FILES_${PN} += "${libdir}/*.so"
+FILES_${PN} += "${libdir}/*${SOLIBS}"
 FILES_${PN}-dbg += "${libdir}/.debug"
-FILES_${PN}-dev += "${libdir}/*.la ${libdir}/*.a"
+FILES_${PN}-dev += "${libdir}/*${SOLIBSDEV}"
 
diff --git a/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch b/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch
deleted file mode 100644
index dc58504..0000000
--- a/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 91732b83137039597b1cd0d747626d70e59d252d Mon Sep 17 00:00:00 2001
-From: Adrian Alonso <aalonso@freescale.com>
-Date: Tue, 1 Nov 2011 14:57:32 -0600
-Subject: [PATCH] imx-lib: remove shared libs symlinks
-
-* Remove shared libs symlinks creation
-
-Signed-off-by: Adrian Alonso <aalonso@freescale.com>
----
- ipu/Makefile         |    5 +----
- pxp/Makefile         |    5 +----
- rng/Makefile         |    5 +----
- sahara2/Makefile     |    5 +----
- screenlayer/Makefile |    5 +----
- sim/Makefile         |    5 +----
- vpu/Makefile         |    5 +----
- 7 files changed, 7 insertions(+), 28 deletions(-)
-
-diff --git a/ipu/Makefile b/ipu/Makefile
-index 97241e3..654f650 100644
---- a/ipu/Makefile
-+++ b/ipu/Makefile
-@@ -27,12 +27,9 @@ all install:
-        @echo "Not support platform, will not complile"
- endif
- 
--$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
-+$(LIBNAME).so: $(OBJS)
-        $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread
- 
--$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
--       ln -s $< $@
--
- %.o: %.c
- ifeq "$(PLATFORM)" ""
-        $(error "Unspecified PLATFORM variable")
-diff --git a/pxp/Makefile b/pxp/Makefile
-index c2bb59d..70bb508 100644
---- a/pxp/Makefile
-+++ b/pxp/Makefile
-@@ -27,12 +27,9 @@ endif
- %.o: %.c
-        $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
- 
--$(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
-+$(LIBNAME).so: $(OBJ)
-        $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
- 
--$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
--       ln -s $< $@
--
- $(LIBNAME).a: $(OBJ)
-        $(AR) -rc $@  $^
- 
-diff --git a/rng/Makefile b/rng/Makefile
-index 4b1dd5c..b5dd2e1 100644
---- a/rng/Makefile
-+++ b/rng/Makefile
-@@ -30,12 +30,9 @@ install_headers:
- $(LIBNAME).a: $(OBJS)
-        $(AR) $@ $^
- 
--$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
-+$(LIBNAME).so: $(OBJS)
-        $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
- 
--$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
--       ln -s $< $@
--
- .PHONY: clean
- clean:
-        @rm -f *.o $(LIBNAME).*
-diff --git a/sahara2/Makefile b/sahara2/Makefile
-index 106d932..dd9550e 100644
---- a/sahara2/Makefile
-+++ b/sahara2/Makefile
-@@ -49,12 +49,9 @@ endif
- $(LIBNAME).a: $(OBJS)
-        $(AR) $@ $^
- 
--$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
-+$(LIBNAME).so: $(OBJS)
-        $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
- 
--$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
--       ln -s $< $@
--
- .PHONY: clean
- clean:
-        @rm -f $(OBJS) $(LIBNAME).*
-diff --git a/screenlayer/Makefile b/screenlayer/Makefile
-index a90d4d5..a4f36ae 100644
---- a/screenlayer/Makefile
-+++ b/screenlayer/Makefile
-@@ -23,12 +23,9 @@ all install:
-        @echo "Not support platform, will not complile"
- endif
- 
--$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
-+$(LIBNAME).so: $(OBJS)
-        $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu
- 
--$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
--       ln -s $< $@
--
- %.o: %.c
-        $(CC) $(INC) -Wall -O2 -fPIC -c $^ -o $@
- 
-diff --git a/sim/Makefile b/sim/Makefile
-index 7685e32..5e31e6a 100644
---- a/sim/Makefile
-+++ b/sim/Makefile
-@@ -20,12 +20,9 @@ install:
-        @mkdir -p $(DEST_DIR)/usr/include
-        cp iso7816-3.h $(DEST_DIR)/usr/include
- 
--$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
-+$(LIBNAME).so: $(OBJS)
-        $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread
- 
--$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
--       ln -s $< $@
--
- %.o: %.c
-        $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
- 
-diff --git a/vpu/Makefile b/vpu/Makefile
-index ab6ccf1..8f3ce8e 100644
---- a/vpu/Makefile
-+++ b/vpu/Makefile
-@@ -35,12 +35,9 @@ endif
- %.o: %.c
-        $(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@
- 
--$(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
-+$(LIBNAME).so: $(OBJ)
-        $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
- 
--$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
--       ln -s $< $@
--
- $(LIBNAME).a: $(OBJ)
-        $(AR) -rc $@  $^
- 
--- 
-1.7.5.4
-
diff --git a/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb b/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
index 843c1a7..95cc021 100644
--- a/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
+++ b/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
@@ -1,11 +1,10 @@
 include imx-lib.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 COMPATIBLE_MACHINE = "(mx5)"
 
-SRC_URI += " file://imx-lib-remove-shared-libs-symlinks.patch \
-             file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch \
+SRC_URI += " file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch \
              file://0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch"
 SRC_URI[md5sum] = "45574f8f32f7000ca11d585fa60dea8c"
 SRC_URI[sha256sum] = "f151a8bb3099b596b5834a1139c19e526802e6a0aa965018d16375e7e1f48f27"