summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@mikrodidakt.se>2014-04-30 16:13:55 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2014-05-01 16:07:42 -0300
commitc91ef2d2a12cd51af20011a4de8d9438e2d4890e (patch)
treed54ec574543cbffe60514114457db9577170942f
parent69d64d32b036368858c184c8e17f10d9714aef83 (diff)
downloadmeta-fsl-arm-c91ef2d2a12cd51af20011a4de8d9438e2d4890e.tar.gz
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 <jacob.kroon@mikrodidakt.se> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig27
-rw-r--r--recipes-kernel/linux/linux-imx-rt_3.10.17.bb6
2 files changed, 29 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig b/recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig
index dd002e7..58eeda5 100644
--- a/recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig
+++ b/recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig
@@ -32,6 +32,7 @@ CONFIG_VMSPLIT_2G=y
32CONFIG_PREEMPT_RT_FULL=y 32CONFIG_PREEMPT_RT_FULL=y
33CONFIG_AEABI=y 33CONFIG_AEABI=y
34# CONFIG_OABI_COMPAT is not set 34# CONFIG_OABI_COMPAT is not set
35CONFIG_HIGHMEM=y
35CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" 36CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
36CONFIG_CPU_FREQ=y 37CONFIG_CPU_FREQ=y
37CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y 38CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
@@ -69,7 +70,7 @@ CONFIG_DEVTMPFS=y
69CONFIG_DEVTMPFS_MOUNT=y 70CONFIG_DEVTMPFS_MOUNT=y
70# CONFIG_STANDALONE is not set 71# CONFIG_STANDALONE is not set
71CONFIG_CMA=y 72CONFIG_CMA=y
72CONFIG_CMA_SIZE_MBYTES=256 73CONFIG_CMA_SIZE_MBYTES=320
73CONFIG_IMX_WEIM=y 74CONFIG_IMX_WEIM=y
74CONFIG_CONNECTOR=y 75CONFIG_CONNECTOR=y
75CONFIG_MTD=y 76CONFIG_MTD=y
@@ -146,6 +147,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y
146CONFIG_SERIAL_FSL_LPUART=y 147CONFIG_SERIAL_FSL_LPUART=y
147CONFIG_SERIAL_FSL_LPUART_CONSOLE=y 148CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
148CONFIG_FSL_OTP=y 149CONFIG_FSL_OTP=y
150CONFIG_MXS_VIIM=y
149# CONFIG_I2C_COMPAT is not set 151# CONFIG_I2C_COMPAT is not set
150CONFIG_I2C_CHARDEV=y 152CONFIG_I2C_CHARDEV=y
151# CONFIG_I2C_HELPER_AUTO is not set 153# CONFIG_I2C_HELPER_AUTO is not set
@@ -217,6 +219,7 @@ CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
217CONFIG_FB_MXC_HDMI=y 219CONFIG_FB_MXC_HDMI=y
218CONFIG_FB_MXC_EINK_PANEL=y 220CONFIG_FB_MXC_EINK_PANEL=y
219CONFIG_FB_MXS_SII902X=y 221CONFIG_FB_MXS_SII902X=y
222CONFIG_HANNSTAR_CABC=y
220CONFIG_FRAMEBUFFER_CONSOLE=y 223CONFIG_FRAMEBUFFER_CONSOLE=y
221CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 224CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
222CONFIG_FONTS=y 225CONFIG_FONTS=y
@@ -243,6 +246,7 @@ CONFIG_USB_CHIPIDEA=y
243CONFIG_USB_CHIPIDEA_UDC=y 246CONFIG_USB_CHIPIDEA_UDC=y
244CONFIG_USB_CHIPIDEA_HOST=y 247CONFIG_USB_CHIPIDEA_HOST=y
245CONFIG_USB_PHY=y 248CONFIG_USB_PHY=y
249CONFIG_NOP_USB_XCEIV=y
246CONFIG_USB_MXS_PHY=y 250CONFIG_USB_MXS_PHY=y
247CONFIG_USB_GADGET=y 251CONFIG_USB_GADGET=y
248CONFIG_USB_ZERO=m 252CONFIG_USB_ZERO=m
@@ -261,6 +265,9 @@ CONFIG_MXC_MIPI_CSI2=y
261CONFIG_MXC_MLB150=m 265CONFIG_MXC_MLB150=m
262CONFIG_NEW_LEDS=y 266CONFIG_NEW_LEDS=y
263CONFIG_LEDS_CLASS=y 267CONFIG_LEDS_CLASS=y
268CONFIG_LEDS_GPIO=y
269CONFIG_LEDS_TRIGGERS=y
270CONFIG_LEDS_TRIGGER_GPIO=y
264CONFIG_RTC_CLASS=y 271CONFIG_RTC_CLASS=y
265CONFIG_RTC_INTF_DEV_UIE_EMUL=y 272CONFIG_RTC_INTF_DEV_UIE_EMUL=y
266CONFIG_RTC_DRV_MC13XXX=y 273CONFIG_RTC_DRV_MC13XXX=y
@@ -315,12 +322,30 @@ CONFIG_MAGIC_SYSRQ=y
315# CONFIG_FTRACE is not set 322# CONFIG_FTRACE is not set
316CONFIG_SECURITYFS=y 323CONFIG_SECURITYFS=y
317CONFIG_CRYPTO_USER=y 324CONFIG_CRYPTO_USER=y
325CONFIG_CRYPTO_TEST=m
318CONFIG_CRYPTO_CCM=y 326CONFIG_CRYPTO_CCM=y
319CONFIG_CRYPTO_GCM=y 327CONFIG_CRYPTO_GCM=y
320CONFIG_CRYPTO_CBC=y 328CONFIG_CRYPTO_CBC=y
321CONFIG_CRYPTO_CTS=y 329CONFIG_CRYPTO_CTS=y
322CONFIG_CRYPTO_ECB=y 330CONFIG_CRYPTO_ECB=y
323CONFIG_CRYPTO_LRW=y 331CONFIG_CRYPTO_LRW=y
332CONFIG_CRYPTO_XTS=y
333CONFIG_CRYPTO_MD4=y
334CONFIG_CRYPTO_MD5=y
335CONFIG_CRYPTO_MICHAEL_MIC=y
336CONFIG_CRYPTO_RMD128=y
337CONFIG_CRYPTO_RMD160=y
338CONFIG_CRYPTO_RMD256=y
339CONFIG_CRYPTO_RMD320=y
340CONFIG_CRYPTO_SHA1=y
341CONFIG_CRYPTO_SHA256=y
342CONFIG_CRYPTO_SHA512=y
343CONFIG_CRYPTO_TGR192=y
344CONFIG_CRYPTO_WP512=y
345CONFIG_CRYPTO_BLOWFISH=y
346CONFIG_CRYPTO_CAMELLIA=y
347CONFIG_CRYPTO_DES=y
348CONFIG_CRYPTO_TWOFISH=y
324# CONFIG_CRYPTO_ANSI_CPRNG is not set 349# CONFIG_CRYPTO_ANSI_CPRNG is not set
325CONFIG_CRYPTO_DEV_FSL_CAAM=y 350CONFIG_CRYPTO_DEV_FSL_CAAM=y
326CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y 351CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
diff --git a/recipes-kernel/linux/linux-imx-rt_3.10.17.bb b/recipes-kernel/linux/linux-imx-rt_3.10.17.bb
index 31271ed..35c7d30 100644
--- a/recipes-kernel/linux/linux-imx-rt_3.10.17.bb
+++ b/recipes-kernel/linux/linux-imx-rt_3.10.17.bb
@@ -9,9 +9,9 @@ with added real-time capabilities."
9 9
10DEPENDS += "lzop-native bc-native" 10DEPENDS += "lzop-native bc-native"
11 11
12SRCBRANCH = "imx_3.10.17_1.0.0_beta" 12SRCBRANCH = "imx_3.10.17_1.0.0_ga"
13SRCREV = "ec1af9f898d234001d8fc7d720382de34cb6580f" 13SRCREV = "232293e0abb46639e188ab9d8643f1dbf94534f6"
14LOCALVERSION = "-1.0.0_beta" 14LOCALVERSION = "-1.0.0_ga"
15 15
16COMPATIBLE_MACHINE = "(mx6)" 16COMPATIBLE_MACHINE = "(mx6)"
17 17