diff options
author | Koen Kooi <koen@openembedded.org> | 2010-12-20 14:39:04 +0100 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2010-12-20 14:39:55 +0100 |
commit | 60334cbda63119f532eac252202a2a881429926f (patch) | |
tree | 5250936c5900efcffbcab1ad7d264c0a8ad6efc2 | |
parent | 41156f69433b0abfa72157475c93d212068340c6 (diff) | |
download | openembedded-60334cbda63119f532eac252202a2a881429926f.tar.gz |
linux-omap4: switch to ubuntu L24.11 tree to get DRM support
Signed-off-by: Koen Kooi <koen@openembedded.org>
-rw-r--r-- | conf/machine/include/omap3.inc | 2 | ||||
-rw-r--r-- | recipes/linux/linux-omap4/omap4430-panda/defconfig | 66 | ||||
-rw-r--r-- | recipes/linux/linux-omap4_2.6.35.3.bb | 4 |
3 files changed, 62 insertions, 10 deletions
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index d33a599870..10fa61324a 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r92" +MACHINE_KERNEL_PR = "r93" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/linux/linux-omap4/omap4430-panda/defconfig b/recipes/linux/linux-omap4/omap4430-panda/defconfig index 09088881d5..d881c2c8e7 100644 --- a/recipes/linux/linux-omap4/omap4430-panda/defconfig +++ b/recipes/linux/linux-omap4/omap4430-panda/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.35 -# Wed Dec 15 09:28:36 2010 +# Linux kernel version: 2.6.35.3 +# Thu Dec 16 14:02:36 2010 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -36,6 +36,7 @@ CONFIG_CONSTRUCTORS=y CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 +# CONFIG_INIT_PASS_ALL_PARAMS is not set CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set @@ -46,6 +47,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set +CONFIG_VERSION_SIGNATURE="" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -126,7 +128,8 @@ CONFIG_HAVE_CLK=y # GCOV-based kernel profiling # # CONFIG_GCOV_KERNEL is not set -# CONFIG_SLOW_WORK is not set +CONFIG_SLOW_WORK=y +# CONFIG_SLOW_WORK_DEBUG is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -306,7 +309,7 @@ CONFIG_CPU_CP15_MMU=y # Processor Features # CONFIG_ARM_THUMB=y -# CONFIG_ARM_THUMBEE is not set +CONFIG_ARM_THUMBEE=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -317,8 +320,6 @@ CONFIG_CACHE_L2X0=y CONFIG_CACHE_PL310=y CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_ARM_DMA_MEM_BUFFERABLE=y -# CONFIG_USER_L2_PLE is not set -# CONFIG_USER_PMON is not set CONFIG_CPU_HAS_PMU=y # CONFIG_ARM_ERRATA_430973 is not set # CONFIG_ARM_ERRATA_458693 is not set @@ -380,7 +381,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set -CONFIG_CPU_V7_SYSFS=y +# CONFIG_CC_STACKPROTECTOR is not set # # Boot options @@ -926,6 +927,7 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set +CONFIG_SR_REPORT_TIME_LIMIT=100 CONFIG_CONNECTOR=m # CONFIG_MTD is not set # CONFIG_PARPORT is not set @@ -1272,6 +1274,7 @@ CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=m # # I2C Hardware Bus support @@ -1537,13 +1540,18 @@ CONFIG_VIDEO_MEDIA=m # CONFIG_IR_CORE=y CONFIG_VIDEO_IR=y +CONFIG_LIRC=y CONFIG_RC_MAP=y CONFIG_IR_NEC_DECODER=y CONFIG_IR_RC5_DECODER=y CONFIG_IR_RC6_DECODER=y CONFIG_IR_JVC_DECODER=y CONFIG_IR_SONY_DECODER=y +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_LIRC_CODEC=m # CONFIG_IR_IMON is not set +CONFIG_IR_MCEUSB=m +CONFIG_IR_STREAMZAP=m CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m # CONFIG_MEDIA_TUNER_CUSTOMISE is not set @@ -1759,6 +1767,10 @@ CONFIG_TILER_OMAP=y # # Graphics support # +CONFIG_DRM=m +# CONFIG_DRM_MGA is not set +# CONFIG_DRM_VIA is not set +# CONFIG_DRM_SAVAGE is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y @@ -2278,6 +2290,7 @@ CONFIG_STAGING=y # CONFIG_TRANZPORT is not set # CONFIG_POHMELFS is not set # CONFIG_LINE6_USB is not set +# CONFIG_DRM_NOUVEAU is not set CONFIG_FB_UDL=m # @@ -2338,6 +2351,16 @@ CONFIG_TI_ST=m CONFIG_ST_BT=m CONFIG_ST_FM=m # CONFIG_ADIS16255 is not set +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_I2C=m +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_TTUSBIR=m +CONFIG_LIRC_ZILOG=m CONFIG_Sys_Link=y CONFIG_SYSLINK_PROC=y CONFIG_SYSLINK_PROC4430=y @@ -2353,6 +2376,32 @@ CONFIG_SYSLINK_RECOVERY=y # CONFIG_TILER_PID_KILL_NOTIFICATIONS is not set # +# Ubuntu Supplied Third-Party Device Drivers +# +CONFIG_AUFS_FS=m +CONFIG_AUFS_BRANCH_MAX_127=y +# CONFIG_AUFS_BRANCH_MAX_511 is not set +# CONFIG_AUFS_BRANCH_MAX_1023 is not set +# CONFIG_AUFS_BRANCH_MAX_32767 is not set +CONFIG_AUFS_HNOTIFY=y +CONFIG_AUFS_HFSNOTIFY=y +# CONFIG_AUFS_HINOTIFY is not set +# CONFIG_AUFS_RDU is not set +CONFIG_AUFS_SP_IATTR=y +# CONFIG_AUFS_SHWH is not set +# CONFIG_AUFS_BR_RAMFS is not set +CONFIG_AUFS_BDEV_LOOP=y +# CONFIG_AUFS_DEBUG is not set + +# +# Compcache options +# +CONFIG_BLK_DEV_COMPCACHE=m +# CONFIG_BLK_DEV_COMPCACHE_DEBUG is not set +# CONFIG_BLK_DEV_COMPCACHE_STATS is not set +# CONFIG_SCSI_ISCSITARGET is not set + +# # File systems # CONFIG_EXT2_FS=y @@ -2609,6 +2658,8 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_DEFAULT_SECURITY_SELINUX is not set # CONFIG_DEFAULT_SECURITY_SMACK is not set # CONFIG_DEFAULT_SECURITY_TOMOYO is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +# CONFIG_DEFAULT_SECURITY_YAMA is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" CONFIG_CRYPTO=y @@ -2628,6 +2679,7 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_TESTS=y # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_PCRYPT is not set diff --git a/recipes/linux/linux-omap4_2.6.35.3.bb b/recipes/linux/linux-omap4_2.6.35.3.bb index 47fda2821e..6b86002bab 100644 --- a/recipes/linux/linux-omap4_2.6.35.3.bb +++ b/recipes/linux/linux-omap4_2.6.35.3.bb @@ -4,9 +4,9 @@ require multi-kernel.inc CORTEXA8FIXUP = "no" -SRCREV = "a25c0585b701b048f5fba298bd56cb5495c97bd2" +SRCREV = "35528f5b0481485654a6577306f7a80d9e6a5cf5" -SRC_URI = "git://git.mansr.com/linux-panda;protocol=git;branch=mru \ +SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-ubuntu.git;protocol=git;branch=ti-ubuntu-L24.11 \ file://defconfig" S = "${WORKDIR}/git" |