From 06a35eae30a4c7b7d20bd208bf1cc3bdfa50dfb2 Mon Sep 17 00:00:00 2001 From: Jacob Kroon Date: Wed, 30 Apr 2014 16:13:55 +0200 Subject: [PATCH] linux-imx-rt: Upgrade to 3.10.17-1.0.0 GA - Align defconfig with linux-imx 3.10.17-1.0.0 GA release - No patches dropped, they are all still required Signed-off-by: Jacob Kroon Signed-off-by: Otavio Salvador --- .../linux/linux-imx-rt-3.10.17/mx6/defconfig | 27 ++++++++++++++++++- .../linux/linux-imx-rt_3.10.17.bb | 6 ++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig index dd002e7f..58eeda51 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig @@ -32,6 +32,7 @@ CONFIG_VMSPLIT_2G=y CONFIG_PREEMPT_RT_FULL=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set +CONFIG_HIGHMEM=y CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y @@ -69,7 +70,7 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set CONFIG_CMA=y -CONFIG_CMA_SIZE_MBYTES=256 +CONFIG_CMA_SIZE_MBYTES=320 CONFIG_IMX_WEIM=y CONFIG_CONNECTOR=y CONFIG_MTD=y @@ -146,6 +147,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_FSL_LPUART=y CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_FSL_OTP=y +CONFIG_MXS_VIIM=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y # CONFIG_I2C_HELPER_AUTO is not set @@ -217,6 +219,7 @@ CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y CONFIG_FB_MXC_HDMI=y CONFIG_FB_MXC_EINK_PANEL=y CONFIG_FB_MXS_SII902X=y +CONFIG_HANNSTAR_CABC=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FONTS=y @@ -243,6 +246,7 @@ CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=y CONFIG_USB_MXS_PHY=y CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m @@ -261,6 +265,9 @@ CONFIG_MXC_MIPI_CSI2=y CONFIG_MXC_MLB150=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_RTC_CLASS=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y CONFIG_RTC_DRV_MC13XXX=y @@ -315,12 +322,30 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_FTRACE is not set CONFIG_SECURITYFS=y CONFIG_CRYPTO_USER=y +CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LRW=y +CONFIG_CRYPTO_XTS=y +CONFIG_CRYPTO_MD4=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_RMD128=y +CONFIG_CRYPTO_RMD160=y +CONFIG_CRYPTO_RMD256=y +CONFIG_CRYPTO_RMD320=y +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +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 diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.10.17.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.10.17.bb index 31271ed4..35c7d300 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.10.17.bb +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-rt_3.10.17.bb @@ -9,9 +9,9 @@ with added real-time capabilities." DEPENDS += "lzop-native bc-native" -SRCBRANCH = "imx_3.10.17_1.0.0_beta" -SRCREV = "ec1af9f898d234001d8fc7d720382de34cb6580f" -LOCALVERSION = "-1.0.0_beta" +SRCBRANCH = "imx_3.10.17_1.0.0_ga" +SRCREV = "232293e0abb46639e188ab9d8643f1dbf94534f6" +LOCALVERSION = "-1.0.0_ga" COMPATIBLE_MACHINE = "(mx6)" -- 2.40.1