[meta-freescale] [meta-fsl-arm][PATCH] linux-imx-rt: Upgrade to 3.10.31-1.1.0 beta
Jacob Kroon
jacob.kroon at mikrodidakt.se
Sun Dec 21 06:06:59 PST 2014
Rebase onto kernel 3.10.31-1.1.0 beta from Freescale.
Except the kernel update there are no significant changes
other than refreshing patches and aligning defconfig.
Signed-off-by: Jacob Kroon <jacob.kroon at mikrodidakt.se>
---
.../linux-imx-rt-3.10.17/0001-fix-build.patch | 139 ---------------------
.../0002-fix-build-with-rt-enabled.patch | 111 ----------------
.../linux-imx-rt-3.10.31/0001-fix-build.patch | 57 +++++++++
.../0002-fix-build-with-rt-enabled.patch | 19 +++
.../0003-no-split-ptlocks.patch | 0
.../mx6/defconfig | 15 ++-
...x-imx-rt_3.10.17.bb => linux-imx-rt_3.10.31.bb} | 18 +--
7 files changed, 98 insertions(+), 261 deletions(-)
delete mode 100644 recipes-kernel/linux/linux-imx-rt-3.10.17/0001-fix-build.patch
delete mode 100644 recipes-kernel/linux/linux-imx-rt-3.10.17/0002-fix-build-with-rt-enabled.patch
create mode 100644 recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch
create mode 100644 recipes-kernel/linux/linux-imx-rt-3.10.31/0002-fix-build-with-rt-enabled.patch
rename recipes-kernel/linux/{linux-imx-rt-3.10.17 => linux-imx-rt-3.10.31}/0003-no-split-ptlocks.patch (100%)
rename recipes-kernel/linux/{linux-imx-rt-3.10.17 => linux-imx-rt-3.10.31}/mx6/defconfig (96%)
rename recipes-kernel/linux/{linux-imx-rt_3.10.17.bb => linux-imx-rt_3.10.31.bb} (58%)
diff --git a/recipes-kernel/linux/linux-imx-rt-3.10.17/0001-fix-build.patch b/recipes-kernel/linux/linux-imx-rt-3.10.17/0001-fix-build.patch
deleted file mode 100644
index 8d9ed83..0000000
--- a/recipes-kernel/linux/linux-imx-rt-3.10.17/0001-fix-build.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Fix the build errors listed below
-
-Upstream-Status: Inappropriate [other]
-Freescale does not currently support the real-time kernel
-
-Signed-off-by: Jacob Kroon <jacob.kroon at mikrodidakt.se>
-
- CC drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.o
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c: In function 'gckOS_WaitSignal':
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:7835:5: error: passing argument 1 of 'spin_lock_irq' from incompatible pointer type [-Werror]
- spin_lock_irq(&signal->obj.wait.lock);
- ^
-In file included from include/linux/seqlock.h:29:0,
- from include/linux/time.h:5,
- from include/linux/stat.h:18,
- from include/linux/module.h:10,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:27,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:22:
-include/linux/spinlock.h:316:20: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
- static inline void spin_lock_irq(spinlock_t *lock)
- ^
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:7867:9: error: passing argument 1 of '__add_wait_queue_tail' from incompatible pointer type [-Werror]
- __add_wait_queue_tail(&signal->obj.wait, &wait);
- ^
-In file included from include/linux/mmzone.h:9:0,
- from include/linux/gfp.h:4,
- from include/linux/kmod.h:22,
- from include/linux/module.h:13,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:27,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:22:
-include/linux/wait.h:120:20: note: expected 'struct wait_queue_head_t *' but argument is of type 'struct swait_head *'
- static inline void __add_wait_queue_tail(wait_queue_head_t *head,
- ^
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:7879:13: error: passing argument 1 of 'spin_unlock_irq' from incompatible pointer type [-Werror]
- spin_unlock_irq(&signal->obj.wait.lock);
- ^
-In file included from include/linux/seqlock.h:29:0,
- from include/linux/time.h:5,
- from include/linux/stat.h:18,
- from include/linux/module.h:10,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:27,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:22:
-include/linux/spinlock.h:341:20: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
- static inline void spin_unlock_irq(spinlock_t *lock)
- ^
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:7881:13: error: passing argument 1 of 'spin_lock_irq' from incompatible pointer type [-Werror]
- spin_lock_irq(&signal->obj.wait.lock);
- ^
-In file included from include/linux/seqlock.h:29:0,
- from include/linux/time.h:5,
- from include/linux/stat.h:18,
- from include/linux/module.h:10,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:27,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:22:
-include/linux/spinlock.h:316:20: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
- static inline void spin_lock_irq(spinlock_t *lock)
- ^
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:7945:9: error: passing argument 1 of '__remove_wait_queue' from incompatible pointer type [-Werror]
- __remove_wait_queue(&signal->obj.wait, &wait);
- ^
-In file included from include/linux/mmzone.h:9:0,
- from include/linux/gfp.h:4,
- from include/linux/kmod.h:22,
- from include/linux/module.h:13,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:27,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:22:
-include/linux/wait.h:133:20: note: expected 'struct wait_queue_head_t *' but argument is of type 'struct swait_head *'
- static inline void __remove_wait_queue(wait_queue_head_t *head,
- ^
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:7958:5: error: passing argument 1 of 'spin_unlock_irq' from incompatible pointer type [-Werror]
- spin_unlock_irq(&signal->obj.wait.lock);
- ^
-In file included from include/linux/seqlock.h:29:0,
- from include/linux/time.h:5,
- from include/linux/stat.h:18,
- from include/linux/module.h:10,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:27,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:22:
-include/linux/spinlock.h:341:20: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
- static inline void spin_unlock_irq(spinlock_t *lock)
- ^
-cc1: all warnings being treated as errors
-make[4]: *** [drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.o] Error 1
-
-Index: git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
-===================================================================
---- git.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
-+++ git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
-@@ -7832,7 +7832,7 @@ gckOS_WaitSignal(
-
- might_sleep();
-
-- spin_lock_irq(&signal->obj.wait.lock);
-+ raw_spin_lock_irq(&signal->obj.wait.lock);
-
- if (signal->obj.done)
- {
-@@ -7862,9 +7862,8 @@ gckOS_WaitSignal(
- : Wait * HZ / 1000;
- #endif
-
-- DECLARE_WAITQUEUE(wait, current);
-- wait.flags |= WQ_FLAG_EXCLUSIVE;
-- __add_wait_queue_tail(&signal->obj.wait, &wait);
-+ DEFINE_SWAITER(wait);
-+ swait_prepare_locked(&signal->obj.wait, &wait);
-
- while (gcvTRUE)
- {
-@@ -7876,9 +7875,9 @@ gckOS_WaitSignal(
- }
-
- __set_current_state(TASK_INTERRUPTIBLE);
-- spin_unlock_irq(&signal->obj.wait.lock);
-+ raw_spin_unlock_irq(&signal->obj.wait.lock);
- timeout = schedule_timeout(timeout);
-- spin_lock_irq(&signal->obj.wait.lock);
-+ raw_spin_lock_irq(&signal->obj.wait.lock);
-
- if (signal->obj.done)
- {
-@@ -7942,7 +7941,7 @@ gckOS_WaitSignal(
- }
- }
-
-- __remove_wait_queue(&signal->obj.wait, &wait);
-+ swait_finish_locked(&signal->obj.wait, &wait);
-
- #if gcdDETECT_TIMEOUT
- if (complained)
-@@ -7955,7 +7954,7 @@ gckOS_WaitSignal(
- #endif
- }
-
-- spin_unlock_irq(&signal->obj.wait.lock);
-+ raw_spin_unlock_irq(&signal->obj.wait.lock);
-
- OnError:
- /* Return status. */
diff --git a/recipes-kernel/linux/linux-imx-rt-3.10.17/0002-fix-build-with-rt-enabled.patch b/recipes-kernel/linux/linux-imx-rt-3.10.17/0002-fix-build-with-rt-enabled.patch
deleted file mode 100644
index 6132b3b..0000000
--- a/recipes-kernel/linux/linux-imx-rt-3.10.17/0002-fix-build-with-rt-enabled.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Fix the build errors listed below, when PREEMPT_RT_FULL is enabled
-
-Upstream-Status: Pending
-
-Signed-off-by: Jacob Kroon <jacob.kroon at mikrodidakt.se>
-
- CC drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.o
-In file included from include/linux/seqlock.h:29:0,
- from include/linux/time.h:5,
- from include/linux/stat.h:18,
- from include/linux/module.h:10,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:27,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:22:
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c: In function 'gckOS_CreateMutex':
-include/linux/mutex_rt.h:74:24: error: dereferencing 'void *' pointer [-Werror]
- rt_mutex_init(&(mutex)->lock); \
- ^
-include/linux/spinlock.h:104:9: note: in definition of macro 'raw_spin_lock_init'
- do { *(lock) = __RAW_SPIN_LOCK_UNLOCKED(lock); } while (0)
- ^
-include/linux/mutex_rt.h:74:2: note: in expansion of macro 'rt_mutex_init'
- rt_mutex_init(&(mutex)->lock); \
- ^
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:3046:5: note: in expansion of macro 'mutex_init'
- mutex_init(*Mutex);
- ^
-include/linux/mutex_rt.h:74:24: error: request for member 'lock' in something not a structure or union
- rt_mutex_init(&(mutex)->lock); \
- ^
-include/linux/spinlock.h:104:9: note: in definition of macro 'raw_spin_lock_init'
- do { *(lock) = __RAW_SPIN_LOCK_UNLOCKED(lock); } while (0)
- ^
-include/linux/mutex_rt.h:74:2: note: in expansion of macro 'rt_mutex_init'
- rt_mutex_init(&(mutex)->lock); \
- ^
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:3046:5: note: in expansion of macro 'mutex_init'
- mutex_init(*Mutex);
- ^
-In file included from include/linux/spinlock_types.h:18:0,
- from include/linux/spinlock.h:81,
- from include/linux/seqlock.h:29,
- from include/linux/time.h:5,
- from include/linux/stat.h:18,
- from include/linux/module.h:10,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:27,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:22:
-include/linux/mutex_rt.h:74:24: error: dereferencing 'void *' pointer [-Werror]
- rt_mutex_init(&(mutex)->lock); \
- ^
-include/linux/mutex_rt.h:74:2: note: in expansion of macro 'rt_mutex_init'
- rt_mutex_init(&(mutex)->lock); \
- ^
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:3046:5: note: in expansion of macro 'mutex_init'
- mutex_init(*Mutex);
- ^
-include/linux/mutex_rt.h:74:24: error: request for member 'lock' in something not a structure or union
- rt_mutex_init(&(mutex)->lock); \
- ^
-include/linux/mutex_rt.h:74:2: note: in expansion of macro 'rt_mutex_init'
- rt_mutex_init(&(mutex)->lock); \
- ^
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:3046:5: note: in expansion of macro 'mutex_init'
- mutex_init(*Mutex);
- ^
-In file included from include/linux/mutex.h:28:0,
- from include/linux/notifier.h:13,
- from include/linux/memory_hotplug.h:6,
- from include/linux/mmzone.h:771,
- from include/linux/gfp.h:4,
- from include/linux/kmod.h:22,
- from include/linux/module.h:13,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:27,
- from drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:22:
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c: In function 'gckOS_DeleteMutex':
-include/linux/mutex_rt.h:46:48: error: dereferencing 'void *' pointer [-Werror]
- #define mutex_destroy(l) rt_mutex_destroy(&(l)->lock)
- ^
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:3091:5: note: in expansion of macro 'mutex_destroy'
- mutex_destroy(Mutex);
- ^
-include/linux/mutex_rt.h:46:48: error: request for member 'lock' in something not a structure or union
- #define mutex_destroy(l) rt_mutex_destroy(&(l)->lock)
- ^
-drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:3091:5: note: in expansion of macro 'mutex_destroy'
- mutex_destroy(Mutex);
- ^
-cc1: all warnings being treated as errors
-make[4]: *** [drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.o] Error 1
-
-Index: git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
-===================================================================
---- git.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
-+++ git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
-@@ -3043,7 +3043,7 @@ gckOS_CreateMutex(
- gcmkONERROR(gckOS_Allocate(Os, gcmSIZEOF(struct mutex), Mutex));
-
- /* Initialize the mutex. */
-- mutex_init(*Mutex);
-+ mutex_init((struct mutex*)*Mutex);
-
- /* Return status. */
- gcmkFOOTER_ARG("*Mutex=0x%X", *Mutex);
-@@ -3088,7 +3088,7 @@ gckOS_DeleteMutex(
- gcmkVERIFY_ARGUMENT(Mutex != gcvNULL);
-
- /* Destroy the mutex. */
-- mutex_destroy(Mutex);
-+ mutex_destroy((struct mutex*)Mutex);
-
- /* Free the mutex structure. */
- gcmkONERROR(gckOS_Free(Os, Mutex));
diff --git a/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch b/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch
new file mode 100644
index 0000000..ffc6b74
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch
@@ -0,0 +1,57 @@
+Fix build errors when RT patch is applied
+
+Upstream-Status: Inappropriate [other]
+Freescale does not support the RT patch
+
+Signed-off-by: Jacob Kroon <jacob.kroon at mikrodidakt.se>
+
+Index: git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
+===================================================================
+--- git.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
++++ git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
+@@ -7746,7 +7746,7 @@ gckOS_WaitSignal(
+
+ might_sleep();
+
+- spin_lock_irq(&signal->obj.wait.lock);
++ raw_spin_lock_irq(&signal->obj.wait.lock);
+
+ if (signal->obj.done)
+ {
+@@ -7768,9 +7768,8 @@ gckOS_WaitSignal(
+ ? MAX_SCHEDULE_TIMEOUT
+ : Wait * HZ / 1000;
+
+- DECLARE_WAITQUEUE(wait, current);
+- wait.flags |= WQ_FLAG_EXCLUSIVE;
+- __add_wait_queue_tail(&signal->obj.wait, &wait);
++ DEFINE_SWAITER(wait);
++ swait_prepare_locked(&signal->obj.wait, &wait);
+
+ while (gcvTRUE)
+ {
+@@ -7782,9 +7781,9 @@ gckOS_WaitSignal(
+ }
+
+ __set_current_state(TASK_INTERRUPTIBLE);
+- spin_unlock_irq(&signal->obj.wait.lock);
++ raw_spin_unlock_irq(&signal->obj.wait.lock);
+ timeout = schedule_timeout(timeout);
+- spin_lock_irq(&signal->obj.wait.lock);
++ raw_spin_lock_irq(&signal->obj.wait.lock);
+
+ if (signal->obj.done)
+ {
+@@ -7805,10 +7804,10 @@ gckOS_WaitSignal(
+ }
+ }
+
+- __remove_wait_queue(&signal->obj.wait, &wait);
++ swait_finish_locked(&signal->obj.wait, &wait);
+ }
+
+- spin_unlock_irq(&signal->obj.wait.lock);
++ raw_spin_unlock_irq(&signal->obj.wait.lock);
+
+ OnError:
+ /* Return status. */
diff --git a/recipes-kernel/linux/linux-imx-rt-3.10.31/0002-fix-build-with-rt-enabled.patch b/recipes-kernel/linux/linux-imx-rt-3.10.31/0002-fix-build-with-rt-enabled.patch
new file mode 100644
index 0000000..83652c9
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-rt-3.10.31/0002-fix-build-with-rt-enabled.patch
@@ -0,0 +1,19 @@
+Fix build error when PREEMPT_RT_FULL is enabled
+
+Upstream-Status: Pending
+
+Signed-off-by: Jacob Kroon <jacob.kroon at mikrodidakt.se>
+
+Index: git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
+===================================================================
+--- git.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
++++ git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
+@@ -3266,7 +3266,7 @@ gckOS_CreateMutex(
+ gcmkONERROR(gckOS_Allocate(Os, gcmSIZEOF(struct mutex), Mutex));
+
+ /* Initialize the mutex. */
+- mutex_init(*Mutex);
++ mutex_init((struct mutex*)*Mutex);
+
+ /* Return status. */
+ gcmkFOOTER_ARG("*Mutex=0x%X", *Mutex);
diff --git a/recipes-kernel/linux/linux-imx-rt-3.10.17/0003-no-split-ptlocks.patch b/recipes-kernel/linux/linux-imx-rt-3.10.31/0003-no-split-ptlocks.patch
similarity index 100%
rename from recipes-kernel/linux/linux-imx-rt-3.10.17/0003-no-split-ptlocks.patch
rename to recipes-kernel/linux/linux-imx-rt-3.10.31/0003-no-split-ptlocks.patch
diff --git a/recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig b/recipes-kernel/linux/linux-imx-rt-3.10.31/mx6/defconfig
similarity index 96%
rename from recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig
rename to recipes-kernel/linux/linux-imx-rt-3.10.31/mx6/defconfig
index 1d38f4e..eb0b6ae 100644
--- a/recipes-kernel/linux/linux-imx-rt-3.10.17/mx6/defconfig
+++ b/recipes-kernel/linux/linux-imx-rt-3.10.31/mx6/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
@@ -26,6 +25,7 @@ CONFIG_MACH_EUKREA_CPUIMX51SD=y
CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SX=y
CONFIG_SOC_VF610=y
# CONFIG_SWP_EMULATE is not set
CONFIG_SMP=y
@@ -58,8 +58,10 @@ CONFIG_IP_PNP_DHCP=y
CONFIG_IPV6=y
CONFIG_NETFILTER=y
CONFIG_VLAN_8021Q=y
+CONFIG_LLC2=y
CONFIG_CAN=y
CONFIG_CAN_FLEXCAN=y
+CONFIG_CAN_M_CAN=y
CONFIG_CFG80211=y
CONFIG_CFG80211_WEXT=y
CONFIG_MAC80211=y
@@ -85,6 +87,8 @@ CONFIG_MTD_SST25L=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_NAND_MXC=y
+CONFIG_MTD_SPI_NOR_BASE=y
+CONFIG_SPI_FSL_QUADSPI=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
@@ -124,6 +128,7 @@ CONFIG_ATH6KL_SDIO=m
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m
CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_SNVS_PWRKEY=y
CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ELANTECH=y
@@ -154,6 +159,7 @@ CONFIG_I2C_IMX=y
CONFIG_SPI=y
CONFIG_SPI_IMX=y
CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX732X=y
CONFIG_POWER_SUPPLY=y
CONFIG_SABRESD_MAX8903=y
CONFIG_IMX6_USB_CHARGER=y
@@ -192,6 +198,7 @@ CONFIG_MXC_CAMERA_OV5640=m
CONFIG_MXC_CAMERA_OV5642=m
CONFIG_MXC_CAMERA_OV5640_MIPI=m
CONFIG_MXC_TVIN_ADV7180=m
+CONFIG_MXC_VADC=m
CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
CONFIG_VIDEO_MXC_IPU_OUTPUT=y
CONFIG_VIDEO_MXC_PXP_V4L2=y
@@ -216,6 +223,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_FB_MXC_DCIC=m
CONFIG_HANNSTAR_CABC=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
@@ -236,18 +244,19 @@ CONFIG_SND_SOC_IMX_SPDIF=y
CONFIG_SND_SOC_IMX_MC13783=y
CONFIG_SND_SOC_IMX_HDMI=y
CONFIG_SND_SOC_IMX_SI476X=y
+CONFIG_SND_SOC_CS42XX8_I2C=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
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
CONFIG_USB_ETH=m
+CONFIG_USB_G_NCM=m
CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_G_SERIAL=m
CONFIG_MMC=y
@@ -277,6 +286,8 @@ CONFIG_MXS_DMA=y
CONFIG_STAGING=y
CONFIG_COMMON_CLK_DEBUG=y
# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_IIO=y
+CONFIG_VF610_ADC=y
CONFIG_PWM=y
CONFIG_PWM_IMX=y
CONFIG_EXT2_FS=y
diff --git a/recipes-kernel/linux/linux-imx-rt_3.10.17.bb b/recipes-kernel/linux/linux-imx-rt_3.10.31.bb
similarity index 58%
rename from recipes-kernel/linux/linux-imx-rt_3.10.17.bb
rename to recipes-kernel/linux/linux-imx-rt_3.10.31.bb
index efad6d8..b41bccf 100644
--- a/recipes-kernel/linux/linux-imx-rt_3.10.17.bb
+++ b/recipes-kernel/linux/linux-imx-rt_3.10.31.bb
@@ -1,4 +1,4 @@
-# Adapted from linux-imx_3.10.17.bb
+# Adapted from linux-imx_3.10.31.bb
SUMMARY = "Linux real-time kernel based on linux-imx"
DESCRIPTION = "Linux kernel that is based on Freescale's linux-imx, \
@@ -9,18 +9,18 @@ require recipes-kernel/linux/linux-dtb.inc
DEPENDS += "lzop-native bc-native"
-SRCBRANCH = "imx_3.10.17_1.0.0_ga"
-SRCREV = "33597e348b2d60dd5c71890ef7b7d3d3fd6e4e97"
-LOCALVERSION = "-1.0.2_ga"
-
-COMPATIBLE_MACHINE = "(mx6)"
+SRCBRANCH = "imx_3.10.31_1.1.0_beta2"
+SRCREV = "30ad12bdf93050a5bae1345bd40dba5f2d63f70f"
+LOCALVERSION = "-1.1.0_beta2"
SRC_URI += "\
- https://www.kernel.org/pub/linux/kernel/projects/rt/3.10/older/patch-3.10.17-rt12.patch.bz2;name=rt-patch1 \
+ https://www.kernel.org/pub/linux/kernel/projects/rt/3.10/older/patch-3.10.27-rt25.patch.gz;name=rt-patch1 \
file://0001-fix-build.patch \
file://0002-fix-build-with-rt-enabled.patch \
file://0003-no-split-ptlocks.patch \
"
-SRC_URI[rt-patch1.md5sum] = "77a28c8b20b01f280dcd860e606a6edd"
-SRC_URI[rt-patch1.sha256sum] = "ce219268f08eecccb39ff2b5be83657d53ca67cb1c6b81021494075197190351"
+SRC_URI[rt-patch1.md5sum] = "aa231425f2a43220b5e8dbb057c7e5f9"
+SRC_URI[rt-patch1.sha256sum] = "5fbee5cdf260db9b7751651ab141fb59f46d68c7aecfc32e81a2b5d702f47aac"
+
+COMPATIBLE_MACHINE = "(mx6)"
--
1.9.3
More information about the meta-freescale
mailing list