[meta-freescale] [PATCH 1/2] linux-fslc-imx: Update to 4.1-2.0.x GA based fork

Mon Oct 10 12:29:10 PDT 2016

This updates the kernel fork for the 4.1-2.0.x-imx branch, merges the
4.1.33 stable release on top of it and apply following changes:

  - 3400244 net: fec: align IP
  - e02ebf2 net: fec: enable RACC on imx6ul
  - c9a9698 net: fec: remove QUIRK_HAS_RACC from i.mx27
  - ed4cba2 net: fec: remove QUIRK_HAS_RACC from i.mx25
  - 1623965 serial: imx: reduce irq-latency after rx overflow
  - bf2698a rfkill-gpio: fix clk on/off
  - 0413e28 rfkill-gpio: fix active levels which automatically invert when active low
  - 8ea61b8 rfkill-gpio: add devicetree support
  - aed9a42 ARM: dts: imx7s-warp: Enable BT_REG_ON
  - 955eb6f ARM: dts: imx7s-warp: Add Wifi support
  - d120646 ARM: dts: imx7s-warp: Move memory node
  - 82b8823 ARM: dts: imx7s-warp: Enable crypto
  - e0a52d3 ARM: dts: warp7: Rename the dts file
  - 9283aff ARM: imx_v7_defconfig: Add simple card driver support
  - 48186c5 sgtl5000.c: HACK, defer probe when I2C not yet running
  - 4759947 ARM: dts: imx7d-warp: Add audio support
  - fe4d4c7 ARM: dts: imx7d: Add #sound-dai-cells into sai nodes
  - 94de584 ARM: dts: imx7d-warp: Add BC3770 support.
  - 8791ec9 ARM: dts: imx7d-warp: Enable bluetooth device
  - 99059df ARM: dts: imx7d-warp: Add User Button support
  - 6f50d90 ARM: dts: imx7d-warp: Add NFC support
  - 68aafc4 ARM: dts: imx7d-warp: Add support for precision altimeter
  - cacc687 ARM: dts: imx7d-warp: Add support for accelerometer and magnetometer
  - ff609f7 ARM: dts: imx7d-warp: Add I2C4 device node, princtrl
  - b21d979 of: Allow NXP 4.1 kernel to allocate memory on 2GiB RAM boards
  - 67bebf9 ARM: dts: imx7d-warp: Add initial support
  - 5bc7305 MLK-13243: arm: imx6q: busfreq: lpddr2 fix system clocks audio mode

Signed-off-by: Fabio Berton <fabio.berton at ossystems.com.br>
---
 recipes-kernel/linux/linux-fslc-imx/defconfig                 | 11 ++++++-----
 ...inux-fslc-imx_4.1-1.0.x.bb => linux-fslc-imx_4.1-2.0.x.bb} |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename recipes-kernel/linux/{linux-fslc-imx_4.1-1.0.x.bb => linux-fslc-imx_4.1-2.0.x.bb} (87%)

diff --git a/recipes-kernel/linux/linux-fslc-imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/defconfig
index 7fa0c66..a2a3037 100644
--- a/recipes-kernel/linux/linux-fslc-imx/defconfig
+++ b/recipes-kernel/linux/linux-fslc-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
@@ -147,7 +147,7 @@ CONFIG_USB_NET_CDC_EEM=m
 CONFIG_BCMDHD=y
 CONFIG_BCMDHD_SDIO=y
 CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/ZP_BCM4339/fw_bcmdhd.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/ZP_BCM4339/bcmdhd.ZP.SDIO.cal"
+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
@@ -167,6 +167,7 @@ CONFIG_TOUCHSCREEN_TSC2007=y
 CONFIG_TOUCHSCREEN_STMPE=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MMA8450=y
+CONFIG_INPUT_MPL3115=y
 CONFIG_SENSOR_FXLS8471=y
 CONFIG_INPUT_ISL29023=y
 CONFIG_SERIO_SERPORT=m
@@ -177,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
@@ -330,6 +332,7 @@ CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MXC_IPU=y
 CONFIG_MXC_IPU_V3_PRE=y
+CONFIG_MXC_GPU_VIV=y
 CONFIG_MXC_SIM=y
 CONFIG_MXC_MIPI_CSI2=y
 CONFIG_MXC_HDMI_CEC=y
@@ -359,7 +362,6 @@ CONFIG_STAGING_MEDIA=y
 CONFIG_IIO=y
 CONFIG_IMX7D_ADC=y
 CONFIG_VF610_ADC=y
-CONFIG_MPL3115=y
 CONFIG_PWM=y
 CONFIG_PWM_IMX=y
 CONFIG_EXT2_FS=y
@@ -404,7 +406,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
@@ -415,7 +416,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
@@ -428,6 +428,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-fslc-imx_4.1-1.0.x.bb b/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb
similarity index 87%
rename from recipes-kernel/linux/linux-fslc-imx_4.1-1.0.x.bb
rename to recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb
index 40d82bc..d1e1a15 100644
--- a/recipes-kernel/linux/linux-fslc-imx_4.1-1.0.x.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb
@@ -10,7 +10,7 @@ include linux-fslc.inc
 
 PV .= "+git${SRCPV}"
 
-SRCBRANCH = "4.1-1.0.x-imx"
-SRCREV = "1af16a73ab77f333898f924dd867c417a1de0b01"
+SRCBRANCH = "4.1-2.0.x-imx"
+SRCREV = "34002442b17af7220fa52b2d153db90685113947"
 
 COMPATIBLE_MACHINE = "(mx6|mx7)"
-- 
2.1.4

