diff --git a/meta/packages/linux/linux-omap-2.6.22.19/defconfig-omap-3430ldp b/meta/packages/linux/linux-omap-2.6.22.19/defconfig-omap-3430ldp index b258abba47..112786f9a9 100644 --- a/meta/packages/linux/linux-omap-2.6.22.19/defconfig-omap-3430ldp +++ b/meta/packages/linux/linux-omap-2.6.22.19/defconfig-omap-3430ldp @@ -102,14 +102,14 @@ CONFIG_BLOCK=y # IO Schedulers # CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_DEFAULT_AS=y +CONFIG_IOSCHED_AS=m +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m +# CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" # # System Type @@ -291,8 +291,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y # # At least one emulation must be selected # -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_NWFPE is not set # CONFIG_FPE_FASTFPE is not set CONFIG_VFP=y CONFIG_VFPv3=y @@ -303,7 +302,7 @@ CONFIG_VFPv3=y # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set -CONFIG_BINFMT_MISC=y +# CONFIG_BINFMT_MISC is not set # # Power management options @@ -463,7 +462,7 @@ CONFIG_MTD_CMDLINE_PARTS=y # # User Modules And Translation Layers # -CONFIG_MTD_CHAR=y +CONFIG_MTD_CHAR=m CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set @@ -548,10 +547,7 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -586,8 +582,8 @@ CONFIG_MII=y # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set CONFIG_SMC911X=y -CONFIG_NETDEV_1000=y -CONFIG_NETDEV_10000=y +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set # # Wireless LAN @@ -630,14 +626,14 @@ CONFIG_INPUT=y # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set -CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_ATKBD=m # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set @@ -650,7 +646,7 @@ CONFIG_KEYBOARD_TWL4030=y # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=y +CONFIG_TOUCHSCREEN_ADS7846=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set @@ -667,8 +663,8 @@ CONFIG_TOUCHSCREEN_ADS7846=y # Hardware I/O ports # CONFIG_SERIO=y -CONFIG_SERIO_SERPORT=y -CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_LIBPS2=m # CONFIG_SERIO_RAW is not set # CONFIG_GAMEPORT is not set @@ -906,8 +902,8 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y # # OMAP2/OMAP3 V4L2 drivers # -CONFIG_VIDEO_OMAP24XX_VIDEOLIB=y -CONFIG_VIDEO_OMAP24XX_VIDEOOUT=y +CONFIG_VIDEO_OMAP24XX_VIDEOLIB=m +CONFIG_VIDEO_OMAP24XX_VIDEOOUT=m CONFIG_VIDEO_OMAP24XX_TVOUT=y # CONFIG_VIDEO_OMAP34XX_CAMERA is not set # CONFIG_VIDEO_OMAP34XX_SECLCD is not set @@ -940,7 +936,7 @@ CONFIG_V4L_USB_DRIVERS=y # CONFIG_USB_ZR364XX is not set # CONFIG_RADIO_ADAPTERS is not set # CONFIG_DVB_CORE is not set -CONFIG_VIDEO_BUF=y +CONFIG_VIDEO_BUF=m # CONFIG_DAB is not set # @@ -1012,14 +1008,14 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y -CONFIG_SND_SEQUENCER=y -CONFIG_SND_SEQ_DUMMY=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y # CONFIG_SND_SEQUENCER_OSS is not set # CONFIG_SND_DYNAMIC_MINORS is not set @@ -1046,7 +1042,7 @@ CONFIG_SND_VERBOSE_PRINTK=y # CONFIG_SND_OMAP_TSC2102 is not set # CONFIG_SND_OMAP24XX_EAC is not set CONFIG_SND_OMAP_3430SDP=y -CONFIG_SND_OMAP_3430SDP_COMP=y +CONFIG_SND_OMAP_3430SDP_COMP=m # # USB devices @@ -1062,29 +1058,36 @@ CONFIG_SND_OMAP_3430SDP_COMP=y # # Open Sound System # +# CONFIG_SOUND_PRIME is not set # # HID Devices # -CONFIG_HID=y +CONFIG_HID=m # CONFIG_HID_DEBUG is not set # # USB Input Devices # -CONFIG_USB_HID=y +CONFIG_USB_HID=m # CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set # CONFIG_USB_HIDDEV is not set +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set + # # USB support # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB=y -CONFIG_USB_DEBUG=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set # # Miscellaneous USB options @@ -1104,7 +1107,7 @@ CONFIG_USB_OTG_WHITELIST=y # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_OHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set -CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_SOC=y # @@ -1116,8 +1119,6 @@ CONFIG_USB_MUSB_OTG=y CONFIG_USB_GADGET_MUSB_HDRC=y CONFIG_USB_MUSB_HDRC_HCD=y CONFIG_USB_INVENTRA_FIFO=y -# CONFIG_USB_INVENTRA_DMA is not set -# CONFIG_USB_TI_CPPI_DMA is not set CONFIG_USB_INVENTRA_HCD_LOGGING=0 # @@ -1180,7 +1181,7 @@ CONFIG_USB_MON=y # # USB Gadget Support # -CONFIG_USB_GADGET=y +CONFIG_USB_GADGET=m CONFIG_USB_GADGET_DEBUG_FILES=y CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_FSL_USB2 is not set @@ -1193,7 +1194,7 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FILE_STORAGE is not set @@ -1427,11 +1428,12 @@ CONFIG_NLS_ISO8859_1=y # Profiling support # CONFIG_PROFILING=y +CONFIG_OPROFILE=m # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -1463,7 +1465,6 @@ CONFIG_FORCED_INLINING=y CONFIG_DEBUG_USER=y CONFIG_DEBUG_ERRORS=y # CONFIG_DEBUG_LL is not set -# CONFIG_DEBUG_ICEDCC is not set # # Security options diff --git a/meta/packages/linux/linux-omap_2.6.22.19.bb b/meta/packages/linux/linux-omap_2.6.22.19.bb index 2d3ed23b61..7f25bd267a 100644 --- a/meta/packages/linux/linux-omap_2.6.22.19.bb +++ b/meta/packages/linux/linux-omap_2.6.22.19.bb @@ -1,5 +1,5 @@ require linux-omap.inc -PR = "r4" +PR = "r5" COMPATIBLE_MACHINE = "omap-3430ldp" SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.19.tar.bz2 \ file://defconfig-omap-3430ldp \