3.14.52-1.1.0 BSP and Multimedia patch set

deleted file mode 100644
index 47f13c7..0000000
@@ -1,48 +0,0 @@
-From aeea3592a13bf12861943e44fc48f1f270941f8d Mon Sep 17 00:00:00 2001
-From: Behan Webster <[email protected]>
-Date: Wed, 24 Sep 2014 01:06:46 +0100
-Subject: ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
-
-With compilers which follow the C99 standard (like modern versions of gcc and
-clang), "extern inline" does the wrong thing (emits code for an externally
-linkable version of the inline function). In this case using static inline
-and removing the NULL version of return_address in return_address.c does
-the right thing.
-
-Signed-off-by: Behan Webster <[email protected]>
-Reviewed-by: Mark Charlebois <[email protected]>
-Acked-by: Steven Rostedt <[email protected]>
-Signed-off-by: Russell King <[email protected]>
-
-diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
-index 39eb16b..bfe2a2f 100644
---- a/arch/arm/include/asm/ftrace.h
-+++ b/arch/arm/include/asm/ftrace.h
-@@ -45,7 +45,7 @@ void *return_address(unsigned int);
- 
- #else
- 
--extern inline void *return_address(unsigned int level)
-+static inline void *return_address(unsigned int level)
- {
- 	return NULL;
- }
-diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
-index fafedd8..f6aa84d 100644
---- a/arch/arm/kernel/return_address.c
-+++ b/arch/arm/kernel/return_address.c
-@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
- #warning "TODO: return_address should use unwind tables"
- #endif
- 
--void *return_address(unsigned int level)
--{
--	return NULL;
--}
--
- #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
- 
- EXPORT_SYMBOL_GPL(return_address);
--- 
-cgit v0.10.2
-

59 lines not on this page · raw message

similarity index 100%
rename from recipes-kernel/linux/linux-imx-3.14.38/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
rename to recipes-kernel/linux/linux-imx-3.14.52/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch

similarity index 100%
rename from recipes-kernel/linux/linux-imx-3.14.38/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch
rename to recipes-kernel/linux/linux-imx-3.14.52/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch

similarity index 94%
rename from recipes-kernel/linux/linux-imx-3.14.38/imx/defconfig
rename to recipes-kernel/linux/linux-imx-3.14.52/imx/defconfig
index dd9f739..e3315f3 100644
@@ -80,7 +80,6 @@ CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=y
 CONFIG_BT_HCIBTUSB=y
-CONFIG_BT_HCIBTSDIO=y
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y

@@ -117,6 +116,8 @@ CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_SENSORS_FXOS8700=y
+CONFIG_SENSORS_FXAS2100X=y
 CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_AT25=y
 # CONFIG_SCSI_PROC_FS is not set

@@ -145,33 +146,38 @@ CONFIG_SMC91X=y
 CONFIG_SMC911X=y
 CONFIG_SMSC911X=y
 # CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_MICREL_PHY=y
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_CDC_EEM=m
-CONFIG_ATH_CARDS=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_BRCMFMAC=m
+CONFIG_BCMDHD=m
+CONFIG_BCMDHD_SDIO=y
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/fw_bcmdhd.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/bcmdhd.cal"
+# CONFIG_RTL_CARDS is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_EVBUG=m
 CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_SNVS_PWRKEY=y
 CONFIG_KEYBOARD_IMX=y
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_TOUCHSCREEN_EGALAX=y
 CONFIG_TOUCHSCREEN_ELAN=y
 CONFIG_TOUCHSCREEN_MAX11801=y
+CONFIG_TOUCHSCREEN_IMX6UL_TSC=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_INPUT_MPL3115=y
+CONFIG_SENSOR_FXLS8471=y
 CONFIG_SERIO_SERPORT=m
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set

@@ -194,7 +200,6 @@ CONFIG_GPIO_MAX732X=y
 CONFIG_GPIO_74X164=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

@@ -213,6 +218,7 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_ANATOP=y
 CONFIG_REGULATOR_DA9052=y
+CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_MAX17135=y
 CONFIG_REGULATOR_MC13783=y
 CONFIG_REGULATOR_MC13892=y

@@ -237,6 +243,8 @@ CONFIG_VIDEO_MXC_IPU_OUTPUT=y
 CONFIG_VIDEO_MXC_PXP_V4L2=y
 CONFIG_VIDEO_MXC_CSI_CAMERA=m
 CONFIG_MXC_VADC=m
+CONFIG_MXC_MIPI_CSI=m
+CONFIG_MXC_CAMERA_OV5647_MIPI=m
 CONFIG_SOC_CAMERA=y
 CONFIG_VIDEO_MX3=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y

@@ -256,6 +264,7 @@ CONFIG_BACKLIGHT_PWM=y
 CONFIG_FB_MXC_SYNC_PANEL=y
 CONFIG_FB_MXC_LDB=y
 CONFIG_FB_MXC_MIPI_DSI=y
+CONFIG_FB_MXC_MIPI_DSI_SAMSUNG=y
 CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
 CONFIG_FB_MXC_HDMI=y
 CONFIG_FB_MXC_EINK_PANEL=y

@@ -284,9 +293,11 @@ CONFIG_SND_SOC_IMX_MC13783=y
 CONFIG_SND_SOC_IMX_HDMI=y
 CONFIG_SND_SOC_IMX_SI476X=y
 CONFIG_USB=y
+CONFIG_USB_OTG_WHITELIST=y
 CONFIG_USB_OTG_FSM=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_HCD_TEST_MODE=y
 CONFIG_USB_ACM=m
 CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y

@@ -296,7 +307,7 @@ 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_USB_EHSET_TEST_FIXTURE=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y

@@ -327,7 +338,6 @@ CONFIG_MXC_IPU=y
 CONFIG_MXC_GPU_VIV=y
 CONFIG_MXC_IPU_V3_PRE=y
 CONFIG_MXC_MIPI_CSI2=y
-CONFIG_MXC_MLB150=m
 CONFIG_MXC_SIM=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y

similarity index 100%
rename from recipes-kernel/linux/linux-imx-mfgtool_3.14.38.bb
rename to recipes-kernel/linux/linux-imx-mfgtool_3.14.52.bb

43 lines not on this page · raw message

new file mode 100644
index 0000000..bd54de2
@@ -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.52_1.1.0_ga"
+LOCALVERSION = "-1.1.0_ga"
+SRCREV = "5f6f0a50e6039370078369ddf380179d59024789"
+
+SRC_URI += " \
+    file://0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch \
+"
+
+DEFAULT_PREFERENCE = "1"
+
+COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"

index da3ee54..d3d2e53 100644
@@ -9,7 +9,7 @@ require conf/machine/include/imx6sabresd-common.inc
 SOC_FAMILY = "mx6:mx6dl"
 
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
-                     imx6dl-sabresd-pf200.dtb imx6dl-sabresd-enetirq.dtb"
+                     imx6dl-sabresd-pf200.dtb imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6dlsabresd_config,sdcard"

index d3d2e53..c13af2f 100644
@@ -13,4 +13,7 @@ KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hd
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6dlsabresd_config,sdcard"
+UBOOT_CONFIG[epdc] = "mx6dlsabresd_epdc_config"
 UBOOT_CONFIG[mfgtool] = "mx6dlsabresd_config"
+
+MACHINE_FIRMWARE += "firmware-imx-epdc"

index 72d1da5..b238390 100644
@@ -9,7 +9,7 @@ require conf/machine/include/imx6sabresd-common.inc
 SOC_FAMILY = "mx6:mx6q"
 
 KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
-                     imx6q-sabresd-enetirq.dtb imx6q-sabresd-uart.dtb"
+                     imx6q-sabresd-enetirq.dtb "
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6qsabresd_config,sdcard"

index b238390..8115dfa 100644
@@ -9,7 +9,7 @@ require conf/machine/include/imx6sabresd-common.inc
 SOC_FAMILY = "mx6:mx6q"
 
 KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
-                     imx6q-sabresd-enetirq.dtb "
+                     imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6qsabresd_config,sdcard"

index 9ca5735..29144f3 100644
@@ -14,6 +14,7 @@ KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard"
+UBOOT_CONFIG[epdc] = "mx6slevk_epdc_config"
 UBOOT_CONFIG[spinor] = "mx6slevk_spinor_config"
 UBOOT_CONFIG[mfgtool] = "mx6slevk_config"
 

@@ -21,4 +22,4 @@ SERIAL_CONSOLE = "115200 ttymxc0"
 
 MACHINE_FEATURES += " pci wifi bluetooth"
 
-MACHINE_FIRMWARE += "linux-firmware-ath6k"
+MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc"

index 29144f3..ec01992 100644
@@ -10,7 +10,7 @@ include conf/machine/include/tune-cortexa9.inc
 SOC_FAMILY = "mx6:mx6sl"
 
 KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \
-                     imx6sl-evk-pf200.dtb imx6sl-evk-uart.dtb"
+                     imx6sl-evk-pf200.dtb imx6sl-evk-uart.dtb imx6sl-evk-btwifi.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard"

index bbd6cdc..54a9b60 100644
@@ -10,7 +10,8 @@ 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-reva-ldo.dtb imx6sx-sdb-reva.dtb"
+                     imx6sx-sdb-reva-ldo.dtb imx6sx-sdb-reva.dtb \
+                     imx6sx-sdb-btwifi.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6sxsabresd_config,sdcard"

index 54a9b60..e7a2e96 100644
@@ -11,7 +11,7 @@ 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-reva-ldo.dtb imx6sx-sdb-reva.dtb \
-                     imx6sx-sdb-btwifi.dtb"
+                     imx6sx-sdb-btwifi.dtb imx6sx-sdb-mqs.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6sxsabresd_config,sdcard"

index 1a60c6a..c65ee6e 100644
@@ -11,7 +11,7 @@ MACHINE_FEATURES += " pci wifi bluetooth"
 
 SOC_FAMILY = "mx6ul"
 
-KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb"
+KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-evk-btwifi.dtb"
 
 UBOOT_SUFFIX = "img"
 SPL_BINARY = "SPL"

index ce83553..c0a1930 100644
@@ -20,4 +20,5 @@ UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx7dsabresd_config,sdcard"
 UBOOT_CONFIG[qspi1] = "mx7dsabresd_qspi1_config"
 UBOOT_CONFIG[nand] = "mx7dsabresd_nand_config,ubifs"
+UBOOT_CONFIG[epdc] = "mx7dsabresd_epdc_config"
 UBOOT_CONFIG[mfgtool] = "mx7dsabresd_config"

new file mode 100644
index 0000000..01afc60
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6Q Plus SABRE Smart Device
+#@SOC: i.MX6QP
+#@DESCRIPTION: Machine configuration for Freescale i.MX6QP SABRE Smart Device
+#@MAINTAINER: Lauren Post <[email protected]>
+
+require conf/machine/include/imx6sabresd-common.inc
+
+SOC_FAMILY = "mx6:mx6q"
+
+KERNEL_DEVICETREE = "imx6qp-sabresd.dtb imx6qp-sabresd-ldo.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx6qpsabresd_config,sdcard"
+UBOOT_CONFIG[sata] = "mx6qpsabresd_sata_config"
+UBOOT_CONFIG[mfgtool] = "mx6qpsabresd_config"

index b5e3c33..999ba4c 100644
@@ -1,4 +1,4 @@
-LA_OPT_FSL_OPEN_3RD_PARTY_IP v8 June 2015
+LA_OPT_BASE_LICENSE v10 November 2015
 
 IMPORTANT.  Read the following Freescale Semiconductor Software License
 Agreement ("Agreement") completely.    By selecting the "I Accept" button at

@@ -69,7 +69,7 @@ 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
+(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,

@@ -91,7 +91,7 @@ non-transferable, non-exclusive, non-sublicensable, license, under Freescale's
 Intellectual Property Rights:
 
 (a)    to prepare derivative works of the Licensed Software, only as part of,
-or integrated within, Authorized Systems and not on a standalone basis,;
+or integrated within, Authorized Systems and not on a standalone basis;
 
 (b)     to use, demonstrate, copy, distribute, market and sell the derivative
 works of the Licensed Software in object code (machine readable) only as part

@@ -153,7 +153,7 @@ 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
+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.
 

@@ -353,7 +353,7 @@ 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
+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

@@ -456,6 +456,13 @@ Your use of Broadcom Corporation software is restricted to Authorized Systems
 that incorporate a compatible integrated circuit device manufactured or sold by
 Broadcom.
 
+Cirque Corporation
+
+Use of Cirque Corporation technology is limited to evaluation, demonstration,
+or certification testing only. Permitted distributions must be similarly
+limited. Further rights, including but not limited to ANY commercial distribution
+rights, must be obtained directly from Cirque Corporation.
+
 Coding Technologies (Dolby Labs)
 
 Use of CTS software is limited to evaluation and demonstration only.  Permitted

index c198ea1..642d812 100644
@@ -6,7 +6,7 @@
 #
 #  SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV};fsl-eula=true"
 
-LIC_FILES_CHKSUM_append = " file://${FSL_EULA_FILE};md5=01ba08a2b77c3a0a9d0ab5d4d83fed64"
+LIC_FILES_CHKSUM_append = " file://${FSL_EULA_FILE};md5=3880bb9c943b135a30fad5e8aabd3ee9"
 LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE"
 
 python fsl_bin_do_unpack() {

index fc49669..9d4f897 100644
@@ -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://COPYING;md5=01ba08a2b77c3a0a9d0ab5d4d83fed64"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3880bb9c943b135a30fad5e8aabd3ee9"
 
 PE = "1"
 

index d20299f..276ca9e 100644
@@ -1,7 +1,7 @@
 # Copyright (C) 2013-2015 Freescale Semiconductor
 
 require imx-vpu.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=01ba08a2b77c3a0a9d0ab5d4d83fed64"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3880bb9c943b135a30fad5e8aabd3ee9"
 
 PE = "1"
 

index 9d08c39..2f0bc44 100644
@@ -3,7 +3,7 @@
 DESCRIPTION = "Freescale Multimedia codec libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=01ba08a2b77c3a0a9d0ab5d4d83fed64"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3880bb9c943b135a30fad5e8aabd3ee9"
 
 inherit fsl-eula-unpack autotools pkgconfig
 

index 3284a41..b63aad8 100644
@@ -4,7 +4,7 @@
 DESCRIPTION = "Freescale Multimedia parser libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=01ba08a2b77c3a0a9d0ab5d4d83fed64"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3880bb9c943b135a30fad5e8aabd3ee9"
 
 inherit fsl-eula-unpack autotools pkgconfig
 

index 9fffd3d..f081bb3 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "Freescale Multimedia VPU wrapper"
 DEPENDS = "imx-vpu"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=01ba08a2b77c3a0a9d0ab5d4d83fed64"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3880bb9c943b135a30fad5e8aabd3ee9"
 
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
 S = "${WORKDIR}/${PN}-${PV}"

index c7a4268..8fc9435 100644
@@ -8,16 +8,9 @@ PROVIDES += "u-boot"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCBRANCH_mx6 = "imx_v2015.04_3.14.38_6qp_ga"
-SRCREV_mx6 = "f80d628744bd1e669e365c52068067563b577e16"
-
-SRCBRANCH_mx6ul = "imx_v2015.04_3.14.38_6ul_ga"
-SRCREV_mx6ul = "5d63276bfebc82cffa10d66ddaa903dd2ab0df43"
-
-SRCBRANCH_mx7 = "imx_v2015.04_3.14.38_6ul_ga"
-SRCREV_mx7 = "5d63276bfebc82cffa10d66ddaa903dd2ab0df43"
-
+SRCBRANCH = "imx_v2015.04_3.14.52_1.1.0_ga"
 SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=${SRCBRANCH}"
+SRCREV = "6cf684ae53011effa838ce2277fabfec4ae42ea0"
 
 S = "${WORKDIR}/git"
 

similarity index 68%
rename from recipes-bsp/imx-kobs/imx-kobs_5.1.bb
rename to recipes-bsp/imx-kobs/imx-kobs_5.3.bb
index be0ac9c..ccc4a24 100644
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 SRC_URI = "${FSL_MIRROR}/imx-kobs-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "b3217106d2ea7da2774835bf264633f1"
-SRC_URI[sha256sum] = "28c7356187ae26a2b37fb37a4b7bfdb63b3628b72d737d897ae6d5b969fbb51a"
+SRC_URI[md5sum] = "a2a9e1c3445d14c961577492313a41fb"
+SRC_URI[sha256sum] = "45f729fc2b49556f1ca9df778f52bf5cc749cfe53664c8206daab29991c5f6c1"
 
 inherit  autotools pkgconfig
 

deleted file mode 100644
index d0b64e9..0000000
@@ -1,8 +0,0 @@
-# Copyright (C) 2013-2015 Freescale Semiconductor
-
-include imx-test.inc
-
-SRC_URI[md5sum] = "38744ca0f85fb1ae8346ab9ac2030e54"
-SRC_URI[sha256sum] = "22ffd80b445467e53758f3e1fd20556f8da9675a4c04ec59dcb6aee636e7f931"
-
-COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"

new file mode 100644
index 0000000..ce57ae1
@@ -0,0 +1,8 @@
+# Copyright (C) 2013-2015 Freescale Semiconductor
+
+include imx-test.inc
+
+SRC_URI[md5sum] = "b5d156c4766f06135bfdbf83dc708373"
+SRC_URI[sha256sum] = "a7c8aefb57c59883349cef755dc64b09b14af20e20a6a7554828cf6d7347b40e"
+
+COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"

index 7174b05..80bf0da 100644
@@ -1,15 +1,19 @@
 # Copyright (C) 2012-2015 O.S. Systems Software LTDA.
+# Copyright (C) 2015 Freescale Semiconductor
 
 SUMMARY = "Test programs for IMX BSP"
 DESCRIPTION = "Unit tests for the IMX BSP"
 SECTION = "base"
-DEPENDS_mx6q  = "virtual/kernel imx-lib imx-vpu"
-DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu"
-DEPENDS_mx6sl = "virtual/kernel imx-lib"
-DEPENDS_mx6sx = "virtual/kernel imx-lib"
-DEPENDS_mx6ul = "virtual/kernel imx-lib"
-DEPENDS_mx7   = "virtual/kernel imx-lib"
 
+X11_DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', \
+                   ' libx11 libxdamage libxrender libxrandr', '', d)}"
+
+DEPENDS_mx6q  = "virtual/kernel imx-lib imx-vpu ${X11_DEPENDS}"
+DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu ${X11_DEPENDS}"
+DEPENDS_mx6sl = "virtual/kernel imx-lib ${X11_DEPENDS}"
+DEPENDS_mx6sx = "virtual/kernel imx-lib ${X11_DEPENDS}"
+DEPENDS_mx6ul = "virtual/kernel imx-lib ${X11_DEPENDS}"
+DEPENDS_mx7   = "virtual/kernel imx-lib ${X11_DEPENDS}"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"

similarity index 56%
rename from recipes-bsp/imx-vpu/imx-vpu_5.4.31.bb
rename to recipes-bsp/imx-vpu/imx-vpu_5.4.32.bb
index 276ca9e..8f2440e 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3880bb9c943b135a30fad5e8aabd3ee9"
 
 PE = "1"
 
-SRC_URI[md5sum] = "2587d0d011b65021aef469d17ca5c658"
-SRC_URI[sha256sum] = "a266ab317fbd866541eae506d68983bcd361f49d1162a66bb34cb8088ceec88c"
+SRC_URI[md5sum] = "d7bfe9f96169f4637327436a4e848dae"
+SRC_URI[sha256sum] = "f11b91dcdb84bfefd3c88f10a9c1c1bc3420e4bbaadc38b9280fb52f7769eca8"
 
 COMPATIBLE_MACHINE = "(mx6)"

similarity index 57%
rename from recipes-bsp/imx-uuc/imx-uuc_0.5.bb
rename to recipes-bsp/imx-uuc/imx-uuc_0.5.1.bb
index b172b32..7b4e585 100644
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Freescale Semiconductor
+# Copyright (C) 2014-2015 Freescale Semiconductor
 # Copyright (C) 2014 O.S. Systems Software LTDA.
 
 SUMMARY = "Universal Adapter source"

@@ -8,9 +8,9 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "4a82f106f85199c91a058ee54c127477"
-SRC_URI[sha256sum] = "ec5894ab7967797c8500b4988d0aba6c6f78ef22b4a190f9db12be33df08faaf"
+SRC_URI[md5sum] = "f2edde0da371f89c7471884eb1e5143a"
+SRC_URI[sha256sum] = "95d7f7b075f58fedc07602fbc0e5bf5212d28deea3d09cdbcbd80992dcd18482"
 
 inherit autotools-brokensep
 
-FILES_${PN} += "/linuxrc"
+FILES_${PN} += "/linuxrc /fat"

new file mode 100644
index 0000000..e3b99b7
@@ -0,0 +1,11 @@
+# Display options
+HAVE_TOUCHSCREEN=1
+HAVE_KEYBOARD=0
+
+#DISPLAY_CAN_ROTATE=0
+#DISPLAY_ORIENTATION=0
+#DISPLAY_WIDTH_PIXELS=1024
+#DISPLAY_HEIGHT_PIXELS=720
+#DISPLAY_BPP=16
+#DISPLAY_DPI=150
+#DISPLAY_SUBPIXEL_ORDER=vrgb

new file mode 100644
index 0000000..e3b99b7
@@ -0,0 +1,11 @@
+# Display options
+HAVE_TOUCHSCREEN=1
+HAVE_KEYBOARD=0
+
+#DISPLAY_CAN_ROTATE=0
+#DISPLAY_ORIENTATION=0
+#DISPLAY_WIDTH_PIXELS=1024
+#DISPLAY_HEIGHT_PIXELS=720
+#DISPLAY_BPP=16
+#DISPLAY_DPI=150
+#DISPLAY_SUBPIXEL_ORDER=vrgb

deleted file mode 100644
index f8a0851..0000000
@@ -1,8 +0,0 @@
-# Copyright (C) 2012-2015 Freescale Semiconductor
-
-require recipes-bsp/firmware-imx/firmware-imx.inc
-
-SRC_URI[md5sum] = "e466839e2cfbbcacb974b872c0b063e7"
-SRC_URI[sha256sum] = "8cc2df128c0e2d2f5224d73389fbe6e4d6fa9ede76f8c0a9adaf7ec0986d0f1f"
-
-COMPATIBLE_MACHINE = "(mx5|mx6|mx7)"

new file mode 100644
index 0000000..a18c73c
@@ -0,0 +1,8 @@
+# Copyright (C) 2012-2015 Freescale Semiconductor
+
+require recipes-bsp/firmware-imx/firmware-imx.inc
+
+SRC_URI[md5sum] = "1f19ffcbd6f8c3fcde271cf6f0314836"
+SRC_URI[sha256sum] = "fd14c3666eb3c12f4f2665d95caf383bb1d0277bb12e2de28fefc8d1230604f2"
+
+COMPATIBLE_MACHINE = "(mx5|mx6|mx6ul|mx7)"

index bd64bc5..79c9d8e 100644
@@ -137,7 +137,7 @@ PREFERRED_PROVIDER_virtual/libg2d_mx6ul = ""
 IMX_DEFAULT_KERNEL = "linux-imx"
 IMX_DEFAULT_KERNEL_mxs = "linux-fslc"
 IMX_DEFAULT_KERNEL_mx5 = "linux-fslc"
-IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-mx6"
+IMX_DEFAULT_KERNEL_mx6 = "linux-imx"
 IMX_DEFAULT_KERNEL_mx6ul = "linux-imx"
 
 PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"

index 79c9d8e..66edb42 100644
@@ -23,6 +23,7 @@ UBOOT_ENTRYPOINT_mx53  = "0x70008000"
 UBOOT_ENTRYPOINT_mx6  = "0x10008000"
 UBOOT_ENTRYPOINT_mx6sl = "0x80008000"
 UBOOT_ENTRYPOINT_mx6sx = "0x80008000"
+UBOOT_ENTRYPOINT_mx6ul  = "0x10008000"
 UBOOT_ENTRYPOINT_mx7 = "0x80008000"
 UBOOT_ENTRYPOINT_vf = "0x80008000"
 

similarity index 100%
rename from recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.7/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch
rename to recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.8/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch

similarity index 85%
rename from recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.7.bb
rename to recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.8.bb
index 62b38c7..51ea92a 100644
@@ -22,8 +22,9 @@ SRC_URI = " \
     ${FSL_MIRROR}/gst1.0-fsl-plugins-${PV}.tar.gz \
     file://0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch \
 "
-SRC_URI[md5sum] = "81e2dbd702ea2cd7904fc54981ea3d19"
-SRC_URI[sha256sum] = "fc287a672e2f040c2697af618b2f6ed319202a6dfbb731cbfb7987b41de2d62b"
+
+SRC_URI[md5sum] = "0669eeea4e37203e2e654a00ded35ba2"
+SRC_URI[sha256sum] = "43c86f88d3c7b1da8d38815eaec297a9b8652e1fb770ff89c26d617f63ea068b"
 
 S = "${WORKDIR}/gst1.0-fsl-plugins-${PV}"
 

@@ -41,19 +42,18 @@ PLATFORM_mx7= "MX7D"
 # Todo add a mechanism to map possible build targets
 EXTRA_OECONF = "PLATFORM=${PLATFORM} \
                 CPPFLAGS="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include" \
-                CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR}"
+                CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR} \
+                ${@base_contains('DISTRO_FEATURES', 'wayland', base_contains('DISTRO_FEATURES', 'x11', '--disable-x11', '', d), '', d)}"
 
-PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN}-librecorder-engine"
+PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN}-librecorder-engine ${PN}-libplayengine"
 
 # Add codec list that the beep plugin run-time depended
 BEEP_RDEPENDS = "libfslcodec-aac libfslcodec-mp3 libfslcodec-oggvorbis"
 RDEPENDS_${PN} += "libfslparser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux "
 
 PACKAGECONFIG ?= ""
-PACKAGECONFIG_mx6q = "overlaysink"
-PACKAGECONFIG_mx6dl = "overlaysink"
-PACKAGECONFIG_mx6sx = "overlaysink"
-PACKAGECONFIG_mx6sl = "overlaysink"
+PACKAGECONFIG_mx6 = "overlaysink"
+
 
 # FIXME: Add all features
 # feature from excluded mm packages

@@ -76,5 +76,6 @@ FILES_${PN}-libgplaycore = "${libdir}/libgplaycore-1.0${SOLIBS}"
 FILES_${PN}-libgstfsl = "${libdir}/libgstfsl-1.0${SOLIBS}"
 FILES_${PN}-grecorder = "${bindir}/grecorder-1.0"
 FILES_${PN}-librecorder-engine = "${libdir}/librecorder_engine-1.0${SOLIBS}"
+FILES_${PN}-libplayengine = "${libdir}/libplayengine-1.0${SOLIBS}"
 
 COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"

similarity index 56%
rename from recipes-multimedia/libfslcodec/libfslcodec_4.0.7.bb
rename to recipes-multimedia/libfslcodec/libfslcodec_4.0.8.bb
index 15ee8bd..1b32f90 100644
@@ -3,7 +3,7 @@
 
 require libfslcodec.inc
 
-SRC_URI[md5sum] = "14de0ca4af46a5b7a597fc172072adbe"
-SRC_URI[sha256sum] = "de1251286ebbc1541452f2f70fbd73e42c58f95630d65d1f9aaabf10a6caa38f"
+SRC_URI[md5sum] = "462fb27b20cd7df56a49b9e7d6b7c8b4"
+SRC_URI[sha256sum] = "544ffc5989bce18ca50c7a826cc03370b1cf8455335e4291ef0c0779b4c33de0"
 
 COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"

new file mode 100644
index 0000000..06657fd
@@ -0,0 +1,9 @@
+# Copyright (C) 2013-2015 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require libfslparser.inc
+
+SRC_URI[md5sum] = "9538df4dc416e12ff13fdf12ddbf3684"
+SRC_URI[sha256sum] = "a04621783c84a9776216caff9563c7f840fddd584b0b2d27738d6ca6d2c77f32"
+
+COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"

similarity index 80%
rename from recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.61.bb
rename to recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.62.bb
index f081bb3..363184b 100644
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3880bb9c943b135a30fad5e8aabd3ee9"
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
 S = "${WORKDIR}/${PN}-${PV}"
 
-SRC_URI[md5sum] = "313c0e709f53b565270070e4206e0fa8"
-SRC_URI[sha256sum] = "e4bfe218d17ec66acf8cd97d08fef8ef71ab6762d4c8cf0d0193eca5f599b4c9"
+SRC_URI[md5sum] = "6497758e27f72992a86ac918ce12db56"
+SRC_URI[sha256sum] = "0717faccb5413dc95ce9ad919400095ecf722320478c924366793a6cc450ae16"
 
 inherit fsl-eula-unpack autotools pkgconfig