From ec8375857e56efc1f70464eabde7c3e3cbdb60f8 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Sat, 16 Dec 2017 13:02:34 +0100 Subject: [PATCH] linux-fslc-imx: Update to 4.9-1.0.x GA based fork This updates the kernel fork for the 4.9-1.0.x-imx branch, merges the 4.9.67 stable release on top of it and apply following changes: - ARM: dts: imx6ull: include all needed definitions - ASoC: sgtl5000: Allow LRCLK pad drive strength to be changed - video: fbdev: mxsfb: honor native-mode - video: mxsfb: simplify parsing - dmaengine: Kconfig: Extend the dependency for MXS_DMA - video: fbdev: mxsfb: fix pixelclock polarity - video: mxsfb: add compile dependencies - chipidea: make usb charger optional Signed-off-by: Stefan Agner Signed-off-by: Otavio Salvador --- recipes-kernel/linux/linux-fslc-imx/defconfig | 24 ++++--------------- ...1-2.0.x.bb => linux-fslc-imx_4.9-1.0.x.bb} | 6 ++--- 2 files changed, 8 insertions(+), 22 deletions(-) rename recipes-kernel/linux/{linux-fslc-imx_4.1-2.0.x.bb => linux-fslc-imx_4.9-1.0.x.bb} (78%) diff --git a/recipes-kernel/linux/linux-fslc-imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/defconfig index 061a1bde..f9e53a6a 100644 --- a/recipes-kernel/linux/linux-fslc-imx/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/defconfig @@ -1,6 +1,5 @@ CONFIG_KERNEL_LZO=y CONFIG_SYSVIPC=y -CONFIG_FHANDLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=y @@ -31,7 +30,6 @@ CONFIG_SOC_IMX6SLL=y CONFIG_SOC_VF610=y # CONFIG_SWP_EMULATE is not set CONFIG_SMP=y -CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_VMSPLIT_2G=y CONFIG_PREEMPT=y CONFIG_AEABI=y @@ -42,8 +40,8 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_INTERACTIVE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_INTERACTIVE=y CONFIG_ARM_IMX6Q_CPUFREQ=y CONFIG_ARM_IMX7D_CPUFREQ=y CONFIG_CPU_IDLE=y @@ -61,8 +59,6 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y CONFIG_VLAN_8021Q=y CONFIG_LLC2=y CONFIG_CAN=y @@ -194,10 +190,10 @@ CONFIG_GPIO_SYSFS=y CONFIG_GPIO_MAX732X=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_74X164=y -CONFIG_POWER_SUPPLY=y -CONFIG_SABRESD_MAX8903=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y +CONFIG_POWER_SUPPLY=y +CONFIG_SABRESD_MAX8903=y CONFIG_SENSORS_MAX17135=y CONFIG_SENSORS_MAG3110=y CONFIG_THERMAL=y @@ -244,14 +240,12 @@ 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 CONFIG_VIDEO_CODA=y CONFIG_RADIO_SI476X=y CONFIG_SOC_CAMERA_OV2640=y CONFIG_DRM=y CONFIG_DRM_VIVANTE=y -CONFIG_FB=y CONFIG_FB_MXS=y CONFIG_FB_MXC_SYNC_PANEL=y CONFIG_FB_MXC_MIPI_DSI=y @@ -271,7 +265,6 @@ CONFIG_LCD_L4F00242T03=y CONFIG_LCD_PLATFORM=y CONFIG_BACKLIGHT_PWM=y CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_LOGO=y CONFIG_SOUND=y CONFIG_SND=y @@ -293,7 +286,6 @@ CONFIG_SND_SOC_IMX_HDMI=y CONFIG_SND_SIMPLE_CARD=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 @@ -353,10 +345,10 @@ CONFIG_RTC_DRV_MC13XXX=y CONFIG_RTC_DRV_MXC=y CONFIG_RTC_DRV_SNVS=y CONFIG_DMADEVICES=y -CONFIG_MXC_PXP_V2=y -CONFIG_MXC_PXP_V3=y CONFIG_IMX_SDMA=y CONFIG_MXS_DMA=y +CONFIG_MXC_PXP_V2=y +CONFIG_MXC_PXP_V3=y CONFIG_DMATEST=m CONFIG_STAGING=y CONFIG_STAGING_MEDIA=y @@ -373,9 +365,6 @@ CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set @@ -400,7 +389,6 @@ CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_15=m CONFIG_NLS_UTF8=y -CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_BUGVERBOSE is not set @@ -423,9 +411,7 @@ CONFIG_CRYPTO_TGR192=y CONFIG_CRYPTO_WP512=y CONFIG_CRYPTO_BLOWFISH=y CONFIG_CRYPTO_CAMELLIA=y -CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_TWOFISH=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_FSL_CAAM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y diff --git a/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb b/recipes-kernel/linux/linux-fslc-imx_4.9-1.0.x.bb similarity index 78% rename from recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb rename to recipes-kernel/linux/linux-fslc-imx_4.9-1.0.x.bb index f6709ed1..aff27bbf 100644 --- a/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb +++ b/recipes-kernel/linux/linux-fslc-imx_4.9-1.0.x.bb @@ -2,7 +2,7 @@ # Released under the MIT license (see COPYING.MIT for the terms) SUMMARY = "FSL Community BSP i.MX Linux kernel with backported features and fixes" -DESCRIPTION = "Linux kernel based on NXP 4.1.15-1.2.0 GA release, used by FSL Community BSP in order to \ +DESCRIPTION = "Linux kernel based on NXP 4.9.11-1.0.0 GA release, used by FSL Community BSP in order to \ provide support for i.MX based platforms and include official Linux kernel stable updates, backported \ features and fixes coming from the vendors, kernel community or FSL Community itself." @@ -10,7 +10,7 @@ include linux-fslc.inc PV .= "+git${SRCPV}" -SRCBRANCH = "4.1-2.0.x-imx" -SRCREV = "6c1ad49339f46ff453d6f07be7d63fd495069bfe" +SRCBRANCH = "4.9-1.0.x-imx" +SRCREV = "953c6e30c9701fda69ef08e2476c541dc4fb1453" COMPATIBLE_MACHINE = "(mx6|mx7)" -- 2.40.1