diff options
| -rw-r--r-- | conf/machine/include/davinci.inc | 2 | ||||
| -rw-r--r-- | recipes/linux/linux-davinci/dm355-leopard/defconfig | 24 |
2 files changed, 16 insertions, 10 deletions
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index a42ee7ea52..3134c28d18 100644 --- a/conf/machine/include/davinci.inc +++ b/conf/machine/include/davinci.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-arm926ejs.inc # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r7" +MACHINE_KERNEL_PR = "r8" TARGET_ARCH = "arm" diff --git a/recipes/linux/linux-davinci/dm355-leopard/defconfig b/recipes/linux/linux-davinci/dm355-leopard/defconfig index e0f9d15bf6..a20e5cf9e7 100644 --- a/recipes/linux/linux-davinci/dm355-leopard/defconfig +++ b/recipes/linux/linux-davinci/dm355-leopard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.30-rc7-davinci1 -# Wed Jun 3 11:44:19 2009 +# Thu Jun 4 08:38:08 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -133,7 +133,7 @@ CONFIG_IOSCHED_CFQ=m # CONFIG_DEFAULT_CFQ is not set CONFIG_DEFAULT_NOOP=y CONFIG_DEFAULT_IOSCHED="noop" -# CONFIG_FREEZER is not set +CONFIG_FREEZER=y # # System Type @@ -309,7 +309,12 @@ CONFIG_BINFMT_MISC=m # # Power management options # -# CONFIG_PM is not set +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_APM_EMULATION is not set CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y @@ -1313,7 +1318,8 @@ CONFIG_USB=y CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y CONFIG_USB_DYNAMIC_MINORS=y -# CONFIG_USB_OTG is not set +CONFIG_USB_SUSPEND=y +CONFIG_USB_OTG=y # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set CONFIG_USB_MON=y @@ -1336,10 +1342,10 @@ CONFIG_USB_MUSB_SOC=y # # DaVinci 35x and 644x USB support # -CONFIG_USB_MUSB_HOST=y +# CONFIG_USB_MUSB_HOST is not set # CONFIG_USB_MUSB_PERIPHERAL is not set -# CONFIG_USB_MUSB_OTG is not set -# CONFIG_USB_GADGET_MUSB_HDRC is not set +CONFIG_USB_MUSB_OTG=y +CONFIG_USB_GADGET_MUSB_HDRC=y CONFIG_USB_MUSB_HDRC_HCD=y # CONFIG_MUSB_PIO_ONLY is not set # CONFIG_USB_INVENTRA_DMA is not set @@ -1470,8 +1476,7 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_S3C2410 is not set # CONFIG_USB_GADGET_IMX is not set -CONFIG_USB_GADGET_M66592=y -CONFIG_USB_M66592=m +# CONFIG_USB_GADGET_M66592 is not set # CONFIG_USB_GADGET_AMD5536UDC is not set # CONFIG_USB_GADGET_FSL_QE is not set # CONFIG_USB_GADGET_CI13XXX is not set @@ -1480,6 +1485,7 @@ CONFIG_USB_M66592=m # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y CONFIG_USB_ZERO=m +# CONFIG_USB_ZERO_HNPTEST is not set CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_GADGETFS is not set |