mirror of
https://github.com/Freescale/meta-freescale-3rdparty.git
synced 2025-07-19 20:19:01 +02:00
linux-congatec-rt: Upgrade to 3.10.31-1.1.0 Beta 2
Update based on linux-imx-rt 3.10.31 Signed-off-by: Raphael Silva <raphael.philipe@ossystems.com.br> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
parent
b90378d8e2
commit
6054ad663a
|
@ -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@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. */
|
|
@ -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@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));
|
|
@ -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@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. */
|
|
@ -0,0 +1,19 @@
|
|||
Fix build error when PREEMPT_RT_FULL is enabled
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Jacob Kroon <jacob.kroon@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);
|
|
@ -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
|
||||
|
@ -134,6 +139,7 @@ CONFIG_TOUCHSCREEN_MAX11801=y
|
|||
CONFIG_TOUCHSCREEN_MC13783=y
|
||||
CONFIG_INPUT_MISC=y
|
||||
CONFIG_INPUT_MMA8450=y
|
||||
CONFIG_INPUT_PWM_BEEPER=y
|
||||
CONFIG_INPUT_ISL29023=y
|
||||
CONFIG_SERIO_SERPORT=m
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
@ -147,6 +153,8 @@ CONFIG_FSL_OTP=y
|
|||
CONFIG_MXS_VIIM=y
|
||||
# CONFIG_I2C_COMPAT is not set
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MUX=y
|
||||
CONFIG_I2C_MUX_GPIO=y
|
||||
# CONFIG_I2C_HELPER_AUTO is not set
|
||||
CONFIG_I2C_ALGOPCF=m
|
||||
CONFIG_I2C_ALGOPCA=m
|
||||
|
@ -192,6 +200,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 +225,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
|
||||
|
@ -248,6 +258,7 @@ 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
|
||||
|
@ -267,6 +278,7 @@ CONFIG_LEDS_TRIGGERS=y
|
|||
CONFIG_LEDS_TRIGGER_GPIO=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
|
||||
CONFIG_RTC_DRV_M41T80=y
|
||||
CONFIG_RTC_DRV_MC13XXX=y
|
||||
CONFIG_RTC_DRV_MXC=y
|
||||
CONFIG_RTC_DRV_SNVS=y
|
||||
|
@ -277,6 +289,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
|
|
@ -1,4 +1,4 @@
|
|||
# Congatec QMX6 Linux/kernel PREEMPT_RT, based on linux-imx-rt_3.10.17.bb
|
||||
# Congatec QMX6 Linux/kernel PREEMPT_RT, based on linux-imx-rt_3.10.31.bb
|
||||
|
||||
SUMMARY = "Linux real-time kernel based on linux-congatec"
|
||||
DESCRIPTION = "Linux kernel that is based on Congatec's Linux, \
|
||||
|
@ -9,20 +9,20 @@ require recipes-kernel/linux/linux-dtb.inc
|
|||
|
||||
DEPENDS += "lzop-native bc-native"
|
||||
|
||||
SRCBRANCH = "cgt_imx_3.10.17_1.0.2"
|
||||
SRCBRANCH = "cgt_imx_3.10.31_1.1.0_beta2"
|
||||
|
||||
SRCREV = "c5c5cfafde65a58d8af3785a16d2173eb53f7b1f"
|
||||
SRCREV = "d18ae52fb37b2ca391cb50434f14bee28ff94144"
|
||||
SRC_URI = "git://git.congatec.com/arm/qmx6_kernel.git;protocol=http;branch=${SRCBRANCH} \
|
||||
file://0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch \
|
||||
file://defconfig \
|
||||
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] = "aa231425f2a43220b5e8dbb057c7e5f9"
|
||||
SRC_URI[rt-patch1.sha256sum] = "5fbee5cdf260db9b7751651ab141fb59f46d68c7aecfc32e81a2b5d702f47aac"
|
||||
|
||||
SRC_URI[rt-patch1.md5sum] = "77a28c8b20b01f280dcd860e606a6edd"
|
||||
SRC_URI[rt-patch1.sha256sum] = "ce219268f08eecccb39ff2b5be83657d53ca67cb1c6b81021494075197190351"
|
||||
|
||||
LOCALVERSION = "-1.0.2"
|
||||
LOCALVERSION = "-1.1.0_beta2"
|
||||
|
||||
COMPATIBLE_MACHINE = "(cgtqmx6)"
|
Loading…
Reference in New Issue
Block a user