From 30066410d3264b66323b52af0d0731732064a496 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 18 Jul 2012 16:56:50 -0300 Subject: linux-imx (2.6.35.3): enable support for NFS v4 To easy use with newer host versions, that defaults to NFS v4, we enabled the support for it on the development boards. It has been applied to: - imx23evk - imx28evk - imx51evk - imx53ard - imx53qsb Signed-off-by: Otavio Salvador Acked-by: Adrian Alonso --- recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig | 2 +- recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig | 2 +- recipes-kernel/linux/linux-imx-2.6.35.3/imx51evk/defconfig | 2 +- recipes-kernel/linux/linux-imx-2.6.35.3/imx53ard/defconfig | 2 +- recipes-kernel/linux/linux-imx-2.6.35.3/imx53qsb/defconfig | 2 +- recipes-kernel/linux/linux-imx_2.6.35.3.bb | 2 +- 6 files changed, 6 insertions(+), 6 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..35db9c4 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 @@ -2277,7 +2277,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 3a81011..f671597 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 = "r27" inherit kernel COMPATIBLE_MACHINE = "(mxs|mx5)" -- cgit v1.2.3-54-g00ecf From 7ad2b3efa944f3ee80c45d683fcf56c4925a3034 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 18 Jul 2012 17:13:35 -0300 Subject: imx-lib: fix packaging of libraries The package was mistakenly removing the links of libraries making runtime applications to fail to run. The patch that caused it has been removed and package files adjusted. Signed-off-by: Otavio Salvador Acked-by: Adrian Alonso --- recipes-multimedia/fsl-mm-core/imx-lib.inc | 6 +- .../imx-lib-remove-shared-libs-symlinks.patch | 147 --------------------- recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb | 5 +- 3 files changed, 5 insertions(+), 153 deletions(-) delete mode 100644 recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch 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 -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 ---- - 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" -- cgit v1.2.3-54-g00ecf From 9c2372d643e993fc874e37ad381f8faf8476120b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 18 Jul 2012 17:52:07 -0300 Subject: imx-test: depends on imx-lib so vpu testing application is build Signed-off-by: Otavio Salvador Acked-by: Adrian Alonso --- recipes-bsp/imx-test/imx-test.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 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" -- cgit v1.2.3-54-g00ecf From c881502a6d5193209e7b7629119016c4e79bce35 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 18 Jul 2012 17:57:07 -0300 Subject: linux-imx (2.6.35.3): enable SPDIF support for imx53qsb Signed-off-by: Otavio Salvador Acked-by: Adrian Alonso --- recipes-kernel/linux/linux-imx-2.6.35.3/imx53qsb/defconfig | 4 +++- recipes-kernel/linux/linux-imx_2.6.35.3.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) 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 35db9c4..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 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 f671597..5131e71 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 = "r27" +PR = "r28" inherit kernel COMPATIBLE_MACHINE = "(mxs|mx5)" -- cgit v1.2.3-54-g00ecf