summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2016-10-10 16:29:10 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2016-10-18 16:26:15 -0200
commit250d1fc77964739d514b67a15c1dfd4d39bd25db (patch)
treec4247360b4208ef1dcb15a522479fa8f26de9c4a /recipes-kernel
parent51148d70c4ae7f581c109b2f04c2be16c428b8d5 (diff)
downloadmeta-freescale-250d1fc77964739d514b67a15c1dfd4d39bd25db.tar.gz
linux-fslc-imx: Update to 4.1-2.0.x GA based fork
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@ossystems.com.br> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-fslc-imx/defconfig11
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb (renamed from recipes-kernel/linux/linux-fslc-imx_4.1-1.0.x.bb)4
2 files changed, 8 insertions, 7 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/defconfig
index 7fa0c667..a2a30371 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
24CONFIG_SOC_IMX6Q=y 24CONFIG_SOC_IMX6Q=y
25CONFIG_SOC_IMX6SL=y 25CONFIG_SOC_IMX6SL=y
26CONFIG_SOC_IMX6SX=y 26CONFIG_SOC_IMX6SX=y
27CONFIG_SOC_IMX6UL=y 27CONFIG_SOC_IMX6ULL=y
28CONFIG_SOC_IMX7D=y 28CONFIG_SOC_IMX7D=y
29CONFIG_SOC_VF610=y 29CONFIG_SOC_VF610=y
30# CONFIG_SWP_EMULATE is not set 30# CONFIG_SWP_EMULATE is not set
@@ -147,7 +147,7 @@ CONFIG_USB_NET_CDC_EEM=m
147CONFIG_BCMDHD=y 147CONFIG_BCMDHD=y
148CONFIG_BCMDHD_SDIO=y 148CONFIG_BCMDHD_SDIO=y
149CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/ZP_BCM4339/fw_bcmdhd.bin" 149CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/ZP_BCM4339/fw_bcmdhd.bin"
150CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/ZP_BCM4339/bcmdhd.ZP.SDIO.cal" 150CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/ZP_BCM4339/bcmdhd.ZP.OOB.cal"
151# CONFIG_RTL_CARDS is not set 151# CONFIG_RTL_CARDS is not set
152# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 152# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
153CONFIG_INPUT_EVDEV=y 153CONFIG_INPUT_EVDEV=y
@@ -167,6 +167,7 @@ CONFIG_TOUCHSCREEN_TSC2007=y
167CONFIG_TOUCHSCREEN_STMPE=y 167CONFIG_TOUCHSCREEN_STMPE=y
168CONFIG_INPUT_MISC=y 168CONFIG_INPUT_MISC=y
169CONFIG_INPUT_MMA8450=y 169CONFIG_INPUT_MMA8450=y
170CONFIG_INPUT_MPL3115=y
170CONFIG_SENSOR_FXLS8471=y 171CONFIG_SENSOR_FXLS8471=y
171CONFIG_INPUT_ISL29023=y 172CONFIG_INPUT_ISL29023=y
172CONFIG_SERIO_SERPORT=m 173CONFIG_SERIO_SERPORT=m
@@ -177,6 +178,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y
177CONFIG_SERIAL_FSL_LPUART=y 178CONFIG_SERIAL_FSL_LPUART=y
178CONFIG_SERIAL_FSL_LPUART_CONSOLE=y 179CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
179CONFIG_FSL_OTP=y 180CONFIG_FSL_OTP=y
181CONFIG_HW_RANDOM_IMX_RNG=y
180# CONFIG_I2C_COMPAT is not set 182# CONFIG_I2C_COMPAT is not set
181CONFIG_I2C_CHARDEV=y 183CONFIG_I2C_CHARDEV=y
182# CONFIG_I2C_HELPER_AUTO is not set 184# CONFIG_I2C_HELPER_AUTO is not set
@@ -330,6 +332,7 @@ CONFIG_MMC_SDHCI_PLTFM=y
330CONFIG_MMC_SDHCI_ESDHC_IMX=y 332CONFIG_MMC_SDHCI_ESDHC_IMX=y
331CONFIG_MXC_IPU=y 333CONFIG_MXC_IPU=y
332CONFIG_MXC_IPU_V3_PRE=y 334CONFIG_MXC_IPU_V3_PRE=y
335CONFIG_MXC_GPU_VIV=y
333CONFIG_MXC_SIM=y 336CONFIG_MXC_SIM=y
334CONFIG_MXC_MIPI_CSI2=y 337CONFIG_MXC_MIPI_CSI2=y
335CONFIG_MXC_HDMI_CEC=y 338CONFIG_MXC_HDMI_CEC=y
@@ -359,7 +362,6 @@ CONFIG_STAGING_MEDIA=y
359CONFIG_IIO=y 362CONFIG_IIO=y
360CONFIG_IMX7D_ADC=y 363CONFIG_IMX7D_ADC=y
361CONFIG_VF610_ADC=y 364CONFIG_VF610_ADC=y
362CONFIG_MPL3115=y
363CONFIG_PWM=y 365CONFIG_PWM=y
364CONFIG_PWM_IMX=y 366CONFIG_PWM_IMX=y
365CONFIG_EXT2_FS=y 367CONFIG_EXT2_FS=y
@@ -404,7 +406,6 @@ CONFIG_MAGIC_SYSRQ=y
404CONFIG_SECURITYFS=y 406CONFIG_SECURITYFS=y
405CONFIG_CRYPTO_USER=y 407CONFIG_CRYPTO_USER=y
406CONFIG_CRYPTO_TEST=m 408CONFIG_CRYPTO_TEST=m
407CONFIG_CRYPTO_CBC=y
408CONFIG_CRYPTO_CTS=y 409CONFIG_CRYPTO_CTS=y
409CONFIG_CRYPTO_LRW=y 410CONFIG_CRYPTO_LRW=y
410CONFIG_CRYPTO_XTS=y 411CONFIG_CRYPTO_XTS=y
@@ -415,7 +416,6 @@ CONFIG_CRYPTO_RMD128=y
415CONFIG_CRYPTO_RMD160=y 416CONFIG_CRYPTO_RMD160=y
416CONFIG_CRYPTO_RMD256=y 417CONFIG_CRYPTO_RMD256=y
417CONFIG_CRYPTO_RMD320=y 418CONFIG_CRYPTO_RMD320=y
418CONFIG_CRYPTO_SHA1=y
419CONFIG_CRYPTO_SHA512=y 419CONFIG_CRYPTO_SHA512=y
420CONFIG_CRYPTO_TGR192=y 420CONFIG_CRYPTO_TGR192=y
421CONFIG_CRYPTO_WP512=y 421CONFIG_CRYPTO_WP512=y
@@ -428,6 +428,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM=y
428CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y 428CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
429CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y 429CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y
430CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y 430CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
431CONFIG_CRYPTO_DEV_MXS_DCP=y
431CONFIG_CRC_CCITT=m 432CONFIG_CRC_CCITT=m
432CONFIG_CRC_T10DIF=y 433CONFIG_CRC_T10DIF=y
433CONFIG_CRC7=m 434CONFIG_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
index 40d82bcd..d1e1a15f 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
10 10
11PV .= "+git${SRCPV}" 11PV .= "+git${SRCPV}"
12 12
13SRCBRANCH = "4.1-1.0.x-imx" 13SRCBRANCH = "4.1-2.0.x-imx"
14SRCREV = "1af16a73ab77f333898f924dd867c417a1de0b01" 14SRCREV = "34002442b17af7220fa52b2d153db90685113947"
15 15
16COMPATIBLE_MACHINE = "(mx6|mx7)" 16COMPATIBLE_MACHINE = "(mx6|mx7)"