From f26c70a219e39919fa4ea35032b0af7a19629dd5 Mon Sep 17 00:00:00 2001
From: Lauren Post <lauren.post@nxp.com>
Date: Thu, 29 Sep 2016 13:47:14 -0500
Subject: [PATCH] linux-imx: Upgrade to 4.1.15-2.0.0 GA release

Include support for i.MX 6ULL

Signed-off-by: Lauren Post <lauren.post@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../linux/linux-imx-4.1.15/imx/defconfig           | 14 ++++++++------
 recipes-kernel/linux/linux-imx_4.1.15.bb           | 11 +++--------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig b/recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig
index 40e35b99..a7ab036b 100644
--- a/recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig
+++ b/recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig
@@ -24,7 +24,7 @@ CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6SX=y
-CONFIG_SOC_IMX6UL=y
+CONFIG_SOC_IMX6ULL=y
 CONFIG_SOC_IMX7D=y
 CONFIG_SOC_VF610=y
 # CONFIG_SWP_EMULATE is not set
@@ -144,10 +144,10 @@ CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_CDC_EEM=m
-CONFIG_BCMDHD=m
+CONFIG_BCMDHD=y
 CONFIG_BCMDHD_SDIO=y
-CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/fw_bcmdhd.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/bcmdhd.cal"
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/ZP_BCM4339/fw_bcmdhd.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/ZP_BCM4339/bcmdhd.ZP.OOB.cal"
 # CONFIG_RTL_CARDS is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
@@ -178,6 +178,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_FSL_OTP=y
+CONFIG_HW_RANDOM_IMX_RNG=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_HELPER_AUTO is not set
@@ -254,6 +255,8 @@ CONFIG_FB_MXC_SYNC_PANEL=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_TRULY_PANEL_TFT3P5079E=y
+CONFIG_FB_MXC_TRULY_PANEL_TFT3P5581E=y
 CONFIG_FB_MXC_LDB=y
 CONFIG_FB_MXC_HDMI=y
 CONFIG_FB_MXS_SII902X=y
@@ -402,7 +405,6 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_SECURITYFS=y
 CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_LRW=y
 CONFIG_CRYPTO_XTS=y
@@ -413,7 +415,6 @@ CONFIG_CRYPTO_RMD128=y
 CONFIG_CRYPTO_RMD160=y
 CONFIG_CRYPTO_RMD256=y
 CONFIG_CRYPTO_RMD320=y
-CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_TGR192=y
 CONFIG_CRYPTO_WP512=y
@@ -426,6 +427,7 @@ 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_DEV_MXS_DCP=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC7=m
diff --git a/recipes-kernel/linux/linux-imx_4.1.15.bb b/recipes-kernel/linux/linux-imx_4.1.15.bb
index 8fce40bf..62652f6c 100644
--- a/recipes-kernel/linux/linux-imx_4.1.15.bb
+++ b/recipes-kernel/linux/linux-imx_4.1.15.bb
@@ -10,14 +10,9 @@ require recipes-kernel/linux/linux-dtb.inc
 
 DEPENDS += "lzop-native bc-native"
 
-SRCBRANCH = "imx_4.1.15_1.0.0_ga"
-LOCALVERSION = "-1.2.0"
-SRCREV = "77f61547834c4f127b44b13e43c59133a35880dc"
-
-# Add patches for gcc 6 compiler issue
-SRC_URI += "file://gcc6_integrate_fix.patch \
-            file://bcmhd_gcc6_indent_warning_error_fix.patch \
-            file://gpu-viv_gcc6_indent_warning_error_fix.patch"
+SRCBRANCH = "imx_4.1.15_2.0.0_ga"
+LOCALVERSION = "-2.0.0"
+SRCREV = "b63f3f52cb393e3287352cf63f0caef31a33ab63"
 
 DEFAULT_PREFERENCE = "1"
 
-- 
2.40.1