All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release
@ 2015-04-06 18:12 Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 01/12] linux-imx: Upgrade to 3.14.28-1.0.0 GA version Otavio Salvador
                   ` (11 more replies)
  0 siblings, 12 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

This patchset is based on v1 sent by Lauren Post. To avoid several
revisions of the patchset I preferred to rework them myself and
prepare a v2 with the most important fixes.

Original cover letter sent by Lauren Post:

,----
| This release upgrades kernel to 3.14.28-1.0.0 GA release
| Package updates are bug fixes to support Gstreamer 1.4 and
| Graphics updates from 3.10.53-1.1.0 GA
| 
| Note that license is updated.  Previous license was i.MX specific and
| new license is generic to support other Freescale product lines.
| 
| This patch set is for kernel, bsp and graphics not multimedia.  This
| will come in a separate patch set
`----

The main important changes are:

 - rework of linux-imx upgrade patch
 - imx-vpu build error for i.MX5
 - removal of GPU module related changes (to be send later)
 - fix upgrade path for xf86-video-imxfb-vivante-autohdmi
 - fix build without meta-oe
 - removal of non-BSP related changes in opencv bbappend

This patchset is now in master-next for testing. If any change should
be reworked, please say so.

Lauren Post (10):
  u-boot-imx: Upgrade to 3.14.28-1.0.0 GA release
  imx6sxsabresd: Add imx6sx-sdb-ldo.dtb DeviceTree
  firmware-imx: Upgrade to 3.14.28-1.0.0 release
  imx-kobs: Upgrade to 3.14.28-1.0.0 version
  imx-vpu: Upgrade 5.4.27 to 5.4.28 version
  imx-test: Upgrade to version 3.14.28-1.0.0 GA
  imx-gpu-viv: Upgrade to 5.0.11.p4.4 from 3.14.28-1.0.0 GA release
  xf86-video-imxfb-vivante: Upgrade to 5.0.11.p4.4 version
  opencv: Add i.MX6SoloX support
  EULA: Update to new license LA_OPT_FSL_OPEN_3RD_PARTY_IP

Otavio Salvador (2):
  linux-imx: Upgrade to 3.14.28-1.0.0 GA version
  firmware-imx: Fix PE syntax to follow code style

 EULA                                               | 993 +++++++++++----------
 SCR/imx/SCR-3.14.28-1.0.0-ga.txt                   | 355 ++++++++
 conf/machine/imx6sxsabresd.conf                    |   2 +-
 ...c-Opencv-app-can-t-run-on-imx6sx-with-cam.patch |  46 +
 .../recipes-support/opencv/opencv_%.bbappend       |   3 +
 recipes-bsp/firmware-imx/firmware-imx.inc          |   4 +-
 .../firmware-imx/firmware-imx_3.10.53-1.1.0.bb     |  10 -
 .../firmware-imx/firmware-imx_3.14.28-1.0.0.bb     |   8 +
 ..._3.10.53-1.1.0.bb => imx-kobs_3.14.28-1.0.0.bb} |   4 +-
 .../imx-test/imx-test-hdcp_3.10.17-1.0.0.bb        |  23 -
 ..._3.10.53-1.1.0.bb => imx-test_3.14.28-1.0.0.bb} |   6 +-
 recipes-bsp/imx-vpu/imx-vpu_5.4.27.bb              |  10 -
 recipes-bsp/imx-vpu/imx-vpu_5.4.28.bb              |  12 +
 recipes-bsp/u-boot/u-boot-imx_2014.04.bb           |   4 +-
 recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc       |  30 +-
 .../imx-gpu-viv/imx-gpu-viv/egl_directfb.pc        |  12 -
 .../imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc         |  13 -
 .../imx-gpu-viv/imx-gpu-viv/egl_wayland.pc         |  13 -
 ....p4.1-hfp.bb => imx-gpu-viv_5.0.11.p4.4-hfp.bb} |   4 +-
 ....p4.1-sfp.bb => imx-gpu-viv_5.0.11.p4.4-sfp.bb} |   4 +-
 .../xf86-video-imxfb-vivante/rc.autohdmi           |  24 +-
 ....bb => xf86-video-imxfb-vivante_5.0.11.p4.4.bb} |   4 +-
 ...6q-fix-video-divider-for-revision-1.0-of-.patch |  35 -
 ...0001-ARM-imx6q-drop-unnecessary-semicolon.patch |  35 +
 ...lk-imx6q-fix-video-divider-for-rev-T0-1.0.patch |  40 +
 ...isable-imx6sl-specific-code-when-imx6sl-.patch} |  38 +-
 .../mx6/defconfig                                  |  84 +-
 .../mx6/defconfig                                  | 108 +--
 ...ool_3.10.53.bb => linux-imx-mfgtool_3.14.28.bb} |   0
 recipes-kernel/linux/linux-imx_3.14.28.bb          |  23 +
 30 files changed, 1219 insertions(+), 728 deletions(-)
 create mode 100644 SCR/imx/SCR-3.14.28-1.0.0-ga.txt
 create mode 100644 openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch
 create mode 100644 openembedded-layer/recipes-support/opencv/opencv_%.bbappend
 delete mode 100644 recipes-bsp/firmware-imx/firmware-imx_3.10.53-1.1.0.bb
 create mode 100644 recipes-bsp/firmware-imx/firmware-imx_3.14.28-1.0.0.bb
 rename recipes-bsp/imx-kobs/{imx-kobs_3.10.53-1.1.0.bb => imx-kobs_3.14.28-1.0.0.bb} (66%)
 delete mode 100644 recipes-bsp/imx-test/imx-test-hdcp_3.10.17-1.0.0.bb
 rename recipes-bsp/imx-test/{imx-test_3.10.53-1.1.0.bb => imx-test_3.14.28-1.0.0.bb} (59%)
 delete mode 100644 recipes-bsp/imx-vpu/imx-vpu_5.4.27.bb
 create mode 100644 recipes-bsp/imx-vpu/imx-vpu_5.4.28.bb
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc
 rename recipes-graphics/imx-gpu-viv/{imx-gpu-viv_5.0.11.p4.1-hfp.bb => imx-gpu-viv_5.0.11.p4.4-hfp.bb} (54%)
 rename recipes-graphics/imx-gpu-viv/{imx-gpu-viv_5.0.11.p4.1-sfp.bb => imx-gpu-viv_5.0.11.p4.4-sfp.bb} (63%)
 rename recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante_3.10.53-1.1.0.bb => xf86-video-imxfb-vivante_5.0.11.p4.4.bb} (95%)
 delete mode 100644 recipes-kernel/linux/linux-imx-3.10.53/0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch
 create mode 100644 recipes-kernel/linux/linux-imx-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch
 create mode 100644 recipes-kernel/linux/linux-imx-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch
 rename recipes-kernel/linux/{linux-imx-3.10.53/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch => linux-imx-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch} (56%)
 rename recipes-kernel/linux/{linux-imx-3.10.53 => linux-imx-3.14.28}/mx6/defconfig (89%)
 rename recipes-kernel/linux/{linux-imx-mfgtool-3.10.53 => linux-imx-mfgtool-3.14.28}/mx6/defconfig (83%)
 rename recipes-kernel/linux/{linux-imx-mfgtool_3.10.53.bb => linux-imx-mfgtool_3.14.28.bb} (100%)
 create mode 100644 recipes-kernel/linux/linux-imx_3.14.28.bb

-- 
2.1.4



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 01/12] linux-imx: Upgrade to 3.14.28-1.0.0 GA version
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 02/12] u-boot-imx: Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

This upgrades 3.10.53-1.1.0 GA kernel to the 3.14.28-1.0.0 GA
one. This patch is based on a patch[1] sent by Lauren Post.

1. http://patchwork.openembedded.org/patch/91217/

Over the original patch, following changes has been done:

 - removal of 3.10.53-1.1.0 GA kernel recipes;
 - backport of 3.14.29's patch for i.MX6 TO1.0 support;
 - forward port of i.MX6SL code removal support patch.

Change-Id: I2193de3f61f1d9d70137774405ff60ee00aeae2c
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...6q-fix-video-divider-for-revision-1.0-of-.patch |  35 -------
 ...0001-ARM-imx6q-drop-unnecessary-semicolon.patch |  35 +++++++
 ...lk-imx6q-fix-video-divider-for-rev-T0-1.0.patch |  40 ++++++++
 ...isable-imx6sl-specific-code-when-imx6sl-.patch} |  38 ++++----
 .../mx6/defconfig                                  |  84 +++++++++-------
 .../mx6/defconfig                                  | 108 +++++++++------------
 ...ool_3.10.53.bb => linux-imx-mfgtool_3.14.28.bb} |   0
 recipes-kernel/linux/linux-imx_3.14.28.bb          |  23 +++++
 8 files changed, 216 insertions(+), 147 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-imx-3.10.53/0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch
 create mode 100644 recipes-kernel/linux/linux-imx-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch
 create mode 100644 recipes-kernel/linux/linux-imx-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch
 rename recipes-kernel/linux/{linux-imx-3.10.53/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch => linux-imx-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch} (56%)
 rename recipes-kernel/linux/{linux-imx-3.10.53 => linux-imx-3.14.28}/mx6/defconfig (89%)
 rename recipes-kernel/linux/{linux-imx-mfgtool-3.10.53 => linux-imx-mfgtool-3.14.28}/mx6/defconfig (83%)
 rename recipes-kernel/linux/{linux-imx-mfgtool_3.10.53.bb => linux-imx-mfgtool_3.14.28.bb} (100%)
 create mode 100644 recipes-kernel/linux/linux-imx_3.14.28.bb

diff --git a/recipes-kernel/linux/linux-imx-3.10.53/0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch b/recipes-kernel/linux/linux-imx-3.10.53/0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch
deleted file mode 100644
index 820ce68..0000000
--- a/recipes-kernel/linux/linux-imx-3.10.53/0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0e981452d7130513e796c1c3d7348905c0d00dce Mon Sep 17 00:00:00 2001
-From: Gary Bisson <bisson.gary@gmail.com>
-Date: Tue, 2 Dec 2014 22:11:14 -0800
-Subject: [PATCH] ARM: clk-imx6q: fix video divider for revision 1.0 of i.MX6q
-
-As post dividers do not work on i.MX6Q revision 1.0 they must be fixed
-to 1. As the table index was wrong, a divider a of 4 could still be
-requested which implied the clock not to be set properly. This is the
-root cause of the HDMI not working at high resolution on T1.0 version of
-the SoC, giving the following error:
-mxc_sdc_fb fb.27: timeout when waiting for flip irq
-
-Upstream-Status: Pending
-
-Signed-off-by: Gary Bisson <bisson.gary@gmail.com>
----
- arch/arm/mach-imx/clk-imx6q.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
-index 25734ed..34e1616f 100644
---- a/arch/arm/mach-imx/clk-imx6q.c
-+++ b/arch/arm/mach-imx/clk-imx6q.c
-@@ -312,7 +312,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
- 		post_div_table[1].div = 1;
- 		post_div_table[2].div = 1;
- 		video_div_table[1].div = 1;
--		video_div_table[2].div = 1;
-+		video_div_table[3].div = 1;
- 	};
- 
- 	/*                   type                               name         parent_name  base     div_mask */
--- 
-2.1.3
-
diff --git a/recipes-kernel/linux/linux-imx-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch b/recipes-kernel/linux/linux-imx-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch
new file mode 100644
index 0000000..8d43183
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-3.14.28/0001-ARM-imx6q-drop-unnecessary-semicolon.patch
@@ -0,0 +1,35 @@
+From 5332a5467624b01d0c166309cd1dceac5f7b9d96 Mon Sep 17 00:00:00 2001
+From: Dmitry Voytik <voytikd@gmail.com>
+Date: Thu, 6 Nov 2014 22:46:20 +0400
+Subject: [PATCH 1/3] ARM: imx6q: drop unnecessary semicolon
+
+commit d2a10a1727b3948019128e83162f22c65859f1fd upstream.
+
+Drop unnecessary semicolon after closing curly bracket.
+
+Signed-off-by: Dmitry Voytik <voytikd@gmail.com>
+Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+Upstream-Status: Backport [3.14.29]
+
+---
+ arch/arm/mach-imx/clk-imx6q.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
+index f0d8000..a5107ab 100644
+--- a/arch/arm/mach-imx/clk-imx6q.c
++++ b/arch/arm/mach-imx/clk-imx6q.c
+@@ -149,7 +149,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
+ 		post_div_table[2].div = 1;
+ 		video_div_table[1].div = 1;
+ 		video_div_table[2].div = 1;
+-	};
++	}
+ 
+ 	clk[IMX6QDL_PLL1_BYPASS_SRC] = imx_clk_mux("pll1_bypass_src", base + 0x00, 14, 2, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));
+ 	clk[IMX6QDL_PLL2_BYPASS_SRC] = imx_clk_mux("pll2_bypass_src", base + 0x30, 14, 2, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));
+-- 
+2.1.4
+
diff --git a/recipes-kernel/linux/linux-imx-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch b/recipes-kernel/linux/linux-imx-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch
new file mode 100644
index 0000000..d7b852d
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-3.14.28/0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch
@@ -0,0 +1,40 @@
+From 5b9eb0cdaefd7ac8e31c1e1812582e0169ba9722 Mon Sep 17 00:00:00 2001
+From: Gary Bisson <bisson.gary@gmail.com>
+Date: Wed, 3 Dec 2014 15:03:51 -0800
+Subject: [PATCH 2/3] ARM: clk-imx6q: fix video divider for rev T0 1.0
+
+commit 81ef447950bf0955aca46f4a7617d8ce435cf0ce upstream.
+
+The post dividers do not work on i.MX6Q rev T0 1.0 so they must be fixed
+to 1. As the table index was wrong, a divider a of 4 could still be
+requested which implied the clock not to be set properly. This is the
+root cause of the HDMI not working at high resolution on rev T0 1.0 of
+the SoC.
+
+Signed-off-by: Gary Bisson <bisson.gary@gmail.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+Upstream-Status: Backport [3.14.29]
+
+---
+ arch/arm/mach-imx/clk-imx6q.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
+index a5107ab..cf060a9 100644
+--- a/arch/arm/mach-imx/clk-imx6q.c
++++ b/arch/arm/mach-imx/clk-imx6q.c
+@@ -148,7 +148,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
+ 		post_div_table[1].div = 1;
+ 		post_div_table[2].div = 1;
+ 		video_div_table[1].div = 1;
+-		video_div_table[2].div = 1;
++		video_div_table[3].div = 1;
+ 	}
+ 
+ 	clk[IMX6QDL_PLL1_BYPASS_SRC] = imx_clk_mux("pll1_bypass_src", base + 0x00, 14, 2, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));
+-- 
+2.1.4
+
diff --git a/recipes-kernel/linux/linux-imx-3.10.53/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch b/recipes-kernel/linux/linux-imx-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
similarity index 56%
rename from recipes-kernel/linux/linux-imx-3.10.53/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
rename to recipes-kernel/linux/linux-imx-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
index cbd0b58..0743099 100644
--- a/recipes-kernel/linux/linux-imx-3.10.53/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
+++ b/recipes-kernel/linux/linux-imx-3.14.28/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
@@ -1,7 +1,7 @@
-From 2e9ea279e6c4e94c8a760355f80461599d2ba5aa Mon Sep 17 00:00:00 2001
+From 8340ad4ab71b568e65dfd1b92cc0967152887f97 Mon Sep 17 00:00:00 2001
 From: Nikolay Dimitrov <picmaster@mail.bg>
 Date: Sun, 8 Feb 2015 22:18:09 +0200
-Subject: [PATCH] ARM: imx6sl: Disable imx6sl-specific code when imx6sl SOC
+Subject: [PATCH 3/3] ARM: imx6sl: Disable imx6sl-specific code when imx6sl SOC
  support is disabled
 
 Currently the build fails when CONFIG_SOC_IMX6SL is disabled, due to some
@@ -9,33 +9,37 @@ hard-coded stuff. The patch purpose is to handle enabling/disabling this
 config option.
 
 Signed-off-by: Nikolay Dimitrov <picmaster@mail.bg>
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+
+Upstream-Status: Pending
+
 ---
- arch/arm/mach-imx/Makefile |    3 ++-
- arch/arm/mach-imx/mxc.h    |    4 ++++
+ arch/arm/mach-imx/Makefile | 3 ++-
+ arch/arm/mach-imx/mxc.h    | 4 ++++
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
-index 482c310..ae89b39 100644
+index b76a214..27f1976 100644
 --- a/arch/arm/mach-imx/Makefile
 +++ b/arch/arm/mach-imx/Makefile
-@@ -112,7 +112,8 @@ ifeq ($(CONFIG_ARM_IMX6_CPUFREQ),y)
- obj-y += busfreq-imx6.o
- obj-$(CONFIG_SOC_IMX6Q) += ddr3_freq_imx6.o busfreq_ddr3.o
- obj-$(CONFIG_SOC_IMX6SL) += lpddr2_freq_imx6.o busfreq_lpddr2.o imx6sl_wfi.o
+@@ -122,7 +122,8 @@ obj-$(CONFIG_SOC_IMX6SL) += busfreq_lpddr2.o lpddr2_freq_imx6.o imx6sl_lpm_wfi.o
+ AFLAGS_lpddr2_freq_imx6sx.o :=-Wa,-march=armv7-a
+ AFLAGS_ddr3_freq_imx6sx.o :=-Wa,-march=armv7-a
+ AFLAGS_imx6sx_low_power_idle.o :=-Wa,-march=armv7-a
 -obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6sx.o imx6sx_low_power_idle.o
-+obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6.o \
-+	lpddr2_freq_imx6sx.o busfreq_lpddr2.o imx6sx_low_power_idle.o
- 
++obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6sx.o imx6sx_low_power_idle.o \
++	busfreq_lpddr2.o lpddr2_freq_imx6.o
  endif
  
+ 
 diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h
-index 88c4bce..9e412ee 100644
+index 1510769..e6af4dd 100644
 --- a/arch/arm/mach-imx/mxc.h
 +++ b/arch/arm/mach-imx/mxc.h
-@@ -161,10 +161,14 @@ static inline bool cpu_is_imx6sx(void)
- 	return __mxc_cpu_type == MXC_CPU_IMX6SX;
- }
+@@ -158,10 +158,14 @@ extern unsigned int __mxc_cpu_type;
+ #endif
  
+ #ifndef __ASSEMBLY__
 +#ifdef CONFIG_SOC_IMX6SL
  static inline bool cpu_is_imx6sl(void)
  {
@@ -48,5 +52,5 @@ index 88c4bce..9e412ee 100644
  static inline bool cpu_is_imx6dl(void)
  {
 -- 
-1.7.10.4
+2.1.4
 
diff --git a/recipes-kernel/linux/linux-imx-3.10.53/mx6/defconfig b/recipes-kernel/linux/linux-imx-3.14.28/mx6/defconfig
similarity index 89%
rename from recipes-kernel/linux/linux-imx-3.10.53/mx6/defconfig
rename to recipes-kernel/linux/linux-imx-3.14.28/mx6/defconfig
index 501bab8..303e679 100644
--- a/recipes-kernel/linux/linux-imx-3.10.53/mx6/defconfig
+++ b/recipes-kernel/linux/linux-imx-3.14.28/mx6/defconfig
@@ -2,13 +2,12 @@ CONFIG_KERNEL_LZO=y
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_CGROUPS=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
@@ -19,9 +18,9 @@ CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_MXC=y
-CONFIG_MXC_DEBUG_BOARD=y
 CONFIG_MACH_IMX51_DT=y
 CONFIG_MACH_EUKREA_CPUIMX51SD=y
+CONFIG_SOC_IMX50=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
@@ -32,8 +31,8 @@ CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
 CONFIG_HIGHMEM=y
+CONFIG_CMA=y
 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
@@ -42,7 +41,7 @@ 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_ARM_IMX6_CPUFREQ=y
+CONFIG_ARM_IMX6Q_CPUFREQ=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -67,9 +66,6 @@ CONFIG_LLC2=y
 CONFIG_CAN=y
 CONFIG_CAN_FLEXCAN=y
 CONFIG_CAN_M_CAN=y
-CONFIG_CFG80211=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_MAC80211=y
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y
@@ -83,18 +79,14 @@ CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUART_3WIRE is not set
 CONFIG_BT_HCIBCM203X=y
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_MRVL is not set
 CONFIG_BT_ATH3K=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
-CONFIG_CMA=y
+CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=320
 CONFIG_IMX_WEIM=y
 CONFIG_CONNECTOR=y
@@ -113,7 +105,7 @@ CONFIG_MTD_SST25L=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_GPMI_NAND=y
 CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_SPI_NOR_BASE=y
+CONFIG_MTD_SPI_NOR=y
 CONFIG_SPI_FSL_QUADSPI=y
 CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
@@ -155,6 +147,7 @@ CONFIG_USB_NET_CDC_EEM=m
 CONFIG_ATH_CARDS=y
 CONFIG_ATH6KL=m
 CONFIG_ATH6KL_SDIO=m
+CONFIG_BRCMFMAC=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_EVBUG=m
@@ -168,11 +161,12 @@ CONFIG_TOUCHSCREEN_EGALAX=y
 CONFIG_TOUCHSCREEN_ELAN=y
 CONFIG_TOUCHSCREEN_MAX11801=y
 CONFIG_TOUCHSCREEN_MC13783=y
+CONFIG_TOUCHSCREEN_TSC2007=y
+CONFIG_TOUCHSCREEN_STMPE=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MMA8450=y
 CONFIG_INPUT_ISL29023=y
 CONFIG_SERIO_SERPORT=m
-CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_IMX=y
@@ -180,7 +174,6 @@ CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_FSL_OTP=y
-CONFIG_MXS_VIIM=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_HELPER_AUTO is not set
@@ -190,10 +183,8 @@ CONFIG_I2C_IMX=y
 CONFIG_SPI=y
 CONFIG_SPI_IMX=y
 CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_MAX732X=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_SABRESD_MAX8903=y
-CONFIG_IMX6_USB_CHARGER=y
 CONFIG_SENSORS_MAX17135=y
 CONFIG_SENSORS_MAG3110=y
 CONFIG_THERMAL=y
@@ -207,34 +198,39 @@ CONFIG_MFD_MC13XXX_SPI=y
 CONFIG_MFD_MC13XXX_I2C=y
 CONFIG_MFD_MAX17135=y
 CONFIG_MFD_SI476X_CORE=y
+CONFIG_MFD_STMPE=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_DA9052=y
 CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_DA9052=y
+CONFIG_REGULATOR_MAX17135=y
 CONFIG_REGULATOR_MC13783=y
 CONFIG_REGULATOR_MC13892=y
-CONFIG_REGULATOR_MAX17135=y
 CONFIG_REGULATOR_PFUZE100=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_VIDEO_V4L2_INT_DEVICE=y
+CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_RC_DEVICES=y
+CONFIG_IR_GPIO_CIR=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_MXC_OUTPUT=y
 CONFIG_VIDEO_MXC_CAPTURE=m
-CONFIG_VIDEO_MXC_CSI_CAMERA=m
 CONFIG_MXC_CAMERA_OV5640=m
 CONFIG_MXC_CAMERA_OV5642=m
 CONFIG_MXC_CAMERA_OV5640_MIPI=m
 CONFIG_MXC_TVIN_ADV7180=m
-CONFIG_MXC_VADC=m
 CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
 CONFIG_VIDEO_MXC_IPU_OUTPUT=y
 CONFIG_VIDEO_MXC_PXP_V4L2=y
+CONFIG_VIDEO_MXC_CSI_CAMERA=m
+CONFIG_MXC_VADC=m
 CONFIG_SOC_CAMERA=y
 CONFIG_VIDEO_MX3=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CODA=y
 CONFIG_RADIO_SI476X=y
 CONFIG_SOC_CAMERA_OV2640=y
 CONFIG_DRM=y
@@ -258,9 +254,6 @@ CONFIG_FB_MXC_DCIC=m
 CONFIG_HANNSTAR_CABC=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
 CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
@@ -276,21 +269,38 @@ CONFIG_SND_SOC_IMX_SPDIF=y
 CONFIG_SND_SOC_IMX_MC13783=y
 CONFIG_SND_SOC_IMX_HDMI=y
 CONFIG_SND_SOC_IMX_SI476X=y
-CONFIG_SND_SOC_CS42XX8_I2C=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_HCD_TEST_MODE=y
+CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_ACM=m
 CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_EHSET_TEST_FIXTURE=m
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
 CONFIG_MMC=y
@@ -300,13 +310,16 @@ CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MXC_IPU=y
 CONFIG_MXC_GPU_VIV=y
-CONFIG_MXC_ASRC=y
 CONFIG_MXC_MIPI_CSI2=y
 CONFIG_MXC_MLB150=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
@@ -318,7 +331,7 @@ CONFIG_MXC_PXP_V2=y
 CONFIG_IMX_SDMA=y
 CONFIG_MXS_DMA=y
 CONFIG_STAGING=y
-CONFIG_COMMON_CLK_DEBUG=y
+CONFIG_STAGING_MEDIA=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=y
 CONFIG_VF610_ADC=y
@@ -358,6 +371,7 @@ CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_UTF8=y
+CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
@@ -365,11 +379,9 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_SECURITYFS=y
 CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_LRW=y
 CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_MD4=y
@@ -380,7 +392,6 @@ CONFIG_CRYPTO_RMD160=y
 CONFIG_CRYPTO_RMD256=y
 CONFIG_CRYPTO_RMD320=y
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_TGR192=y
 CONFIG_CRYPTO_WP512=y
@@ -397,3 +408,6 @@ CONFIG_CRC_CCITT=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
diff --git a/recipes-kernel/linux/linux-imx-mfgtool-3.10.53/mx6/defconfig b/recipes-kernel/linux/linux-imx-mfgtool-3.14.28/mx6/defconfig
similarity index 83%
rename from recipes-kernel/linux/linux-imx-mfgtool-3.10.53/mx6/defconfig
rename to recipes-kernel/linux/linux-imx-mfgtool-3.14.28/mx6/defconfig
index 677eaa0..17598b1 100644
--- a/recipes-kernel/linux/linux-imx-mfgtool-3.10.53/mx6/defconfig
+++ b/recipes-kernel/linux/linux-imx-mfgtool-3.14.28/mx6/defconfig
@@ -1,14 +1,14 @@
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_KERNEL_LZO=y
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_CGROUPS=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
@@ -17,30 +17,34 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
+CONFIG_ARCH_MULTI_V6=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_MXC=y
-CONFIG_MXC_DEBUG_BOARD=y
+# CONFIG_MACH_MX31ADS is not set
+# CONFIG_MACH_BUG is not set
 CONFIG_MACH_IMX51_DT=y
 CONFIG_MACH_EUKREA_CPUIMX51SD=y
+CONFIG_SOC_IMX50=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_VF610=y
-# CONFIG_SWP_EMULATE is not set
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_PREEMPT=y
 CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
+CONFIG_HIGHMEM=y
+CONFIG_CMA=y
 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 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_ARM_IMX6_CPUFREQ=y
+CONFIG_ARM_IMX6Q_CPUFREQ=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -60,14 +64,14 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
 CONFIG_NETFILTER=y
-CONFIG_VLAN_8021Q=y
 CONFIG_CFG80211=y
-CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=y
+CONFIG_RFKILL=y
+CONFIG_RFKILL_INPUT=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
-CONFIG_CMA=y
+CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=320
 CONFIG_IMX_WEIM=y
 CONFIG_CONNECTOR=y
@@ -86,7 +90,7 @@ CONFIG_MTD_SST25L=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_GPMI_NAND=y
 CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_SPI_NOR_BASE=y
+CONFIG_MTD_SPI_NOR=y
 CONFIG_SPI_FSL_QUADSPI=y
 CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
@@ -120,9 +124,8 @@ CONFIG_SMC91X=y
 CONFIG_SMC911X=y
 CONFIG_SMSC911X=y
 # CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_ATH_CARDS=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
+CONFIG_AT803X_PHY=y
+CONFIG_BRCMFMAC=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_EVBUG=m
@@ -132,21 +135,20 @@ CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_EGALAX=y
-CONFIG_TOUCHSCREEN_ELAN=y
-CONFIG_TOUCHSCREEN_MAX11801=y
 CONFIG_TOUCHSCREEN_MC13783=y
+CONFIG_TOUCHSCREEN_TSC2007=y
+CONFIG_TOUCHSCREEN_STMPE=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MMA8450=y
-CONFIG_INPUT_ISL29023=y
 CONFIG_SERIO_SERPORT=m
-CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
-CONFIG_FSL_OTP=y
+CONFIG_HW_RANDOM=y
+CONFIG_IMX_SEMA4=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_HELPER_AUTO is not set
@@ -156,10 +158,7 @@ CONFIG_I2C_IMX=y
 CONFIG_SPI=y
 CONFIG_SPI_IMX=y
 CONFIG_GPIO_SYSFS=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_SABRESD_MAX8903=y
-CONFIG_SENSORS_MAX17135=y
-CONFIG_SENSORS_MAG3110=y
+# CONFIG_HWMON is not set
 CONFIG_THERMAL=y
 CONFIG_CPU_THERMAL=y
 CONFIG_IMX_THERMAL=y
@@ -169,36 +168,27 @@ CONFIG_IMX2_WDT=y
 CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_MC13XXX_SPI=y
 CONFIG_MFD_MC13XXX_I2C=y
-CONFIG_MFD_MAX17135=y
-CONFIG_MFD_SI476X_CORE=y
+CONFIG_MFD_STMPE=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_DA9052=y
 CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_DA9052=y
 CONFIG_REGULATOR_MC13783=y
 CONFIG_REGULATOR_MC13892=y
-CONFIG_REGULATOR_MAX17135=y
 CONFIG_REGULATOR_PFUZE100=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_VIDEO_V4L2_INT_DEVICE=y
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=m
+CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_RC_DEVICES=y
+CONFIG_IR_GPIO_CIR=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_MXC_OUTPUT=y
-CONFIG_VIDEO_MXC_CAPTURE=m
-CONFIG_VIDEO_MXC_CSI_CAMERA=m
-CONFIG_MXC_CAMERA_OV5640=m
-CONFIG_MXC_CAMERA_OV5642=m
-CONFIG_MXC_CAMERA_OV5640_MIPI=m
-CONFIG_MXC_TVIN_ADV7180=m
-CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
 CONFIG_VIDEO_MXC_IPU_OUTPUT=y
 CONFIG_VIDEO_MXC_PXP_V4L2=y
 CONFIG_SOC_CAMERA=y
 CONFIG_VIDEO_MX3=y
-CONFIG_RADIO_SI476X=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CODA=y
 CONFIG_SOC_CAMERA_OV2640=y
 CONFIG_DRM=y
 CONFIG_DRM_VIVANTE=y
@@ -216,35 +206,33 @@ CONFIG_FB_MXC_MIPI_DSI=y
 CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
 CONFIG_FB_MXC_HDMI=y
 CONFIG_FB_MXC_EINK_PANEL=y
+CONFIG_FB_MXC_EINK_AUTO_UPDATE_MODE=y
 CONFIG_FB_MXS_SII902X=y
+CONFIG_HANNSTAR_CABC=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
 CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
-CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_SOC=y
 CONFIG_SND_IMX_SOC=y
 CONFIG_SND_SOC_EUKREA_TLV320=y
-CONFIG_SND_SOC_IMX_CS42888=y
 CONFIG_SND_SOC_IMX_WM8962=y
 CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_SOC_IMX_SPDIF=y
 CONFIG_SND_SOC_IMX_MC13783=y
-CONFIG_SND_SOC_IMX_HDMI=y
-CONFIG_SND_SOC_IMX_SI476X=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
+CONFIG_USB_PHY=y
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_ETH is not set
@@ -269,10 +257,17 @@ CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MXC_IPU=y
 CONFIG_MXC_GPU_VIV=y
-CONFIG_MXC_ASRC=y
 CONFIG_MXC_MIPI_CSI2=y
+CONFIG_MXC_MLB150=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 CONFIG_RTC_DRV_MC13XXX=y
@@ -283,7 +278,7 @@ CONFIG_MXC_PXP_V2=y
 CONFIG_IMX_SDMA=y
 CONFIG_MXS_DMA=y
 CONFIG_STAGING=y
-CONFIG_COMMON_CLK_DEBUG=y
+CONFIG_STAGING_MEDIA=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_PWM=y
 CONFIG_PWM_IMX=y
@@ -326,19 +321,12 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_FTRACE is not set
 CONFIG_SECURITYFS=y
-CONFIG_CRYPTO_USER=y
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
+# CONFIG_CRYPTO_HW is not set
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
diff --git a/recipes-kernel/linux/linux-imx-mfgtool_3.10.53.bb b/recipes-kernel/linux/linux-imx-mfgtool_3.14.28.bb
similarity index 100%
rename from recipes-kernel/linux/linux-imx-mfgtool_3.10.53.bb
rename to recipes-kernel/linux/linux-imx-mfgtool_3.14.28.bb
diff --git a/recipes-kernel/linux/linux-imx_3.14.28.bb b/recipes-kernel/linux/linux-imx_3.14.28.bb
new file mode 100644
index 0000000..e3078f7
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx_3.14.28.bb
@@ -0,0 +1,23 @@
+# Copyright (C) 2013-2015 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMMARY = "Linux Kernel provided and supported by Freescale"
+DESCRIPTION = "Linux Kernel provided and supported by Freescale with focus on \
+i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU."
+
+require recipes-kernel/linux/linux-imx.inc
+require recipes-kernel/linux/linux-dtb.inc
+
+DEPENDS += "lzop-native bc-native"
+
+SRCBRANCH = "imx_3.14.28_1.0.0_ga"
+LOCALVERSION = "-1.0.0_ga"
+SRCREV = "91cf351a2afc17ac4a260e4d2ad1e32d00925a1b"
+
+SRC_URI += " \
+    file://0001-ARM-imx6q-drop-unnecessary-semicolon.patch \
+    file://0002-ARM-clk-imx6q-fix-video-divider-for-rev-T0-1.0.patch \
+    file://0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch \
+"
+
+COMPATIBLE_MACHINE = "(mx6)"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 02/12] u-boot-imx: Upgrade to 3.14.28-1.0.0 GA release
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 01/12] linux-imx: Upgrade to 3.14.28-1.0.0 GA version Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 03/12] imx6sxsabresd: Add imx6sx-sdb-ldo.dtb DeviceTree Otavio Salvador
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

From: Lauren Post <lauren.post@freescale.com>

Include support for i.MX 6 DQ Sabre Auto CPU2 board
Bug fixes since 3.10.53-1.1.0 GA

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/u-boot/u-boot-imx_2014.04.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-imx_2014.04.bb b/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
index c5f87bc..ebae692 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
@@ -8,9 +8,9 @@ PROVIDES += "u-boot"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCBRANCH = "imx_v2014.04_3.10.53_1.1.0_ga"
+SRCBRANCH = "imx_v2014.04_3.14.28_1.0.0_ga"
 SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=${SRCBRANCH}"
-SRCREV = "afc02ad90dd967faa7cf7013310423e29670cadb"
+SRCREV = "88123ea911e133724cbe738c2b0517fa470592c0"
 
 S = "${WORKDIR}/git"
 
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 03/12] imx6sxsabresd: Add imx6sx-sdb-ldo.dtb DeviceTree
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 01/12] linux-imx: Upgrade to 3.14.28-1.0.0 GA version Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 02/12] u-boot-imx: Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 04/12] firmware-imx: Upgrade to 3.14.28-1.0.0 release Otavio Salvador
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

From: Lauren Post <lauren.post@freescale.com>

Support ldo-bypass mode on imx6sx-17x17/19x19 and imx6sx-sdb-reva
board.

Change-Id: If6cb6ea33185917b7f26da5a29724bdd1df348c2
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/imx6sxsabresd.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 7c90de9..62e3afb 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -9,7 +9,7 @@ require conf/machine/include/imx6sabresd-common.inc
 SOC_FAMILY = "mx6:mx6sx"
 
 KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
-                     imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \
+                     imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb \
                      imx6sx-sdb-reva-ldo.dtb imx6sx-sdb-reva.dtb"
 
 UBOOT_ENTRYPOINT = "0x80008000"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 04/12] firmware-imx: Upgrade to 3.14.28-1.0.0 release
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
                   ` (2 preceding siblings ...)
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 03/12] imx6sxsabresd: Add imx6sx-sdb-ldo.dtb DeviceTree Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 05/12] firmware-imx: Fix PE syntax to follow code style Otavio Salvador
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

From: Lauren Post <lauren.post@freescale.com>

This upgrades the vpu firwmare to v3.1.1_r46063

Also license is now changed from LAOPT27 to
LA_OPT_FSL_OPEN_3RD_PARTY_IP

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/firmware-imx/firmware-imx.inc              |  2 +-
 recipes-bsp/firmware-imx/firmware-imx_3.10.53-1.1.0.bb | 10 ----------
 recipes-bsp/firmware-imx/firmware-imx_3.14.28-1.0.0.bb |  8 ++++++++
 3 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 recipes-bsp/firmware-imx/firmware-imx_3.10.53-1.1.0.bb
 create mode 100644 recipes-bsp/firmware-imx/firmware-imx_3.14.28-1.0.0.bb

diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index 96ff1b0..f0b2d98 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -2,7 +2,7 @@ SUMMARY = "Freescale IMX firmware"
 DESCRIPTION = "Freescale IMX firmware such as for the VPU"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://licenses/vpu/EULA;md5=6469a8514eed615d6bf8c09f41846d8f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=acdb807ac7275fe32f9f64992e111241"
 
 PE="1"
 
diff --git a/recipes-bsp/firmware-imx/firmware-imx_3.10.53-1.1.0.bb b/recipes-bsp/firmware-imx/firmware-imx_3.10.53-1.1.0.bb
deleted file mode 100644
index a501833..0000000
--- a/recipes-bsp/firmware-imx/firmware-imx_3.10.53-1.1.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2012-2015 Freescale Semiconductor
-
-require firmware-imx.inc
-
-PE="1"
-
-SRC_URI[md5sum] = "b15ce0e8d2acb4ad694d7c0b835678ef"
-SRC_URI[sha256sum] = "32391ce725657a74d69c448556c62afc3d3dafed55aa1a20de257a07171cb151"
-
-COMPATIBLE_MACHINE = "(mx5|mx6)"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_3.14.28-1.0.0.bb b/recipes-bsp/firmware-imx/firmware-imx_3.14.28-1.0.0.bb
new file mode 100644
index 0000000..408baf1
--- /dev/null
+++ b/recipes-bsp/firmware-imx/firmware-imx_3.14.28-1.0.0.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2012-2015 Freescale Semiconductor
+
+require firmware-imx.inc
+
+SRC_URI[md5sum] = "6e700f3d3a6482db08d5aabee7751630"
+SRC_URI[sha256sum] = "1f09acd4d605efc78a0672068a658cb16274811d2f444cf3ae7aaa075266746f"
+
+COMPATIBLE_MACHINE = "(mx5|mx6)"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 05/12] firmware-imx: Fix PE syntax to follow code style
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
                   ` (3 preceding siblings ...)
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 04/12] firmware-imx: Upgrade to 3.14.28-1.0.0 release Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 06/12] imx-kobs: Upgrade to 3.14.28-1.0.0 version Otavio Salvador
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

This adds space before and after equal symbol.

Change-Id: If8f0f3a710730a67b473828889c3c07b51940393
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/firmware-imx/firmware-imx.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index f0b2d98..80e5e59 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -4,7 +4,7 @@ SECTION = "base"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=acdb807ac7275fe32f9f64992e111241"
 
-PE="1"
+PE = "1"
 
 SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true"
 
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 06/12] imx-kobs: Upgrade to 3.14.28-1.0.0 version
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
                   ` (4 preceding siblings ...)
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 05/12] firmware-imx: Fix PE syntax to follow code style Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 07/12] imx-vpu: Upgrade 5.4.27 to 5.4.28 version Otavio Salvador
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

From: Lauren Post <lauren.post@freescale.com>

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../imx-kobs/{imx-kobs_3.10.53-1.1.0.bb => imx-kobs_3.14.28-1.0.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename recipes-bsp/imx-kobs/{imx-kobs_3.10.53-1.1.0.bb => imx-kobs_3.14.28-1.0.0.bb} (66%)

diff --git a/recipes-bsp/imx-kobs/imx-kobs_3.10.53-1.1.0.bb b/recipes-bsp/imx-kobs/imx-kobs_3.14.28-1.0.0.bb
similarity index 66%
rename from recipes-bsp/imx-kobs/imx-kobs_3.10.53-1.1.0.bb
rename to recipes-bsp/imx-kobs/imx-kobs_3.14.28-1.0.0.bb
index 34427bb..2cf1900 100644
--- a/recipes-bsp/imx-kobs/imx-kobs_3.10.53-1.1.0.bb
+++ b/recipes-bsp/imx-kobs/imx-kobs_3.14.28-1.0.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 SRC_URI = "${FSL_MIRROR}/imx-kobs-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "762063004e56e7160157e7c13ed6f684"
-SRC_URI[sha256sum] = "12970c94446998decacc3ed0c3f1e4edb4b5192982ba7facb1f8be0fd7775bb1"
+SRC_URI[md5sum] = "0077ec992b281ebbce2928564a08b207"
+SRC_URI[sha256sum] = "cfac042f5c96731205c397a4a6b3ed966f804569ae4d0e2685d22fdf6bdc9eb7"
 
 inherit  autotools pkgconfig
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 07/12] imx-vpu: Upgrade 5.4.27 to 5.4.28 version
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
                   ` (5 preceding siblings ...)
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 06/12] imx-kobs: Upgrade to 3.14.28-1.0.0 version Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 08/12] imx-test: Upgrade to version 3.14.28-1.0.0 GA Otavio Salvador
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

From: Lauren Post <lauren.post@freescale.com>

License also changed from LAOP27 to LA_OPT_FSL_OPEN_3RD_PARTY_IP

Change-Id: I84da584f0bc74b2e330127599643a4b8dccae1b3
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/imx-vpu/imx-vpu_5.4.27.bb | 10 ----------
 recipes-bsp/imx-vpu/imx-vpu_5.4.28.bb | 12 ++++++++++++
 2 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 recipes-bsp/imx-vpu/imx-vpu_5.4.27.bb
 create mode 100644 recipes-bsp/imx-vpu/imx-vpu_5.4.28.bb

diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.27.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.27.bb
deleted file mode 100644
index e733287..0000000
--- a/recipes-bsp/imx-vpu/imx-vpu_5.4.27.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013-2015 Freescale Semiconductor
-
-require imx-vpu.inc
-
-PE = "1"
-
-SRC_URI[md5sum] = "3dc36b427fc2b91af05504f39f8f964f"
-SRC_URI[sha256sum] = "e4e983f465c2ed296908dfe2bfcff2890c8f05b38f6ae98e7a7879b23a2b1a4e"
-
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.28.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.28.bb
new file mode 100644
index 0000000..6f69156
--- /dev/null
+++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.28.bb
@@ -0,0 +1,12 @@
+# Copyright (C) 2013-2015 Freescale Semiconductor
+
+require imx-vpu.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=acdb807ac7275fe32f9f64992e111241"
+
+PE = "1"
+
+SRC_URI[md5sum] = "774455b57aaa12bae2e2cecf39b63ac4"
+SRC_URI[sha256sum] = "0a05af1a5978175de852b2cf61763ec789f2845df78edb8d02a28611439b57f7"
+
+COMPATIBLE_MACHINE = "(mx6)"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 08/12] imx-test: Upgrade to version 3.14.28-1.0.0 GA
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
                   ` (6 preceding siblings ...)
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 07/12] imx-vpu: Upgrade 5.4.27 to 5.4.28 version Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 09/12] imx-gpu-viv: Upgrade to 5.0.11.p4.4 from 3.14.28-1.0.0 GA release Otavio Salvador
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

From: Lauren Post <lauren.post@freescale.com>

mmdc: Change the mmdc tool granularity
mx6s_capture:  Handle failure case when failed open video device.
hdcp:  remove since requires package download in 3.14

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../imx-test/imx-test-hdcp_3.10.17-1.0.0.bb        | 23 ----------------------
 ..._3.10.53-1.1.0.bb => imx-test_3.14.28-1.0.0.bb} |  6 ++----
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 recipes-bsp/imx-test/imx-test-hdcp_3.10.17-1.0.0.bb
 rename recipes-bsp/imx-test/{imx-test_3.10.53-1.1.0.bb => imx-test_3.14.28-1.0.0.bb} (59%)

diff --git a/recipes-bsp/imx-test/imx-test-hdcp_3.10.17-1.0.0.bb b/recipes-bsp/imx-test/imx-test-hdcp_3.10.17-1.0.0.bb
deleted file mode 100644
index b326b08..0000000
--- a/recipes-bsp/imx-test/imx-test-hdcp_3.10.17-1.0.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Test programs for IMX BSP"
-DESCRIPTION = "Linux HDCP test application for imx6 platform"
-SECTION = "base"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://EULA.txt;md5=93b784b1c11b3fffb1638498a8dde3f6"
-
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
-
-SRC_URI[md5sum] = "7289f732beac67c50a1857d86e43c6eb"
-SRC_URI[sha256sum] = "a64075953103da6a06714bdacb3bfa43845c2bd304d1cd00b5443d3edf02d904"
-
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-inherit fsl-eula-unpack
-
-do_install() {
-    install -d ${D}/unit_tests
-    install -m 755 ${S}/*.out ${D}/unit_tests/
-}
-
-FILES_${PN} += "/unit_tests"
-
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-bsp/imx-test/imx-test_3.10.53-1.1.0.bb b/recipes-bsp/imx-test/imx-test_3.14.28-1.0.0.bb
similarity index 59%
rename from recipes-bsp/imx-test/imx-test_3.10.53-1.1.0.bb
rename to recipes-bsp/imx-test/imx-test_3.14.28-1.0.0.bb
index e7b80b5..fc2ad1d 100644
--- a/recipes-bsp/imx-test/imx-test_3.10.53-1.1.0.bb
+++ b/recipes-bsp/imx-test/imx-test_3.14.28-1.0.0.bb
@@ -2,14 +2,12 @@
 
 include imx-test.inc
 
-SRC_URI += "file://Fix-build-in-OpenEmbedded-Core-environment.patch"
-
 SRC_URI_append_mx5 = " file://revert_epdc_hdr_change.patch \
                        file://clocks.sh"
 SRC_URI_append_mxs = " file://revert_epdc_hdr_change.patch \
                        file://clocks.sh"
 
-SRC_URI[md5sum] = "9a866ceb8c4f5fd2b3bdc7f054544987"
-SRC_URI[sha256sum] = "a578c773ec3314572e56e8c5984dc5aec9d7195958d4aae47c225df8ca0fbdd7"
+SRC_URI[md5sum] = "f349aed49830a21cc75d305b06979205"
+SRC_URI[sha256sum] = "ea3d572e82a374bcfc9acc654b66262cd97a246ffec9fb9fc458b19a02512723"
 
 COMPATIBLE_MACHINE = "(mxs|mx5|mx6)"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 09/12] imx-gpu-viv: Upgrade to 5.0.11.p4.4 from 3.14.28-1.0.0 GA release
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
                   ` (7 preceding siblings ...)
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 08/12] imx-test: Upgrade to version 3.14.28-1.0.0 GA Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  2015-04-07  0:08   ` Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 10/12] xf86-video-imxfb-vivante: Upgrade to 5.0.11.p4.4 version Otavio Salvador
                   ` (2 subsequent siblings)
  11 siblings, 1 reply; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

From: Lauren Post <lauren.post@freescale.com>

Remove pc files now they are part of imx-gpu-viv package
Fix api trace installation

Change-Id: I95b35b73a249b3e80b7437f3d516e19bc3e1242c
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc       | 30 ++++++++++++----------
 .../imx-gpu-viv/imx-gpu-viv/egl_directfb.pc        | 12 ---------
 .../imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc         | 13 ----------
 .../imx-gpu-viv/imx-gpu-viv/egl_wayland.pc         | 13 ----------
 ....p4.1-hfp.bb => imx-gpu-viv_5.0.11.p4.4-hfp.bb} |  4 +--
 ....p4.1-sfp.bb => imx-gpu-viv_5.0.11.p4.4-sfp.bb} |  4 +--
 6 files changed, 21 insertions(+), 55 deletions(-)
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc
 rename recipes-graphics/imx-gpu-viv/{imx-gpu-viv_5.0.11.p4.1-hfp.bb => imx-gpu-viv_5.0.11.p4.4-hfp.bb} (54%)
 rename recipes-graphics/imx-gpu-viv/{imx-gpu-viv_5.0.11.p4.1-sfp.bb => imx-gpu-viv_5.0.11.p4.4-sfp.bb} (63%)

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index 5cd00fa..f917fb2 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -5,7 +5,7 @@
 DESCRIPTION = "GPU driver and apps for imx6"
 SECTION = "libs"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;endline=11;md5=c4713c78d7f52bf2f92688a6f8f0cc93"
+LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;beginline=5;endline=11;md5=12c028cbbbedb4b8770267131500592c"
 
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \
                              base_contains('DISTRO_FEATURES', 'wayland', 'wayland', \
@@ -20,11 +20,8 @@ PE = "1"
 
 inherit fsl-eula-unpack
 
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
-           file://egl_linuxfb.pc \
-           file://egl_directfb.pc \
-           file://egl_wayland.pc \
-          "
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+
 PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
 	libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \
 	libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \
@@ -44,8 +41,8 @@ PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
 	libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \
 	libwayland-egl-mx6-dev \
 	imx-gpu-viv-g2d imx-gpu-viv-g2d-dev imx-gpu-viv-g2d-dbg \
-	imx-gpu-viv-tools imx-gpu-viv-tools-dbg\
-	imx-gpu-viv-tools-apitrace imx-gpu-viv-tools-apitrace-dbg\
+	imx-gpu-viv-tools imx-gpu-viv-tools-dbg \
+	imx-gpu-viv-tools-apitrace imx-gpu-viv-tools-apitrace-dbg \
 	imx-gpu-viv-demos imx-gpu-viv-demos-dbg \
 "
 
@@ -117,14 +114,14 @@ do_install () {
     cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
     cp -r ${S}/gpu-demos/opt ${D}
     cp -axr ${S}/gpu-tools/gmem-info/usr/bin/* ${D}${bindir}
-    cp -axr ${S}/apitrace/usr/lib/* ${D}${libdir}
-    cp -axr ${S}/apitrace/usr/bin/* ${D}${bindir}
 
     install -d ${D}${libdir}/pkgconfig
 
     # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb
     if [ "${USE_X11}" = "yes" ]; then
         cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir}
+        cp -axr ${S}/apitrace/x11/usr/lib/* ${D}${libdir}
+        cp -axr ${S}/apitrace/x11/usr/bin/* ${D}${bindir}
 
         backend=x11
 
@@ -140,9 +137,12 @@ do_install () {
         #    install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
         #fi
     elif [ "${USE_WL}" = "yes" ]; then
+        cp -axr ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir}
+        cp -axr ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir}
+
         backend=wl
 
-        install -m 0644 ${WORKDIR}/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc
+        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc
@@ -158,13 +158,17 @@ do_install () {
         if [ "${USE_DFB}" = "yes" ]; then
             install -d ${D}/${sysconfdir}
             install -m 644 ${S}/gpu-core/etc/directfbrc ${D}/${sysconfdir}/directfbrc
-            install -m 0644 ${WORKDIR}/egl_directfb.pc ${D}${libdir}/pkgconfig/egl.pc
+            install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_directfb.pc ${D}${libdir}/pkgconfig/egl.pc
 
             cp -r ${S}/gpu-core/usr/lib/directfb-* ${D}${libdir}
+            cp -axr ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir}
+            cp -axr ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir}
             backend=dfb
         else
             # Regular framebuffer
-            install -m 0644 ${WORKDIR}/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc
+            install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc
+            cp -axr ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir}
+            cp -axr ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir}
             backend=fb
         fi
         mv ${D}${libdir}/libGAL_egl.${backend}.so ${D}${libdir}/libGAL_egl.so
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc
deleted file mode 100644
index ff99007..0000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: egl
-Description: Vivante EGL library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} -DLINUX -DEGL_API_DFB
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc
deleted file mode 100644
index 8c2c8c6..0000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: egl
-Description: Vivante EGL library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} -DLINUX -DEGL_API_FB
-
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc
deleted file mode 100644
index 25bbea8..0000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: egl
-Description: Vivante EGL library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} -DLINUX -DEGL_API_FB -DWL_EGL_PLATFORM
-
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-hfp.bb
similarity index 54%
rename from recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb
rename to recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-hfp.bb
index c85e415..7499e35 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-hfp.bb
@@ -3,7 +3,7 @@
 
 require imx-gpu-viv.inc
 
-SRC_URI[md5sum] = "dd2093e6ec951fe843a2944af307d721"
-SRC_URI[sha256sum] = "6c436ea127bc1423fbe092ee5eaa3a8513647dfe2aff79f446fa8d6b4d00bcac"
+SRC_URI[md5sum] = "5aa3dfe5b9362f9ee53615e0a56f9009"
+SRC_URI[sha256sum] = "92654c185835e139cc9485806ad184fdac21f4d640ec9d0e493669235d21de9b"
 
 PACKAGE_FP_TYPE = "hardfp"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-sfp.bb
similarity index 63%
rename from recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb
rename to recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-sfp.bb
index 5f78d64..7a78048 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-sfp.bb
@@ -3,8 +3,8 @@
 
 require imx-gpu-viv.inc
 
-SRC_URI[md5sum] = "386b66e25abfb962f8eaf54fa85e7c18"
-SRC_URI[sha256sum] = "08349e3e6f23287f03e3a896c16938acc9cff44a1f6d624b23f7d348e09ab1ac"
+SRC_URI[md5sum] = "201398ab011b8765755fafb898efa77d"
+SRC_URI[sha256sum] = "8eef5414ec9121b38e2e44b3b64705b11f6f5d4503b90c05c31e3990c6ca3999"
 
 # FIXME skip the QA error for viv-samples
 INSANE_SKIP_${PN} += "rpaths"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 10/12] xf86-video-imxfb-vivante: Upgrade to 5.0.11.p4.4 version
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
                   ` (8 preceding siblings ...)
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 09/12] imx-gpu-viv: Upgrade to 5.0.11.p4.4 from 3.14.28-1.0.0 GA release Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 11/12] opencv: Add i.MX6SoloX support Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 12/12] EULA: Update to new license LA_OPT_FSL_OPEN_3RD_PARTY_IP Otavio Salvador
  11 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

From: Lauren Post <lauren.post@freescale.com>

- Change version to align to same version used for imx-gpu-viv
- Update rc.autohdmi to handle more error cases

Change-Id: I26c3342f7f6ecffc4ca975bc83795ea38f5feb17
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../xf86-video-imxfb-vivante/rc.autohdmi           | 24 +++++++++++++++-------
 ....bb => xf86-video-imxfb-vivante_5.0.11.p4.4.bb} |  4 ++--
 2 files changed, 19 insertions(+), 9 deletions(-)
 rename recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante_3.10.53-1.1.0.bb => xf86-video-imxfb-vivante_5.0.11.p4.4.bb} (95%)

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi
index 3a49e22..8c16a1d 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi
@@ -9,21 +9,31 @@
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
-do_start() {
-	export DISPLAY=:0
-	autohdmi &
-	exit 0
-}
+# Source function library.
+. /etc/init.d/functions
 
 case "$1" in
     start)
-	do_start
+	echo -n "Starting autohdmi: "
+	export DISPLAY=:0
+	autohdmi &
+	echo
+	exit 0
         ;;
-    restart|reload|force-reload)
+    reload|force-reload)
         echo "Error: argument '$1' not supported" >&2
         exit 3
         ;;
     stop)
+        echo -n "Shutting down autohdmi: "
+        killproc autohdmi
+        echo
+        ;;
+    restart)
+        echo -n "Restarting autohdmi: "
+        $0 stop
+        $0 start
+	echo
         ;;
     *)
         echo "Usage: $0 start|stop" >&2
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.53-1.1.0.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p4.4.bb
similarity index 95%
rename from recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.53-1.1.0.bb
rename to recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p4.4.bb
index 5e1eec7..5430f00 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.53-1.1.0.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p4.4.bb
@@ -15,8 +15,8 @@ LIC_FILES_CHKSUM = "file://EXA/src/vivante_fbdev/vivante.h;endline=19;md5=95cf96
 SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \
             file://rc.autohdmi"
 
-SRC_URI[md5sum] = "3ffa0f66bc0935a50cda9ebd5240ee2d"
-SRC_URI[sha256sum] = "f5836d86944a667f9fd1789911cdb7d8c54f6158a7776d28124942c4a94ddff6"
+SRC_URI[md5sum] = "6003295f7d586e5b6d4b5ffdb5d2f700"
+SRC_URI[sha256sum] = "9ca2356ca35a734615a205cf307b3c41f6e22c171ff823b6d5422c5473a69947"
 
 INITSCRIPT_PACKAGES = "xserver-xorg-extension-viv-autohdmi"
 INITSCRIPT_NAME = "rc.autohdmi"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 11/12] opencv: Add i.MX6SoloX support
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
                   ` (9 preceding siblings ...)
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 10/12] xf86-video-imxfb-vivante: Upgrade to 5.0.11.p4.4 version Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 12/12] EULA: Update to new license LA_OPT_FSL_OPEN_3RD_PARTY_IP Otavio Salvador
  11 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

From: Lauren Post <lauren.post@freescale.com>

Change-Id: I0abbcb9cf3b9962a9e2ee5901422f18d2e971bd0
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...c-Opencv-app-can-t-run-on-imx6sx-with-cam.patch | 46 ++++++++++++++++++++++
 .../recipes-support/opencv/opencv_%.bbappend       |  3 ++
 2 files changed, 49 insertions(+)
 create mode 100644 openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch
 create mode 100644 openembedded-layer/recipes-support/opencv/opencv_%.bbappend

diff --git a/openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch b/openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch
new file mode 100644
index 0000000..274fbe7
--- /dev/null
+++ b/openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch
@@ -0,0 +1,46 @@
+From 90f869763026e8ff18aeecde217d778f00e4f294 Mon Sep 17 00:00:00 2001
+From: Shawn Xiao <b49994@freescale.com>
+Date: Tue, 10 Feb 2015 16:11:59 +0800
+Subject: [PATCH] MGS-515 [#ccc] Opencv app can't run on imx6sx with cam
+
+This issue is caused by the no support of VIDIOC_QUERYCTRL ioctl
+item in latest cam driver.
+
+Modified the errno in check logic to compatible with new driver.
+
+Feb 10, 2015
+
+Upstream-Status: Pending
+
+Signed-off-by: Shawn Xiao <b49994@freescale.com>
+---
+ modules/highgui/src/cap_v4l.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/modules/highgui/src/cap_v4l.cpp b/modules/highgui/src/cap_v4l.cpp
+index c9fca05..8c46b6c 100644
+--- a/modules/highgui/src/cap_v4l.cpp
++++ b/modules/highgui/src/cap_v4l.cpp
+@@ -707,7 +707,8 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)
+ 
+     } else {
+ 
+-      if (errno == EINVAL)
++      if (errno == ENOTTY ||
++          errno == EINVAL)
+         continue;
+ 
+       perror ("VIDIOC_QUERYCTRL");
+@@ -774,7 +775,8 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)
+ 
+     } else {
+ 
+-      if (errno == EINVAL)
++      if (errno == ENOTTY ||
++          errno == EINVAL)
+         break;
+ 
+       perror ("VIDIOC_QUERYCTRL");
+-- 
+2.3.0
+
diff --git a/openembedded-layer/recipes-support/opencv/opencv_%.bbappend b/openembedded-layer/recipes-support/opencv/opencv_%.bbappend
new file mode 100644
index 0000000..be16696
--- /dev/null
+++ b/openembedded-layer/recipes-support/opencv/opencv_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_mx6sx = " file://0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [meta-fsl-arm][PATCH v2 12/12] EULA: Update to new license LA_OPT_FSL_OPEN_3RD_PARTY_IP
  2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
                   ` (10 preceding siblings ...)
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 11/12] opencv: Add i.MX6SoloX support Otavio Salvador
@ 2015-04-06 18:12 ` Otavio Salvador
  11 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-06 18:12 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

From: Lauren Post <lauren.post@freescale.com>

This requires inclusion of Software Content Register
Add SCR for i.MX for 3.14.28-1.0.0 GA release that aligns
to license update.

Previous EULA was LAOPT27 which is i.MX specific.  This
now supports other Freescale product lines under same license.

Change-Id: Idf406490a145eaa01ec7348a2ca2c91e28366980
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 EULA                             | 993 +++++++++++++++++++++------------------
 SCR/imx/SCR-3.14.28-1.0.0-ga.txt | 355 ++++++++++++++
 2 files changed, 885 insertions(+), 463 deletions(-)
 create mode 100644 SCR/imx/SCR-3.14.28-1.0.0-ga.txt

diff --git a/EULA b/EULA
index 96b33aa..4c12982 100644
--- a/EULA
+++ b/EULA
@@ -1,523 +1,590 @@
-LA_OPT27 v4 June 2013
+LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+IMPORTANT.  Read the following Freescale Semiconductor Software License
+Agreement ("Agreement") completely.    By selecting the "I Accept" button at
+the end of this page, you indicate that you accept the terms of the Agreement
+and you acknowledge that you have the authority, for yourself or on behalf of
+your company, to bind your company to these terms.  You may then download or
+install the file.
 
 FREESCALE SEMICONDUCTOR SOFTWARE LICENSE AGREEMENT
 
-IMPORTANT. Read the following Freescale Semiconductor Software
-License Agreement ("Agreement") completely. By selecting the
-"I Accept" button at the end of this page, you indicate that
-you accept the terms of this Agreement. You may then
-download the file.
-
-
-This is a legal agreement between you, as an authorized representative
-of your employer (together "you"), and Freescale Semiconductor, Inc.
-("Freescale") and its Affiliates. It concerns your rights to use this
-software and any accompanying written documentation (the "Licensed
-Software").  In consideration for Freescale allowing you to access
-the Licensed Software, you are agreeing to be bound by the terms of
-this Agreement. If you do not agree to all of the terms of this
-Agreement, do not download the Licensed Software. If at any point
-you no longer agree to all the terms of this Agreement, stop using
-the Licensed Software immediately and delete all copies of the
-Licensed Software in your possession or control. Any copies of the
-Licensed Software that you have already distributed, where permitted,
-and that have not been destroyed, will continue to be governed by
-this Agreement. Your prior use of the Licensed Software will also
+This is a legal agreement between you, as an authorized representative of your
+employer, or if you have no employer, as an individual (together "you"), and
+Freescale Semiconductor, Inc. ("Freescale") and its Affiliates.  It concerns
+your rights to use the software identified in the Software Content Register
+and provided to you in binary or source code form and any accompanying written
+materials (the "Licensed Software"). The Licensed Software may include any
+updates or error corrections or documentation relating to the Licensed Software
+provided to you by Freescale under this License. In consideration for Freescale
+allowing you to access the Licensed Software, you are agreeing to be bound by
+the terms of this Agreement. If you do not agree to all of the terms of this
+Agreement, do not download or install the Licensed Software. If you change your
+mind later, stop using the Licensed Software and delete all copies of the
+Licensed Software in your possession or control. Any copies of the Licensed
+Software that you have already distributed, where permitted, and do not destroy
+will continue to be governed by this Agreement. Your prior use will also
 continue to be governed by this Agreement.
 
-Section 1.                Definitions
+1.       DEFINITIONS
+
+1.1.             "Affiliates" means, any corporation, or entity directly or
+indirectly controlled by, controlling, or under common control with Freescale.
+
+1.2.             "Essential Patent" means a patent to the limited extent that
+infringement of such patent cannot be avoided in remaining compliant with the
+technology standards implicated by the usage of any of the Licensed Software,
+including optional implementation of the standards, on technical but not
+commercial grounds, taking into account normal technical practice and the state
+of the art generally available at the time of standardization.
+
+1.3.             "Intellectual Property Rights" means any and all rights under
+statute, common law or equity in and under copyrights, trade secrets, and
+patents (including utility models), and analogous rights throughout the world,
+including any applications for and the right to apply for, any of the
+foregoing.
+
+1.4.             "Software Content Register" means the documentation
+accompanying the Licensed Software which identifies the contents of the
+Licensed Software, including but not limited to identification of any Third
+Party Software.
+
+1.5.             "Third Party Software" means, any software included in the
+Licensed Software that is not Freescale Proprietary software, and is not open
+source software, and to which different license terms may apply.
+
+2.       LICENSE GRANT.
+
+2.1.             Separate license grants to Third Party Software, or other
+terms applicable to the Licensed Software if different from those granted in
+this Section 2, are contained in Appendix A.  The Licensed Software is
+accompanied by a Software Content Register which will identify that portion of
+the Licensed Software, if any, that is subject to the different terms in
+Appendix A.
+
+2.2.             Exclusively in connection with your development and
+distribution of product containing a programmable processing unit (e.g. a
+microprocessor, microcontroller, or digital signal processor) supplied directly
+or indirectly from Freescale ("Authorized System") Freescale grants you a
+world-wide, personal, non-transferable, non-exclusive, non-sublicensable,
+license, under Freescale's Intellectual Property Rights:
+
+(a)    to use and reproduce  the Licensed Software only as part of, or
+integrated within, Authorized Systems and not on a standalone basis;
+
+(b)   to directly or indirectly manufacture, demonstrate, copy, distribute,
+market and sell the Licensed Software in object code (machine readable) only as
+part of, or embedded within, Authorized Systems in object code form and not on
+a standalone basis.  Notwithstanding the foregoing, those files marked as .h
+files ("Header files") may be distributed in source or object code form, but
+only as part of, or embedded within Authorized Systems.
+
+(c)     to copy, use and distribute as needed, solely in connection with an
+Authorized System, proprietary Freescale information associated with the
+Licensed Software for the purpose of developing, maintaining and supporting
+Authorized Systems with which the Licensed Software is integrated or
+associated.
+
+2.3.             For Freescale Licensed Software provided to you in source code
+form (human readable), Freescale further grants to you a worldwide, personal,
+non-transferable, non-exclusive, non-sublicensable, license, under Freescale's
+Intellectual Property Rights:
 
-1.1       "Affiliate" means, any corporation, or entity directly or
-indirectly controlled by, controlling, or under common control with
-Freescale.
+(a)    to prepare derivative works of the Licensed Software, only as part of,
+or integrated within, Authorized Systems and not on a standalone basis,;
 
-1.2      "Authorized Employees" means your employees or contractors
-working at your premises on your behalf under a work for hire agreement.
+(b)     to use, demonstrate, copy, distribute, market and sell the derivative
+works of the Licensed Software in object code (machine readable) only as part
+of, or integrated within, Authorized Systems and not on a standalone basis.
+Notwithstanding the foregoing, those files marked as .h files ("Header files")
+may be distributed in source or object code form, but only as part of, or
+embedded within Authorized Systems.
 
-1.3      "Authorized System" means the hardware system(s) or software
-program(s) marketed by you which contains an i.MX processor and for
-which the Licensed Software will be adapted by Licensee pursuant to
-this Agreement and with which the Licensed Software will be integrated.
+2.4.             You may use subcontractors on your premises to exercise your
+rights under Section 2.2 and 2.3 so long as you have an agreement in place with
+the subcontractor containing confidentiality restrictions no less stringent
+than those contained in this Agreement.  You will remain liable for your
+subcontractors' adherence to the terms of this Agreement and for any and all
+acts and omissions of such subcontractors with respect to this Agreement and
+the Licensed Software.
 
-1.4      "Essential Patent" means a patent to the limited extent that
-infringement of such patent cannot be avoided in remaining compliant
-with the technology standards implicated by the usage of any of the
-Licensed Software, including optional implementation of such standards,
-on technical but not commercial grounds, taking into account normal
-technical practice and the state of the art generally available at
-the time of standardization.
+3.       LICENSE LIMITATIONS AND RESTRICTIONS.
 
-1.5      "Intellectual Property Rights" means any and all rights under
-statute, common law or equity in and under copyrights, trade secrets,
-and patents (including utility models), and analogous rights throughout
-the world,  including any applications for and the right to apply for,
-any of the foregoing.
+3.1.             The licenses granted above in Section 2.3 only extend to
+Freescale intellectual property rights that would be infringed by the Licensed
+Software prior to your preparation of any derivative work.
 
-1.6      "Licensed Software" means the software and the associated
-documentation.
+3.2.             The Licensed Software is licensed to you, not sold.  Title to
+Licensed Software delivered hereunder remains vested in Freescale or
+Freescale's licensor and cannot be assigned or transferred.  You are expressly
+forbidden from selling or otherwise distributing the Licensed Software, or any
+portion thereof, except as expressly permitted herein.  This Agreement does not
+grant to you any implied rights under any Freescale or third party intellectual
+property.
+
+3.3.             You may not translate, reverse engineer, decompile, or
+disassemble the Licensed Software except to the extent applicable law
+specifically prohibits such restriction.  You must prohibit your sub-licensees
+from translating, reverse engineering, decompiling, or disassembling the
+Licensed Software except to the extent applicable law specifically prohibits
+such restriction.
+
+3.4.             You must reproduce any and all of Freescale's (or its third
+party licensor's) copyright notices and other proprietary legends on copies of
+Licensed Software.
+
+3.5.             If you distribute the Licensed Software to the United States
+Government, then the Licensed Software is "restricted computer software" and
+is subject to FAR 52.227-19 (c)(1) and (c)(2).
+
+3.6.             You grant to Freescale a non-exclusive, non-transferable,
+irrevocable, perpetual, worldwide, royalty-free, sub-licensable license under
+your Intellectual Property Rights to use without restriction and for any
+purpose any suggestion, comment or other feedback related to the Licensed
+Software (including, but not limited to, error corrections and bug fixes).
+
+3.7.             You will not take or fail to take any action that could
+subject the Licensed Software to an Excluded License. An Excluded License means
+any license that requires, as a condition of use, modification or distribution
+of software subject to the Excluded License, that such software or other
+software combined and/or distributed with the software be (i) disclosed or
+distributed in source code form; (ii) licensed for the purpose of making
+derivative works; or (iii) redistributable at no charge.
+
+3.8.             You may not publish or distribute information, results or data
+associated with the use of the Licensed Software to anyone other than
+Freescale; however you must advise Freescale of any results obtained including
+any problems or suggested improvements thereof.  Freescale retains the right to
+use such results and related information in any manner it deems appropriate.
+
+4.       OPEN SOURCE.         Open source software included in the Licensed
+Software is not licensed under the terms of this Agreement, but is instead
+licensed under the terms of the applicable open source license(s), such as the
+BSD License, Apache License or the GNU Lesser General Public License.  Your use
+of the open source software is subject to the terms of each applicable license.
+You must agree to the terms of each applicable license, or you cannot use the
+open source software.
+
+5.       INTELLECTUAL PROPERTY RIGHTS.    Subject to Freescale's ownership
+interest in the underlying Licensed Software, all intellectual property rights
+associated with, and title to, your Authorized System will be retained by or
+will vest in you. Your modifications to the Licensed Software, and all
+intellectual property rights associated with, and title thereto, will be the
+property of Freescale.  Upon request, you must provide Freescale the source
+code of any derivative of the Licensed Software.  You agree to assign all,
+and hereby do assign all rights, title, and interest to any such modifications
+to the Licensed Software to Freescale and agree to provide all assistance
+reasonably requested by Freescale to establish, preserve or enforce such right.
+Further, you agree to waive all moral rights relating to your modifications to
+the Licensed Software, including, without limitation, all rights of
+identification of authorship and all rights of approval, restriction, or
+limitation on use or subsequent modification.  Notwithstanding the foregoing,
+you will have the license rights granted in Section 2 hereto to any such
+modifications made by you or your licensees.
+
+6.       PATENT COVENANT NOT TO SUE. As partial, material consideration for the
+rights granted to you under this Agreement, you covenant not to sue or
+otherwise assert your patents against Freescale, a Freescale Affiliate or
+subsidiary, or a Freescale licensee of the Licensed Software for infringement
+of your Intellectual Property Rights by the manufacture, use, sale, offer for
+sale, importation or other disposition or promotion of the Licensed Software
+and/or any redistributed portions of the Licensed Software.
+
+7.       ESSENTIAL PATENTS.  You are solely responsible for obtaining licenses
+for any relevant Essential Patents for your use in connection with technology
+that you incorporate into the your product (whether as part of the Licensed
+Software or not).
+
+8.       TERM AND TERMINATION.   This Agreement will remain in effect unless
+terminated as provided in this Section 8.
+
+8.1.             You may terminate this Agreement immediately upon written
+notice to Freescale at the address provided below.
 
-1.7      "Agreement" means this document and the following Appendices
-which are attached hereto and included herein by reference :
+8.2.             Either party may terminate this Agreement if the other party
+is in default of any of the terms and conditions of this Agreement, and
+termination is effective if the defaulting party fails to correct such default
+within 30 days after written notice thereof by the non-defaulting party to the
+defaulting party at the address below.
+
+8.3.             Notwithstanding the foregoing, Freescale may terminate this
+Agreement immediately upon written notice if you: breach any of your
+confidentiality obligations or the license restrictions under this Agreement;
+become bankrupt, insolvent, or file a petition for bankruptcy or insolvency,
+make an assignment for the benefit of its creditors; enter proceedings for
+winding up or dissolution ;are dissolved; or are nationalized or become subject
+to the expropriation of all or substantially all of its business or assets.
+
+8.4.             Upon termination of this Agreement, all licenses granted under
+Section 2 will expire, except that any licenses extended to end-users pursuant
+to Sections 2.2(b), 2.2(c), and 2.3(b), which have been granted prior to such
+termination will survive.
+
+8.5.             After termination of this Agreement by either party and upon
+Freescale's written request, you will, at your discretion, return to the
+Freescale any confidential information including all copies thereof or furnish
+to Freescale at the address below, a statement certifying, with respect to the
+Licensed Software delivered hereunder that the original and all copies, except
+for archival copies to be used solely for dispute resolution purposes, in whole
+or in part, in any form, of the Licensed Software have been destroyed.
+
+8.6.             Notwithstanding the termination of this Agreement for any
+reason, the terms of Sections 1, 3, 5 through 25 will survive.
+
+9.                   SUPPORT.  Freescale is not obligated to provide any
+support, upgrades or new releases of the Licensed Software under this
+Agreement. If you wish, you may contact Freescale and report problems and
+provide suggestions regarding the Licensed Software. Freescale has no
+obligation to respond to such a problem report or suggestion. Freescale may
+make changes to the Licensed Software at any time, without any obligation to
+notify or provide updated versions of the Licensed Software to you.
+
+10.               NO WARRANTY.  To the maximum extent permitted by law,
+Freescale expressly disclaims any warranty for the Licensed Software.  The
+Licensed Software is provided "AS IS", without warranty of any kind, either
+express or implied, including without limitation the implied warranties of
+merchantability, fitness for a particular purpose, or non-infringement.  You
+assume the entire risk arising out of the use or performance of the licensed
+software, or any systems you design using the licensed software (if any).
+
+11.               INDEMNITY. You agree to fully defend and indemnify Freescale
+from all claims, liabilities, and costs (including reasonable attorney's fees)
+related to (1) your use (including your contractors or distributee's use, if
+permitted) of the Licensed Software or (2) your violation of the terms and
+conditions of this Agreement.
+
+12.               LIMITATION OF LIABILITY.  EXCLUDING LIABILITY FOR A BREACH
+OF SECTION 2 (LICENSE GRANTS), SECTION 3 (LICENSE LIMITATIONS AND
+RESTRICTIONS), SECTION 17 (CONFIDENTIAL INFORMATION), OR CLAIMS UNDER SECTION
+11(INDEMNITY), IN NO EVENT WILL EITHER PARTY BE LIABLE, WHETHER IN CONTRACT,
+TORT, OR OTHERWISE, FOR ANY INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL OR
+PUNITIVE DAMAGES, INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR ANY LOSS OF USE,
+LOSS OF TIME, INCONVENIENCE, COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR
+REVENUES, TO THE FULL EXTENT SUCH MAY BE DISCLAIMED BY LAW.  FREESCALE'S TOTAL
+LIABILITY FOR ALL COSTS, DAMAGES, CLAIMS, OR LOSSES WHATSOEVER ARISING OUT OF
+OR IN CONNECTION WITH THIS AGREEMENT OR PRODUCT(S) SUPPLIED UNDER THIS
+AGREEMENT IS LIMITED TO THE AGGREGATE AMOUNT PAID BY YOU TO FREESCALE IN
+CONNECTION WITH THE LICENSED SOFTWARE TO WHICH LOSSES OR DAMAGES ARE CLAIMED.
 
--                         Appendix A : Other License Grants and Rights
+13.               EXPORT RESTRICTIONS.
+
+13.1.          Licensed Software (collectively referred to as "items") is
+subject to the export control laws of the United States and other countries
+that may lawfully control the export of the Licensed Software. Furnishing
+support services with respect to Licensed Software that is controlled as
+defense or military items may also be subject to such laws.  Accordingly, you
+agree you will not transfer the Licensed Software or furnish such services
+except in compliance with the export laws of the United States and any other
+country that may lawfully control the export of the Licensed Software or the
+provision of such services.  You will indemnify and hold Freescale harmless
+from any claims, liabilities, damages, penalties, forfeitures, and associated
+costs and expenses (including attorneys' fees) that Freescale may incur due to
+your non-compliance with applicable export laws, rules, and regulations.  You
+will immediately notify Freescale of any violation of any export law, rule, or
+regulation, which may affect Freescale or relate to the activities covered
+under this Agreement.
+
+13.2.          If an export/import license, permit, or other government
+required authority (collectively referred to as "government authorization")
+is required for Freescale to transfer the Licensed Software or any other
+Freescale property under this Agreement and such government authorization to
+non-Freescale party(ies) is not approved, then Freescale is not obligated to
+proceed with the transfer until the required government authorization is
+granted.
+
+14.   GOVERNMENT CONTRACT COMPLIANCE.
+
+14.1.          If you sell Authorized Systems directly to any government or
+public entity, including U.S., state, local, foreign or international
+governments or public entities, or indirectly via a prime contractor or
+subcontractor of such governments or entities, Freescale makes no
+representations, certifications, or warranties whatsoever about compliance with
+government or public entity acquisition statutes or regulations, including,
+without limitation, statutes or regulations that may relate to pricing,
+quality, origin or content.
+
+14.2.          The Licensed Software has been developed at private expense and
+is a "Commercial Item" as defined in 48 C.F.R. Section 2.101, consisting of
+"Commercial Computer Software", and/or "Commercial Computer Software
+Documentation," as such terms are used in 48 C.F.R. Section 12.212 (or
+48 C.F.R. Section 227.7202, as applicable) and may only be licensed to or
+shared with U.S.Government end users in object code form as part of, or
+embedded within, Authorized Systems.  Any agreement pursuant to which you share
+the Licensed Software will include a provision that reiterates the limitations
+of this document and requires all sub-agreements to similarly contain such limitations.
+
+15.               SAFETY CRITICAL APPLICATIONS
+
+15.1.          In some cases, Freescale may promote certain Licensed Software
+for use in safety-related applications. Freescale's goal is to educate
+licensees so that they can design their own end-product solutions to meet
+applicable functional safety standards and requirements.  You make the
+ultimate design decisions regarding your products and are solely responsible
+for compliance with all legal, regulatory, safety, and security related
+requirements concerning your products, regardless of any information or support
+that may be provided by Freescale.  Accordingly, you will indemnify and hold
+Freescale harmless from any claims, liabilities, damages and associated costs
+and expenses (including attorneys' fees) that Freescale may incur related to
+your incorporation of any Product in a safety-critical application or system.
+
+15.2.          Only Licensed Software that Freescale has specifically
+designated as "Automotive Qualified" is intended for use in automotive,
+military, or aerospace applications or environments.  If you use Licensed
+Software that has not been designated as "Automotive Qualified" in an
+automotive, military, or aerospace application or environment, you do so at
+your own risk.
+
+15.3.          Licensed Software is not intended or authorized for any use in
+anti-personnel landmines.
+
+16.              CHOICE OF LAW; VENUE.  This Agreement will be governed by,
+construed, and enforced in accordance with the laws of the State of Texas, USA,
+without regard to conflicts of laws principles, will apply to all matters
+relating to this Agreement or the Licensed Software, and you agree that any
+litigation will be subject to the exclusive jurisdiction of the state or
+federal courts Texas, USA.  The United Nations Convention on Contracts for the
+International Sale of Goods will not apply to this document.
+
+17.               CONFIDENTIAL INFORMATION.  You must treat the Licensed
+Software as confidential information and you agree to retain the Licensed
+Software in confidence perpetually, with respect to Licensed Software in source
+code form (human readable), or for a period of five (5) years from the date of
+termination of this Agreement, with respect to all other parts of the Licensed
+Software.  During this period you may not disclose any part of the Licensed
+Software to anyone other than employees who have a need to know of the
+Licensed Software and who have executed written agreements obligating them to
+protect such Licensed Software to at least the same degree of care as in this
+Agreement.  You agree to use the same degree of care, but no less than a
+reasonable degree of care, with the Licensed Software as you do with your own
+confidential information. You may disclose Licensed Software to the extent
+required by a court or under operation of law or order provided that you
+notify Freescale of such requirement prior to disclosure, which you only
+disclose information required, and that you allow Freescale the opportunity
+to object to such court or other legal body requiring such disclosure.
+
+18.               TRADEMARKS.  You are not authorized to use any Freescale
+trademarks, brand names, or logos.
+
+19.               ENTIRE AGREEMENT.  This Agreement constitutes the entire
+agreement between you and Freescale regarding the subject matter of this
+Agreement, and supersedes all prior communications, negotiations,
+understandings, agreements or representations, either written or oral, if any.
+This Agreement may only be amended in written form, signed by you and
+Freescale.
 
+20.               SEVERABILITY.  If any provision of this Agreement is held for
+any reason to be invalid or unenforceable, then the remaining provisions of
+this Agreement will be unimpaired and, unless a modification or replacement of
+the invalid or unenforceable provision is further held to deprive you or
+Freescale of a material benefit, in which case the Agreement will immediately
+terminate, the invalid or unenforceable provision will be replaced with a
+provision that is valid and enforceable and that comes closest to the intention
+underlying the invalid or unenforceable provision.
+
+21.               NO WAIVER.  The waiver by Freescale of any breach of any
+provision of this Agreement will not operate or be construed as a waiver of
+any other or a subsequent breach of the same or a different provision.
+
+22.               AUDIT.  You will keep full, clear and accurate records with
+respect to your compliance with the limited license rights granted under this
+Agreement for three years following expiration or termination of this
+Agreement. Freescale will have the right, either itself or through an
+independent certified public accountant to examine and audit, at Freescale's
+expense, not more than once a year, and during normal business hours, all such
+records that may bear upon your compliance with the limited license rights
+granted above. You must make prompt adjustment to compensate for any errors
+and/or omissions disclosed by such examination or audit.
+
+23.               NOTICES.             All notices and communications under
+this Agreement will be made in writing, and will be effective when received
+at the following addresses:
+
+Freescale:                   Freescale Semiconductor, Inc.
+                                    6501 William Cannon West    OE62
+                                    Austin, Texas 78735
+                                    ATTN: General Counsel
+
+                You:
+			The address provided at registration will be used.
+
+24.               RELATIONSHIP OF THE PARTIES.     The parties are
+independent contractors.  Nothing in this Agreement will be construed to create
+any partnership, joint venture, or similar relationship.  Neither party is
+authorized to bind the other to any obligations with third parties.
+
+25.               SUCCESSION AND ASSIGNMENT.   This Agreement will be binding
+upon and inure to the benefit of the parties and their permitted successors and
+assigns.  Neither party may assign this Agreement, or any part of this
+Agreement, without the prior written approval of the other party, which
+approval will not be unreasonably withheld or delayed.
 
-Section 2.                Licenses
-2.1      Separate license grants and rights to Third Party Software,
-if different from those granted in this Section 2, are as identified
-on Appendix A.
 
-2.2      For Freescale Licensed Software, Freescale grants you a
-world-wide, personal, non-transferable, non-exclusive, license, under
-Freescale's Intellectual Property Rights:
+ 
 
-(a)         to use, only as part of, or integrated within, Authorized
-Systems and not on a stand alone basis, the Licensed Software;
 
-(b)         to reproduce, only as part of, or integrated within,
-Authorized Systems and not on a stand alone basis, the Licensed Software;
 
-(c)         to directly or indirectly manufacture, demonstrate, copy,
-distribute, market and sell the Licensed Software in object code
-(machine readable) only as part of, or  embedded within, Authorized
-Systems in object code form and not on a stand alone basis.
-Notwithstanding the foregoing, those files marked as .h files
-("Header files") may be distributed in source or object code form,
-but only as part of, or embedded within Authorized Systems.
+APPENDIX A
 
-(d)         to copy, use and distribute as needed, solely in connection
-with an Authorized System, the proprietary information for the purpose
-of developing, maintaining and supporting Authorized Systems with which
-the Licensed Software is integrated.
+Other License Grants and Restrictions:
 
-2.3      For Freescale Licensed Software provided to you in source code
-form (human readable), Freescale further grants to you a worldwide,
-personal, non-transferable, non-exclusive, license, under Freescale's
-Intellectual Property Rights:
+The Licensed Software may include some or all of the following software, which
+is either 1) not Freescale proprietary software or 2) Freescale proprietary
+software subject to different terms than those in the Agreement.  If the
+Software Content Register that accompanies the Licensed Software identifies any
+of the following Third Party Software or specific components of the Freescale
+Proprietary Software, the following terms apply to the extent they deviate from
+the terms in the Agreement:
 
-(a)        to prepare derivative works, only as part of, or integrated
-within, Authorized Systems and not on a stand alone basis, of the
-Licensed Software;
-
-(b)        to use, demonstrate, copy, distribute, market and sell
-derivative works of the Licensed Software in object code (machine
-readable) only as part of, or integrated within, Authorized Systems
-and not on a stand alone basis.  Notwithstanding the foregoing, those
-files marked as .h files ("Header files") may be distributed in source
-or object code form, but only as part of, or embedded within Authorized
-Systems.
-
-2.4      You may use subcontractors on your premises to exercise your
-rights under Section 2.2 and 2.3 so long as you have an agreement in
-place with the subcontractor containing confidentiality restrictions
-no less stringent than those contained in this Agreement.  You will
-remain liable for your subcontractors' adherence to the terms of this
-Agreement and for any and all acts and omissions of such subcontractors
-with respect to this Agreement and the Licensed Software.
-
-2.5      The licenses granted above in section 2.3 only extend to Freescale
-intellectual property rights that would be infringed by the Licensed
-Software prior to your preparation of any derivative work.
+Third Party Software
 
-2.6      You are solely responsible for obtaining any necessary third
-party approvals and any licenses for any necessary Essential Patents
-for their use in connection with technology that you incorporate into
-the your Authorized System (whether as part of the Licensed Software
-or not).
-
-2.7      The Licensed Software is licensed to you, not sold.  Title
-to Licensed Software delivered hereunder remains vested in Freescale
-or Freescale's licensor and cannot be assigned or transferred.  You
-are expressly forbidden from selling or otherwise distributing the
-Licensed Software, or any portion thereof, except as expressly permitted
-herein.  This Agreement does not grant to you any implied rights under
-any Freescale or third party intellectual property.
-
-2.8       You may not translate, reverse engineer, decompile, or
-disassemble the Licensed Software except to the extent applicable
-law specifically prohibits such restriction.  You must prohibit your
-sub-licensees from translating, reverse engineering, decompiling, or
-disassembling the Licensed Software except to the extent applicable
-law specifically prohibits such restriction.
-
-2.9       You must reproduce any and all of Freescale's (or its third
-party licensor's) copyright notices and other proprietary legends on
-copies of Licensed Software.
-
-2.10      If you distribute the Licensed Software to the United States
-Government, then the Licensed Software is "restricted computer software"
-and is subject to FAR 52.227-19 (c)(1) and (c)(2).
-
-2.11      You grant to Freescale a non-exclusive, non-transferable,
-irrevocable, perpetual, worldwide, royalty-free, sub-licensable license
-under your Intellectual Property Rights to use without restriction and
-for any purpose any suggestion, comment or other feedback related to
-the Licensed Software (including, but not limited to, error corrections
-and bug fixes).
-
-2.12       You will not take or fail to take any action that could
-subject the Licensed Software to an Excluded License.  An Excluded
-License means any license that requires as a condition of use,
-modification and/or distribution of software subject to the Excluded
-License, that such software or other software combined and/or distributed
-with such software be (A) disclosed or distributed in source code form;
-(B) licensed for the purpose of making derivative works; or
-(C) redistributable at no charge.
-
-
-Section 3.                Intellectual Property Rights
-
-3.1      Subject to Freescale's ownership interest in the underlying
-Licensed Software, all intellectual property rights associated with,
-and title to, your Authorized System will be retained by or will vest in you.
-
-3.2      Your modifications to the Licensed Software, and all intellectual
-property rights associated with, and title thereto, will be the property
-of Freescale.  You agree to assign all, and hereby do assign all rights,
-title, and interest to any such modifications to the Licensed Software
-to Freescale and agree to provide all assistance reasonably requested
-by Freescale to establish, preserve or enforce such right.  Further,
-you agree to waive all moral rights relating to your modifications to
-he Licensed Software, including, without limitation, any and all rights
-of identification of authorship and any and all rights of approval,
-restriction, or limitation on use or subsequent modification.
-Notwithstanding the foregoing, you will have the license rights granted
-in Section 2 hereto to any such modifications made by you or your
-licensor's.
-
-
-Section 4.                Patent Covenant not to Sue
-
-4.1      As partial, material consideration for the rights granted to
-you under this Agreement, you covenant not to sue or otherwise assert
-your patents against Freescale, a Freescale Affiliate or subsidiary,
-or a Freescale licensee of the Licensed Software for infringement of
-your Intellectual Property Rights by the manufacture, use, sale, offer
-for sale, importation or other disposition or promotion of the Licensed
-Software and/or any redistributed portions thereof.
-
-
-Section 5.                Term and Termination
-
-5.1      This Agreement will remain in effect unless terminated as
-provided herein.
-
-5.2      You may terminate this Agreement immediately upon written
-notice to Freescale at the address provided below.
+Use Restrictions
+
+Atheros
 
-5.3      Either party may terminate this Agreement if the other party
-is in default of any of the terms and conditions of this Agreement,
-and termination is effective if the defaulting party fails to correct
-such default within 30 days after written notice thereof by the
-non-defaulting party to the defaulting party at the address below.
+Use of Atheros software is limited to evaluation and demonstration only.
+Permitted distributions must be similarly limited. Further rights must be
+obtained directly from Atheros.
 
-5.4      Notwithstanding the foregoing, Freescale may terminate this
-Agreement immediately upon written notice if you:
+ATI (AMD)
 
-(a)          breach any of your confidentiality obligations or the
-license restrictions under this Agreement;
+Distribution of ATI software must be a part of, or embedded within, Authorized
+Systems that include a ATI graphics processor core.
 
-(b)           become bankrupt or insolvent, or file a petition therefore;
+Coding Technologies (Dolby Labs)
 
-(c)           make an assignment for the benefit of its creditors;
+Use of CTS software is limited to evaluation and demonstration only.  Permitted
+distributions must be similarly limited. Further rights must be obtained from
+Dolby Laboratories.
 
-(d)           enter proceedings for winding up or dissolution;
+CSR
 
-(e)           are dissolved; or
+Use of Cambridge Silicon Radio, Inc. ("CSR") software is limited to evaluation
+and demonstration only.  Permitted distributions must be similarly limited.
+Further rights must be obtained directly from CSR.
 
-(f)           are nationalized or is subject to the expropriation of all
-or substantially all of its business or assets.
+Freescale Wireless Charging Library
 
-5.5      Upon termination of this Agreement, all licenses granted under
-Section 2 will expire, except that any licenses extended to end-users
-pursuant to Sections 2.2 (c), 2.2 (d) and 2.3 (b) which have been granted
-prior to such termination will survive.
+License to the Software is limited to use in inductive coupling or wireless
+charging applications
 
-5.6      After termination of this Agreement by either party and upon
-Freescale's written request, you will, at your discretion, return to the
-Freescale any confidential information including any and all copies thereof
-or furnish to Freescale at the address below, a statement certifying, with
-respect to the Licensed Software delivered hereunder that the original and
-all copies, except for archival copies to be used solely for dispute
-resolution purposes, in whole or in part, in any form, of the Licensed
-Software have been destroyed.
-
-5.7       Notwithstanding the termination of this Agreement for any reason,
-the terms of Sections 1, 2.5 - 2.12, 3, 4, 5.6, 5.7, 7 and 8 will survive.
-
-
-Section 6.                Warranty
-
-6.1       Freescale warrants that for the 30 day period following your
-download of the Licensed Software that the Licensed Software as delivered
-is free of material defects in materials and workmanship.
-
-6.2       If Licensed Software is not as warranted, Freescale will, at its
-sole option, and as your exclusive remedy, either refund the fees associated
-with such Licensed Software, repair, or replace with the same or equivalent
-products that meet this warranty.  This warranty does not apply to Licensed
-Software that has been subjected to improper testing, assembly, mishandling,
- modification, or misuse, whether by you or by others.  This warranty will
-not be expanded, and no obligation or liability will arise, due to technical
-advice or assistance, qualification or testing data, computerized data,
-facilities or service Freescale may provide in connection with the Licensed
-Software.
-
-6.3       Freescale does not warrant that the functions contained in the
-Licensed Software will meet your requirements or that the operation of the
-Licensed Software will be uninterrupted or error free.
-
-6.4       The warranty recited in this Section 6 extends only to you.
-
-6.5       THIS WARRANTY RECITED IN THIS SECTION 6 IS IN LIEU OF ALL OTHER
-WARRANTIES, INCLUDING IMPLIED WARRANTIES OF MERCHANTABILITY, SATISFACTORY
-QUALITY OR FITNESS, AND THE WARRANTY AGAINST INFRINGEMENT SPECIFIED IN THE
-UNIFORM COMMERCIAL CODE. ALL OTHER WARRANTIES ARE EXPRESSLY DISCLAIMED TO
-THE FULL EXTENT SUCH MAY BE DISCLAIMED BY LAW.
-
-
-Section 7.                Indemnification
-
-7.1       You will defend, indemnify and hold harmless Freescale from any
-and all damages claims, liabilities, and costs (including reasonable
-attorney's fees) related to your (including contractor's and licensee's)
-use of the Licensed Software and/or (2) your (including contractor's and
-licensee's) violation of the terms and conditions of this Agreement.  You
-are excused from this obligation to the extent any such claim arises solely
-from the Licensed Software as provided by Freescale.
-
-
-Section 8.                General Provisions
-
-8.1       Amendments and Waivers.       No amendment of any provision of
-this Agreement will be valid unless stated in writing and signed by
-authorized representatives of each of the parties.  No waiver by any party
-of any default, misrepresentation or covenant herein, whether intentional
-or not, will be deemed to extend any prior or subsequent default,
-misrepresentation, or covenant hereunder or affect in any way any rights
-arising by virtue of any prior or subsequent occurrence.
-
-8.2       Choice of Law.           This Agreement will be governed by,
-construed, and enforced in accordance with the laws of the State of Texas.
-
-8.3       Confidential Information.  You will treat the Licensed Software
-as confidential information and you agree to retain the Licensed Software
-in confidence perpetually with respect to Licensed Software in source code
-form (human readable), or for a period of five (5) years from the date of
-termination of this Agreement, with respect to all other parts of the
-Licensed Software.  During this period you may not disclose any part of
-the Licensed Software to others than employees or contractors who have a
-need to know of the Licensed Software and who have executed written
-agreements obligating them to protect such Licensed Software.  You agree
-to use the same degree of care, but no less than a reasonable degree
-of care, with the Licensed Software as you do with your own confidential
-information. You may disclose Licensed Software to the extent required by
-a court or under operation of law or order provided that you notify Freescale
-of such requirement prior to disclosure, that you only disclose information
-required, and that the you allow Freescale the opportunity to object to such
-court or other legal body requiring such disclosure.
-
-8.4       Counterparts.  This Agreement may be executed in one or more
-original counterparts, all of which together will constitute one agreement,
-and facsimile signatures will have the same effect as original signatures.
-
-8.5       Entire Agreement.       This Agreement, including its attachments,
-constitutes the entire agreement between the parties regarding the subject
-matter hereof, and supersedes all prior communications, negotiations,
-understandings, agreements or representations, either written or oral,
-by or among the parties regarding such subject matter.
-
-8.6       Limitation of Liability.           EXCLUDING LIABILITY FOR A
-BREACH OF SECTION 8.3 (CONFIDENTIALITY), BREACHES OF THE LICENSE GRANTS
-IN SECTION 2, OR CLAIMS UNDER SECTION 7,  IN NO EVENT WILL EITHER PARTY
-BE LIABLE, WHETHER IN CONTRACT, TORT, OR OTHERWISE, FOR ANY INCIDENTAL,
-SPECIAL, INDIRECT, CONSEQUENTIAL OR PUNITIVE DAMAGES, INCLUDING, BUT NOT
-LIMITED TO, DAMAGES FOR ANY LOSS OF USE, LOSS OF TIME, INCONVENIENCE,
-COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR REVENUES, TO THE FULL 
-EXTENT SUCH MAY BE DISCLAIMED BY LAW.  FREESCALE'S TOTAL LIABILITY FOR
-ANY AND ALL COSTS, DAMAGES, CLAIMS, OR LOSSES WHATSOEVER ARISING OUT OF
-OR IN CONNECTION WITH THIS AGREEMENT OR PRODUCT(S) SUPPLIED UNDER THIS
-AGREEMENT IS LIMITED TO THE AGGREGATE AMOUNT PAID BY YOU TO FREESCALE IN
-CONNECTION WITH THE LICENSED SOFTWARE TO WHICH LOSSES OR DAMAGES ARE CLAIMED.
+Global Locate (Broadcom Corporation)
 
-8.7       Notices.
-All notices and  communications under this Agreement will be made in writing,
-and will be effective when received at the following addresses:
+Use of Global Locate, Inc. software is limited to evaluation and demonstration
+only.  Permitted distributions must be similarly limited.  Further rights must
+be obtained from Global Locate.
 
-     Freescale:
-          Freescale Semiconductor, Inc.
-                    6501 William Cannon Drive, West
-                    Austin, Texas 78735
-                    ATTN:  General Manager, Multimedia Applications Division
+Imagination Technologies Limited (IMG)
 
-     With a copy to:
-          Freescale Semiconductor, Inc.
-                    6501 William Cannon West    OE62
-                    Austin, Texas 78735
-                    ATTN: Law Director, Multimedia Applications Division
+If the Licensed Software includes proprietary software developed by IMG, your
+rights are limited to a non-exclusive, world-wide right and non-transferrable
+and non-sub-licensable license (i) to use and modify the Licensed Software and
+documentation and (ii) to copy and distribute the Licensed Software only in
+object code form solely for use on Freescale Rayleigh products.  If you are
+provided with the Licensed Software in source code format, you are restricted
+to accessing only those deliverables in source code format which are necessary
+for you to carry out either specific customization or porting work in
+association with Freescale's Rayleigh products or your Authorized System.
 
-     You:    The address provided at registration will be used.
+The confidentiality restrictions shall continue in force without limit in time
+notwithstanding the termination or expiration of this Agreement.
 
+Micrium
 
-Either party may change its notice information upon notice to the other party.
+uC/OS-II and uC/OS-III is provided in source form for FREE short-term
+evaluation, for educational use or for peaceful research.  If you plan or
+intend to use uC/OS-II or uC/OS-III in a commercial application/product then,
+you need to contact Micrium to properly license uC/OS-II or uC/OS-III for its
+use in your application/product.   We provide ALL the source code for your
+convenience and to help you experience uC/OS-II or uC/OS-III.  The fact that
+the source is provided does NOT mean that you can use it commercially without
+paying a licensing fee.
 
-8.8      Relationship of the Parties.     The parties are independent
-contractors. Nothing in this Agreement will be construed to create any
-partnership, joint venture, or similar relationship.  Neither party is
-authorized to bind the other to any obligations with third parties.
+Microsoft
 
-8.9      Severability.  If any provision of this Agreement is held for
-any reason to be invalid or unenforceable the remaining provisions of
-this Agreement will be unimpaired and, unless a modification or replacement
-of the invalid or unenforceable provision is further held to deprive a
-party of a material benefit, in which case the Agreement will immediately
-terminate, the invalid or unenforceable provision will be replaced with a
-provision that is valid and enforceable and that comes closest to the
-parties' intention underlying the invalid or unenforceable provision.
+If the Licensed Software includes software owned by Microsoft Corporation
+("Microsoft"), it is subject to the terms of your license with Microsoft (the
+"Microsoft Underlying Licensed Software") and as such, Freescale grants no
+license to you, beyond evaluation and demonstration in connection with Freescale
+processors, in the Microsoft Underlying Licensed Software.  You must separately
+obtain rights beyond evaluation and demonstration in connection with the
+Microsoft Underlying Licensed Software from Microsoft.
 
-8.10     Succession and Assignment.   This Agreement will be binding upon
-and inure to the benefit of the parties and their permitted successors and
-assigns.  Neither party may assign this Agreement, or any part of this
-Agreement, without the prior written approval of the other party, which
-approval will not be unreasonably withheld or delayed.
+Microsoft does not provide support services for the components provided to you
+through this Agreement.  If you have any questions or require technical
+assistance, please contact Freescale.  Microsoft Corporation is a third party
+beneficiary to this Agreement with the right to enforce the terms of this
+Agreement.  TO THE MAXIMUM EXTENT PERMITTED BY LAW, MICROSOFT AND ITS
+AFFILIATES DISCLAIM ANY WARRANTIES FOR THE MICROSOFT UNDERLYING LICENSED
+SOFTWARE.  TO THE MAXIMUM EXTENT PERMITTED BY LAW, NEITHER MICROSOFT NOR ITS
+AFFILIATES WILL BE LIABLE, WHETHER IN CONTRACT, TORT, OR OTHERWISE, FOR ANY
+DIRECT, INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL OR PUNITIVE DAMAGES,
+INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR ANY LOSS OF USE, LOSS OF TIME,
+INCONVENIENCE, COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR REVENUES, ARISING
+FROM THE FROM THE USE OF THE MICROSOFT UNDERLYING LICENSED SOFTWARE.
 
-8.11     Unauthorized Use.  The Licensed Software is not intended or
-authorized for use in anti-personnel landmines, and you agree that it
-will not be used for this purpose. Upon request from Freescale, you will
-furnish a written certification that you do not use or permit the use of
-the Licensed Software in anti-personnel landmines.  The Licensed Software
-is not intended or authorized for use in products surgically implanted
-into the body, for life support or for other products in which a product
-failure could cause personal injury or death.  If you permit the uses of
-Licensed Software for these unintended or unauthorized uses, you will
-fully indemnify, defend, and hold harmless Freescale, its Affiliates,
-subsidiaries, officers and directors, employees, and distributors from
-all liability related to such use, including attorneys' fees and costs.
-
-8.12      Export.              If, at the time or times of Freescale's
-performance hereunder, an export license is required for Freescale to
-lawfully export Licensed Software, then the issuance of the appropriate
-licenses to Freescale or its subcontractor shall constitute a condition
-precedent to Freescale's obligations hereunder. You understand and agree
-that you will not by any means or method, export, re-export, resell, ship
-or divert or cause to be exported, re-exported, resold, shipped, or
-diverted, directly or indirectly, the Licensed Software, or any Freescale
-product or technology except as permitted by and in accordance with
-the laws and regulations of the United States and, if different than
-the United States, the country from which the export or re-export originates.
-
-8.13      International Sale of Goods.  The United Nations Convention
-on Contracts for the International Sale of Goods will not apply to this
-document.
-
-8.14      Audit.  You will maintain accurate and up-to-date records
-pertaining to this Agreement and will grant Freescale or its authorized
-agent access to and copies of such records and information as requested
-by Freescale that pertain to your obligations under this Agreement.
-Such access will be granted upon reasonable advance written notice,
-and be conducted during normal business hours with minimal impact to
-your business operations, and subject to confidentiality restrictions.
-You will maintain such records for a period of at least three (3) years
-from the date of termination of this Agreement.  You must make prompt
-adjustment to compensate for any errors and/or omissions disclosed by
-such examination or audit.
+MindTree
 
+Notwithstanding the terms contained in Section 2.3 (a), if the Licensed
+Software includes proprietary software of MindTree in source code format,
+Licensee may make modifications and create derivative works only to the
+extent necessary for debugging of the Licensed Software.
 
-APPENDIX A
-Other License Grants and Rights:
+MPEG LA
 
-The Licensed Software may include some or all of the following software
-which is not Freescale proprietary software and the rights granted herein
-are limited to those rights provided below:
+Use of MPEG LA audio or video codec technology is limited to evaluation
+and demonstration only. Permitted distributions must be similarly limited.
+Further rights must be obtained directly from MPEG LA.
 
-Open Source Software.
-Open source software is not licensed under the terms of this Agreement,
-but is instead licensed under the terms of applicable open source
-license(s), such as the BSD License, Apache License or the GNU Lesser
-General Public License.  Your use of the open source software is subject
-to the terms of each applicable license.  You must agree to the terms
-of each such applicable license, or you should not use the open source
-software.
+MQX RTOS Code
 
-Vivante
+MQX RTOS source code may not be re-distributed by any FSL Licensee under
+any circumstance, even by a signed written amendment to this Agreement.
 
-If the Licensed Software includes proprietary software developed by
-Vivante, your distribution rights are restricted to providing the
-Licensed Software in object code (machine readable), and only as part of,
-or embedded within, Authorized Systems that include a Vivante Graphics
-Processing Unit.
+Opus
 
-Atheros
+Use of Opus software must be consistent with the terms of the Opus license
+which can be found at: http://www.opus-codec.org/license/
 
-If the Licensed Software includes proprietary software developed by Atheros,
-you must separately obtain rights beyond evaluation and demonstration in
-connection with the Atheros software.
+Real Networks - its GStreamer Optimized Real Format Client Code implementation
+or OpenMax Optimized Real Format Client Code
 
-Coding Technologies, acquired by Dolby Laboratories ("CTS")
+Use of the GStreamer Optimized Real Format Client Code, or OpenMax Optimized
+Real Format Client code is restricted to applications in the automotive market.
+Licensee must be a final manufacturer in good standing with a current license
+with Real Networks for the commercial use and distribution of products
+containing the GStreamer Optimized Real Format Client Code implementation or
+OpenMax Optimized Real Format Client Code
 
-If the Licensed Software includes software developed by CTS, you must
-separately obtain rights beyond evaluation and demonstration in
-connection with the CTS software from Dolby Laboratories.
+SanDisk Corporation
 
-Microsoft
-If the Licensed Software includes software owned by the Microsoft
-Corporation ("Microsoft"), it is subject to the terms of your license
-with Microsoft (the "Microsoft Underlying Software") and as such,
-Freescale grants no license to you, beyond evaluation and demonstration
-in connection with Freescale processors, in the Microsoft Underlying
-Software.  You must separately obtain rights beyond evaluation and
-demonstration in connection with the Microsoft Underlying Software
-from Microsoft.
-
-Microsoft does not provide support services for the
-components provide to you through this Agreement.  If you have any
-questions or require technical assistance, please contact Freescale.
-Microsoft Corporation is a third party beneficiary to this Agreement
-with the right to enforce the terms of this Agreement.
-
-TO THE MAXIMUM EXTENT PERMITTED BY LAW, MICROSOFT AND ITS FFILIATES
-DISCLAIM ANY WARRANTIES FOR THE MICROSOFT UNDERLYING SOFTWARE.
-TO THE MAXIMUM EXTENT PERMITTED BY LAW, NEITHER MICROSOFT NOR
-ITS AFFILIATES WILL BE LIABLE, WHETHER IN CONTRACT, TORT, OR
-OTHERWISE, FOR ANY DIRECT, INCIDENTAL, SPECIAL, INDIRECT,
-CONSEQUENTIAL OR PUNITIVE DAMAGES, INCLUDING, BUT NOT LIMITED
-TO, DAMAGES FOR ANY LOSS OF USE, LOSS OF TIME, INCONVENIENCE,
-COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR REVENUES, ARISING
-FROM THE FROM THE USE OF THE MICROSOFT UNDERLYING SOFTWARE.
-
-SanDisk Corporation Software
-
-            If the Licensed Software includes software developed
-by SanDisk Corporation ("SanDisk"), you must separately obtain
-the rights to reproduce and distribute this software in source
-code form from SanDisk.  Please follow these easy steps to obtain
-the license and software:
-
-1.         Contact your local SanDisk sales representative to obtain
-the SanDisk License Agreement.
-
-2.         Sign the license agreement.  Fax the signed agreement to
-SanDisk USA marketing department at 408-542-0403.  The license will
-be valid when fully executed by SanDisk.
-
-3.         If you have specific questions, please send an email to
+If the Licensed Software includes software developed by SanDisk Corporation
+("SanDisk"), you must separately obtain the rights to reproduce and distribute
+this software in source code form from SanDisk.  Please follow these easy steps
+to obtain the license and software:
+
+1.       Contact your local SanDisk sales representative to obtain the SanDisk
+License Agreement.
+
+2.       Sign the license agreement.  Fax the signed agreement to SanDisk USA
+marketing department at 408-542-0403.  The license will be valid when fully
+executed by SanDisk.
+
+3.       If you have specific questions, please send an email to
 sales@sandisk.com
 
-            You may only use the SanDisk Corporation Software on
-products compatible with a SanDisk Secure Digital Card.  You may not
-use the SanDisk Corporation Software on any memory device product.
-SanDisk retains all rights to any modifications or derivative works
-to the SanDisk Corporation Software that you may create.
+You may only use the SanDisk Corporation Licensed Software on products
+compatible with a SanDisk Secure Digital Card.  You may not use the SanDisk
+Corporation Licensed Software on any memory device product.  SanDisk retains
+all rights to any modifications or derivative works to the SanDisk Corporation
+Licensed Software that you may create.
 
-Global Locate
+Texas Instruments
 
-If the Licensed Software includes software and hardware developed by
-Global Locate, Inc. ("Global Locate"), and acquired by Broadcom
-Corporation, you must separately obtain rights beyond evaluation
-and demonstration for the Global Locate software from Broadcom Corporation.
+Your use of Texas Instruments Inc. WiLink8 Licensed Software is restricted
+to Freescale SoC based systems that include a compatible connectivity device
+manufactured by TI.
 
-CSR
+Vivante
 
-If the Licensed Software includes software and hardware developed
-by Cambridge Silicon Radio, Inc. ("CSR"), you must separately obtain
-rights beyond evaluation and demonstration for the CSR software from CSR.
+Distribution of Vivante software must be a part of, or embedded within,
+Authorized Systems that include a Vivante Graphics Processing Unit.
diff --git a/SCR/imx/SCR-3.14.28-1.0.0-ga.txt b/SCR/imx/SCR-3.14.28-1.0.0-ga.txt
new file mode 100644
index 0000000..3576d72
--- /dev/null
+++ b/SCR/imx/SCR-3.14.28-1.0.0-ga.txt
@@ -0,0 +1,355 @@
+Freescale Software Content Register
+
+Release - Linux 3.14.28-1.0.0_GA
+
+Date Created:              2015-Feb-12
+
+--------------------------------------------
+BSP PACKAGES
+--------------------------------------------
+
+Package:                   linux-2.6-imx
+
+Outgoing License:          GPLv2+
+
+License Files:             COPYING: GPLv2
+
+Package Category:          BSP
+
+Type of content:           Source code
+
+Description and comments:  The Linux kernel with Freescale-specific drivers
+
+Release Location:          git.freescale.com branch imx_3.14.28_1.0.0_ga
+
+Origin:                    Freescale and kernel.org - https://www.kernel.org/
+
+--------------------------------------------
+
+Package:                   u-boot-imx
+
+Outgoing License:          GPLv2+
+
+License Files:             COPYING: GPLv2
+
+Package Category:          Bootloader
+
+Type of content:           Source code
+
+Description and comments:  Bootloader with Freescale-specific capabilities
+
+Release Location:          git.freescale.com branch imx_v2014.04_3.14.28_1.0.0_ga
+
+Origin:                    Freescale
+                           Das U-Boot - Universal Bootloader (LGPLv2+) - http://www.denx.de/wiki/U-Boot/WebHome
+                           Android Open Source Project (BSD-2-Clause) - https://source.android.com/
+                           zlib (zlib license) - http://www.zlib.net/
+
+--------------------------------------------
+
+Package:                   firmware-imx-3.14.28-1.0.0.bin
+
+Outgoing License:          LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+License Files:             COPYING: LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+Package Category:          BSP
+
+Type of content:           Binaries
+
+Description and comments:  BSP firmware - SDMA, VPU
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale and Chips and Media
+
+--------------------------------------------
+
+Package:                   imx-kobs-3.14.28-1.0.0.tar.gz
+
+Outgoing License:          GPLv2+
+
+License Files:             COPYING: GPLv2
+
+Package Category:          BSP
+
+Type of content:           Source code
+
+Description and comments:  NAND boot writer
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale
+                           AES (BSD-3-Clause) - http://brgladman.org/oldsite/AES/
+                           Secure Hash Algorithm Implementation (Public Domain) - http://www.nic.funet.fi/pub/crypt/hash/sha/
+                           IGEP Linux Kernel (GPLv2+) - http://www.igep.es/
+
+--------------------------------------------
+
+Package:                   imx-lib-3.14.28-1.0.0.tar.gz
+
+Outgoing License:          LGPLv2.1+
+
+License Files:             See source code.
+
+Package Category:          BSP
+
+Type of content:           Source code
+
+Description and comments:  BSP libraries
+ls
+Release Location:          Freescale mirror
+
+Origin:                    Freescale
+
+--------------------------------------------
+
+Package:                   imx-test-3.14.28-1.0.0.tar.gz
+
+Outgoing License:          Each test has its own license
+
+License Files:             See source code.
+
+Package Category:          BSP
+
+Type of content:           Source code
+
+Description and comments:  Linux unit test applications
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale
+                           Linux Test Project (GPLv2+) - https://github.com/linux-test-project/ltp
+                           Chips and Media Resource (GPL2+)
+                           RTC Test in Linux Kernel (GPLv2+)
+                           BlueZ (GPLv2+) - http://www.bluez.org/
+                           Embedded Alley v4l2 test (GPLv2+)
+                           Android Open Source Project (BSD-2-Clause) - https://source.android.com/
+                           Hantro Memalloc in Linux (GPLv2+)
+                           Linux driver for Atheros AR5210 802.11a (GPLv2+) - http://sourceforge.net/projects/ar5k/
+                           Hannu Savolainen's soundcard.h (BSD 2-clause)
+
+--------------------------------------------
+
+Package:                   imx-vpu-5.4.28.bin
+
+Outgoing License:          LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+License Files:             COPYING: LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+Package Category:          BSP
+
+Type of content:           Source code
+
+Description and comments:  VPU library
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale and Chips and Media
+
+--------------------------------------------
+GRAPHICS PACKAGES
+--------------------------------------------
+
+Package:                   imx-gpu-viv-5.0.11.p4.4.bin
+
+Outgoing License:          LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+License Files:             COPYING: LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+Package Category:          Graphics
+
+Type of content:           Binaries, scripts and header files
+
+Description and comments:  GPU Core IP in binary and test application source
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale and Vivante
+                           Khronos Group (MIT) - http://www.khronos.org/opencl/
+                           Mesa3D - Mesa Lib (GL3ext header) (SGI Free Software License B v2.0) - http://mesa3d.sourceforge.net/
+
+--------------------------------------------
+
+Package:                   imx-gpu-viv-kernel-5.0.11.p4.4.tar.gz
+
+Outgoing License:          GPLv2+
+
+License Files:             See source code.
+
+Package Category:          Graphics
+
+Type of content:           Source code
+
+Description and comments:  GPU kernel source provided for kernel loadable modules
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale and Vivante Corp.
+
+--------------------------------------------
+
+Package:                   xserver-xorg-video-imx-viv-5.0.11.p4.4.tar.gz
+
+Outgoing License:          GPLv2+
+
+License Files:             See source code.
+
+Package Category:          Graphics
+
+Type of content:           Source code
+
+Description and comments:  Xserver Library extensions
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale and Vivante Corp.
+                           xorg-server (MIT) - http://xorg.freedesktop.org/
+                           XFree86 Project (XFree86 License v1.0) - http://sourceforge.net/projects/xfree86/
+                           xf86-video-freedreno (MIT) - http://github.com/freedreno/xf86-video-freedreno/
+
+--------------------------------------------
+
+Package:                   fsl-gpu-sdk-2.0.1.bin
+
+Outgoing License:          Apache 2.0
+
+License Files:             COPYING: Apache license
+
+Package Category:          Graphics
+
+Type of content:           Source code
+
+Description and comments:  Graphics sample applications
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale
+                           Templatized C++ Command Line Parser (tclap) (MIT) - http://sourceforge.net/projects/tclap/
+                           Opengles book samples (MIT) - http://github.com/zemanel/opengles-book-samples/
+                           XFree86 (XFree86 License v 1.0) - http://www.xfree86.org/
+                           Wayland (Seetex License) - http://cgit.freedesktop.org/~krh/wayland/
+
+--------------------------------------------
+MULTIMEDIA PACKAGES
+--------------------------------------------
+
+Package:                   gst1.0-fsl-plugins-4.0.3.tar.gz
+
+Outgoing License:          LGPLv2.1+
+
+License Files:             COPYING (GPLv2)
+                           COPYING-LGPL-2
+                           COPYING-LGPL-2.1
+
+Package Category:          Multimedia
+
+Type of content:           Source code
+
+Description and comments:  Freescale Gstreamer 1.0 plugins
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale
+                           Gstreamer plugins-Base (LGPLv2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/
+                           Gstreamer plugins-Good (LGPLv2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/
+                           Gstreamer plugins-Bad (LGPLv2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-bad/
+
+--------------------------------------------
+
+Package:                   gst-fsl-plugins-4.0.3.tar.gz
+
+Outgoing License:          LGPLv2.1+
+
+License Files:             COPYING (GPLv2)
+                           COPYING-LGPL-2
+                           COPYING-LGPL-2.1
+
+Package Category:          Multimedia
+
+Type of content:           Source code
+
+Description and comments:  Freescale Gstreamer 0.1 plugins
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale
+                           Gstreamer plugins-Base (LGPLv2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/
+                           Gstreamer plugins-Good (LGPLv2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/
+                           Gstreamer plugins-Bad (LGPLv2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-bad/
+                           mingw-runtime tchar.h (public domain) - http://www.mingw.org/
+
+--------------------------------------------
+
+Package:                   libfslcodec-4.0.3.bin
+
+Outgoing License:          LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+License Files:             COPYING: LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+Package Category:          Multimedia
+
+Type of content:           Binaries and header files
+
+Description and comments:  Freescale multimedia codec libraries
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale
+
+--------------------------------------------
+
+Package:                   libfslparser-4.0.3.bin
+
+Outgoing License:          LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+License Files:             COPYING: LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+Package Category:          Multimedia
+
+Type of content:           Binaries and header files
+
+Description and comments:  Freescale multimedia parser libraries
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale
+
+--------------------------------------------
+
+Package:                   libfslvpuwrap-1.0.58.bin
+
+Outgoing License:          LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+License Files:             COPYING: LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+Package Category:          Multimedia
+
+Type of content:           Source code
+
+Description and comments:  Freescale VPU wrapper library
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale
+                           sqlite (Public Domain) - http://www.hwaci.com/sw/sqlite/index.html
+
+--------------------------------------------
+
+Package:                   fslqtapplications-1.0.1.bin
+
+Outgoing License:          LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+License Files:             COPYING: LA_OPT_FSL_OPEN_3RD_PARTY_IP v6 February 2015
+
+Package Category:          Multimedia
+
+Type of content:           Binaries
+
+Description and comments:  i.MX QT multimedia player application
+
+Release Location:          Freescale mirror
+
+Origin:                    Freescale
+
+--------------------------------------------
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [meta-fsl-arm][PATCH v2 09/12] imx-gpu-viv: Upgrade to 5.0.11.p4.4 from 3.14.28-1.0.0 GA release
  2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 09/12] imx-gpu-viv: Upgrade to 5.0.11.p4.4 from 3.14.28-1.0.0 GA release Otavio Salvador
@ 2015-04-07  0:08   ` Otavio Salvador
  2015-04-07  0:42     ` Neena Busireddy
  0 siblings, 1 reply; 16+ messages in thread
From: Otavio Salvador @ 2015-04-07  0:08 UTC (permalink / raw)
  To: meta-freescale Mailing List

Hello Lauren,
Hello Neena,

On Mon, Apr 6, 2015 at 3:12 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:
> From: Lauren Post <lauren.post@freescale.com>
>
> Remove pc files now they are part of imx-gpu-viv package
> Fix api trace installation
>
> Change-Id: I95b35b73a249b3e80b7437f3d516e19bc3e1242c
> Signed-off-by: Lauren Post <lauren.post@freescale.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

I got following error under our autobuilder:

framebuffer fsl-image-machine-test@imx6qsabresd (4/7) Log data follows:
framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | DEBUG:
Executing shell function do_install
framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | rm: cannot
remove `.../build-framebuffer/tmp/work/cortexa9hf-vfp-neon-mx6qdl-poky-linux-gnueabi/imx-gpu-viv/1_5.0.11.p4.4-hfp-r0/image/usr/bin/glretrace':
No such file or directory
framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | WARNING: exit
code 1 from a shell command.
framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | ERROR:
Function failed: do_install (log file is located at
.../build-framebuffer/tmp/work/cortexa9hf-vfp-neon-mx6qdl-poky-linux-gnueabi/imx-gpu-viv/1_5.0.11.p4.4-hfp-r0/temp/log.do_install.26744)
framebuffer fsl-image-machine-test@imx6qsabresd (4/7) recipe
imx-gpu-viv-1_5.0.11.p4.4-hfp-r0: task do_install: Failed
framebuffer fsl-image-machine-test@imx6qsabresd (4/7) ERROR: Task 1452
(.../sources/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-hfp.bb,
do_install) failed with exit code '1'

This is the v2 patch, which is in master-next.

Do you have any idea why it is failing?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [meta-fsl-arm][PATCH v2 09/12] imx-gpu-viv: Upgrade to 5.0.11.p4.4 from 3.14.28-1.0.0 GA release
  2015-04-07  0:08   ` Otavio Salvador
@ 2015-04-07  0:42     ` Neena Busireddy
  2015-04-07 12:51       ` Otavio Salvador
  0 siblings, 1 reply; 16+ messages in thread
From: Neena Busireddy @ 2015-04-07  0:42 UTC (permalink / raw)
  To: Otavio Salvador, meta-freescale Mailing List

Hi Otavio,

On Mon, Apr 6, 2015 at 3:12 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:
> From: Lauren Post <lauren.post@freescale.com>
>
> Remove pc files now they are part of imx-gpu-viv package Fix api trace 
> installation
>
> Change-Id: I95b35b73a249b3e80b7437f3d516e19bc3e1242c
> Signed-off-by: Lauren Post <lauren.post@freescale.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

I got following error under our autobuilder:

framebuffer fsl-image-machine-test@imx6qsabresd (4/7) Log data follows:
framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | DEBUG:
Executing shell function do_install
framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | rm: cannot remove `.../build-framebuffer/tmp/work/cortexa9hf-vfp-neon-mx6qdl-poky-linux-gnueabi/imx-gpu-viv/1_5.0.11.p4.4-hfp-r0/image/usr/bin/glretrace':
No such file or directory
framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | WARNING: exit code 1 from a shell command.
framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | ERROR:
Function failed: do_install (log file is located at
.../build-framebuffer/tmp/work/cortexa9hf-vfp-neon-mx6qdl-poky-linux-gnueabi/imx-gpu-viv/1_5.0.11.p4.4-hfp-r0/temp/log.do_install.26744)
framebuffer fsl-image-machine-test@imx6qsabresd (4/7) recipe
imx-gpu-viv-1_5.0.11.p4.4-hfp-r0: task do_install: Failed framebuffer fsl-image-machine-test@imx6qsabresd (4/7) ERROR: Task 1452 (.../sources/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-hfp.bb,
do_install) failed with exit code '1'

This is the v2 patch, which is in master-next.

Do you have any idea why it is failing?

I know why this is failing. It is because of the following lines:

# skip packaging X11 specific tools if no X11 support is requested
if [ "${USE_X11}" = "no" ]; then
rm ${D}${bindir}/glretrace
rm ${D}${bindir}/eglretrace
fi

Apitrace is supported for all the backends now. So, the above lines can be removed.


Thanks,
Neena

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [meta-fsl-arm][PATCH v2 09/12] imx-gpu-viv: Upgrade to 5.0.11.p4.4 from 3.14.28-1.0.0 GA release
  2015-04-07  0:42     ` Neena Busireddy
@ 2015-04-07 12:51       ` Otavio Salvador
  0 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2015-04-07 12:51 UTC (permalink / raw)
  To: Neena Busireddy; +Cc: meta-freescale Mailing List

Hello Neena,

On Mon, Apr 6, 2015 at 9:42 PM, Neena Busireddy
<neena.busireddy@freescale.com> wrote:
> On Mon, Apr 6, 2015 at 3:12 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:
>> From: Lauren Post <lauren.post@freescale.com>
>> Remove pc files now they are part of imx-gpu-viv package Fix api trace
>> installation
>>
>> Change-Id: I95b35b73a249b3e80b7437f3d516e19bc3e1242c
>> Signed-off-by: Lauren Post <lauren.post@freescale.com>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> I got following error under our autobuilder:
>
> framebuffer fsl-image-machine-test@imx6qsabresd (4/7) Log data follows:
> framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | DEBUG:
> Executing shell function do_install
> framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | rm: cannot remove `.../build-framebuffer/tmp/work/cortexa9hf-vfp-neon-mx6qdl-poky-linux-gnueabi/imx-gpu-viv/1_5.0.11.p4.4-hfp-r0/image/usr/bin/glretrace':
> No such file or directory
> framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | WARNING: exit code 1 from a shell command.
> framebuffer fsl-image-machine-test@imx6qsabresd (4/7) | ERROR:
> Function failed: do_install (log file is located at
> .../build-framebuffer/tmp/work/cortexa9hf-vfp-neon-mx6qdl-poky-linux-gnueabi/imx-gpu-viv/1_5.0.11.p4.4-hfp-r0/temp/log.do_install.26744)
> framebuffer fsl-image-machine-test@imx6qsabresd (4/7) recipe
> imx-gpu-viv-1_5.0.11.p4.4-hfp-r0: task do_install: Failed framebuffer fsl-image-machine-test@imx6qsabresd (4/7) ERROR: Task 1452 (.../sources/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-hfp.bb,
> do_install) failed with exit code '1'
>
> This is the v2 patch, which is in master-next.
>
> Do you have any idea why it is failing?
>
> I know why this is failing. It is because of the following lines:
>
> # skip packaging X11 specific tools if no X11 support is requested
> if [ "${USE_X11}" = "no" ]; then
> rm ${D}${bindir}/glretrace
> rm ${D}${bindir}/eglretrace
> fi
>
> Apitrace is supported for all the backends now. So, the above lines can be removed.

It makes sense. I confirmed in v1[1] and this has not been change there as well.

1. http://patchwork.openembedded.org/patch/91211/

I did the change and have put it in the master-next for test again.

Thanks for your help ironing this out.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750


^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2015-04-07 12:51 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-06 18:12 [meta-fsl-arm][PATCH v2 00/12] Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 01/12] linux-imx: Upgrade to 3.14.28-1.0.0 GA version Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 02/12] u-boot-imx: Upgrade to 3.14.28-1.0.0 GA release Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 03/12] imx6sxsabresd: Add imx6sx-sdb-ldo.dtb DeviceTree Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 04/12] firmware-imx: Upgrade to 3.14.28-1.0.0 release Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 05/12] firmware-imx: Fix PE syntax to follow code style Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 06/12] imx-kobs: Upgrade to 3.14.28-1.0.0 version Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 07/12] imx-vpu: Upgrade 5.4.27 to 5.4.28 version Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 08/12] imx-test: Upgrade to version 3.14.28-1.0.0 GA Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 09/12] imx-gpu-viv: Upgrade to 5.0.11.p4.4 from 3.14.28-1.0.0 GA release Otavio Salvador
2015-04-07  0:08   ` Otavio Salvador
2015-04-07  0:42     ` Neena Busireddy
2015-04-07 12:51       ` Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 10/12] xf86-video-imxfb-vivante: Upgrade to 5.0.11.p4.4 version Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 11/12] opencv: Add i.MX6SoloX support Otavio Salvador
2015-04-06 18:12 ` [meta-fsl-arm][PATCH v2 12/12] EULA: Update to new license LA_OPT_FSL_OPEN_3RD_PARTY_IP Otavio Salvador

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.