From fda4c4911f3ba2bbf0d9521c59d266023bc2bf69 Mon Sep 17 00:00:00 2001 From: Dominic Sacré Date: Thu, 10 Nov 2016 15:21:31 +0100 Subject: linux-fslc-imx-rt: Upgrade to 4.1-2.0.x GA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upgrade to revision 176c482, and apply patch 4.1.35-rt41 on top of it. Refresh defconfig for the new kernel version. Signed-off-by: Dominic Sacré Signed-off-by: Otavio Salvador --- recipes-kernel/linux/linux-fslc-imx-rt/defconfig | 15 ++++++----- .../linux/linux-fslc-imx-rt_4.1-1.0.x.bb | 31 ---------------------- .../linux/linux-fslc-imx-rt_4.1-2.0.x.bb | 31 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 37 deletions(-) delete mode 100644 recipes-kernel/linux/linux-fslc-imx-rt_4.1-1.0.x.bb create mode 100644 recipes-kernel/linux/linux-fslc-imx-rt_4.1-2.0.x.bb diff --git a/recipes-kernel/linux/linux-fslc-imx-rt/defconfig b/recipes-kernel/linux/linux-fslc-imx-rt/defconfig index 05d15d059..34ee14d1f 100644 --- a/recipes-kernel/linux/linux-fslc-imx-rt/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx-rt/defconfig @@ -25,7 +25,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 @@ -145,10 +145,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 @@ -179,6 +179,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 @@ -255,6 +256,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 @@ -286,6 +289,7 @@ CONFIG_SND_SOC_IMX_SPDIF=y CONFIG_SND_SOC_IMX_MC13783=y CONFIG_SND_SOC_IMX_SI476X=y CONFIG_SND_SOC_IMX_HDMI=y +CONFIG_SND_SIMPLE_CARD=y CONFIG_USB=y CONFIG_USB_OTG_WHITELIST=y CONFIG_USB_OTG_FSM=y @@ -403,7 +407,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 @@ -414,7 +417,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 @@ -427,6 +429,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-rt_4.1-1.0.x.bb b/recipes-kernel/linux/linux-fslc-imx-rt_4.1-1.0.x.bb deleted file mode 100644 index 7af29de68..000000000 --- a/recipes-kernel/linux/linux-fslc-imx-rt_4.1-1.0.x.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Realtime version of the FSL Community BSP i.MX6 Linux kernel with backported features and fixes" -DESCRIPTION = "Linux kernel based on NXP 4.1.15-1.0.0 GA release, used by FSL Community BSP in order to \ -provide support for i.MX6 based platforms and include official Linux kernel stable updates, backported \ -features and fixes coming from the vendors, kernel community or FSL Community itself. \ -In addition, this kernel has the realtime patch (PREEMPT_RT) applied." - -include linux-fslc.inc - -PV .= "+git${SRCPV}" - -SRCBRANCH = "4.1-1.0.x-imx" -SRCREV = "445b81a703861b3c146ccd074cb5c14a5363c6d3" - -SRC_URI += " \ - https://www.kernel.org/pub/linux/kernel/projects/rt/4.1/older/patch-4.1.19-rt22.patch.gz;name=patch-4.1.19-rt22.patch \ - file://0001-fix-build.patch \ - file://0002-no-split-ptlocks.patch \ - file://0003-Work-around-CPU-stalls-in-the-imx-sdma-driver.patch \ -" - -SRC_URI[patch-4.1.19-rt22.patch.md5sum] = "20a893d189c619ea3e7489f870478e7a" -SRC_URI[patch-4.1.19-rt22.patch.sha256sum] = "81a6429eb03f085e7f58a669eb23719ae14876c14fe244f5aac909c28ee4104e" - -python () { - using_builtin_driver = (d.getVar("MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE", True) or "") != "1" - if not using_builtin_driver: - raise bb.parse.SkipPackage('You must use the builtin driver with the Linux RT patch as the external module does not yet include support for it. Set "MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE" accordingly.') -} - - -COMPATIBLE_MACHINE = "(mx6|mx7)" diff --git a/recipes-kernel/linux/linux-fslc-imx-rt_4.1-2.0.x.bb b/recipes-kernel/linux/linux-fslc-imx-rt_4.1-2.0.x.bb new file mode 100644 index 000000000..fbb32d812 --- /dev/null +++ b/recipes-kernel/linux/linux-fslc-imx-rt_4.1-2.0.x.bb @@ -0,0 +1,31 @@ +SUMMARY = "Realtime version of the FSL Community BSP i.MX6 Linux kernel with backported features and fixes" +DESCRIPTION = "Linux kernel based on NXP 4.1-2.0.0 GA release, used by FSL Community BSP in order to \ +provide support for i.MX6 based platforms and include official Linux kernel stable updates, backported \ +features and fixes coming from the vendors, kernel community or FSL Community itself. \ +In addition, this kernel has the realtime patch (PREEMPT_RT) applied." + +include linux-fslc.inc + +PV .= "+git${SRCPV}" + +SRCBRANCH = "4.1-2.0.x-imx" +SRCREV = "176c482f56cd9c523829ceb6bce5c28d3cc6d1c0" + +SRC_URI += " \ + https://www.kernel.org/pub/linux/kernel/projects/rt/4.1/older/patch-4.1.35-rt41.patch.gz;name=rt-patch \ + file://0001-fix-build.patch \ + file://0002-no-split-ptlocks.patch \ + file://0003-Work-around-CPU-stalls-in-the-imx-sdma-driver.patch \ +" + +SRC_URI[rt-patch.md5sum] = "6dd1193203cdf6a1a4758fc8baf07a4a" +SRC_URI[rt-patch.sha256sum] = "427e736022e59f83c9489eda889559fcd4fe4abb5646570ade32f2128f2fa725" + +python () { + using_builtin_driver = (d.getVar("MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE", True) or "") != "1" + if not using_builtin_driver: + raise bb.parse.SkipPackage('You must use the builtin driver with the Linux RT patch as the external module does not yet include support for it. Set "MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE" accordingly.') +} + + +COMPATIBLE_MACHINE = "(mx6|mx7)" -- cgit v1.2.3-54-g00ecf