diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/linux-omap/beagleboard/defconfig | 18 | ||||
| -rw-r--r-- | packages/linux/linux-omap_git.bb | 5 |
2 files changed, 12 insertions, 11 deletions
diff --git a/packages/linux/linux-omap/beagleboard/defconfig b/packages/linux/linux-omap/beagleboard/defconfig index 6dcf5fe3aa..d2f0af0c60 100644 --- a/packages/linux/linux-omap/beagleboard/defconfig +++ b/packages/linux/linux-omap/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28-omap1 -# Fri Jan 9 12:28:30 2009 +# Wed Jan 14 19:12:03 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -194,6 +194,7 @@ CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_TICK_GPTIMER=12 CONFIG_OMAP_DM_TIMER=y # CONFIG_OMAP_LL_DEBUG_UART1 is not set # CONFIG_OMAP_LL_DEBUG_UART2 is not set @@ -219,7 +220,6 @@ CONFIG_ARCH_OMAP3430=y CONFIG_MACH_OMAP3_BEAGLE=y # CONFIG_MACH_OVERO is not set # CONFIG_MACH_OMAP3_PANDORA is not set -CONFIG_OMAP_TICK_GPTIMER=12 # # Boot options @@ -1040,8 +1040,8 @@ CONFIG_HWMON=y # CONFIG_SENSORS_TSC210X is not set CONFIG_SENSORS_OMAP34XX=y # CONFIG_HWMON_DEBUG_CHIP is not set -# CONFIG_THERMAL is not set -# CONFIG_THERMAL_HWMON is not set +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_NOWAYOUT=y @@ -1494,8 +1494,8 @@ CONFIG_USB_MON=y # # CONFIG_USB_C67X00_HCD is not set CONFIG_USB_EHCI_HCD=y -# CONFIG_OMAP_EHCI_PHY_MODE is not set -CONFIG_OMAP_EHCI_TLL_MODE=y +CONFIG_OMAP_EHCI_PHY_MODE=y +# CONFIG_OMAP_EHCI_TLL_MODE is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set # CONFIG_USB_ISP116X_HCD is not set @@ -1706,7 +1706,7 @@ CONFIG_LEDS_CLASS=y # LED drivers # # CONFIG_LEDS_OMAP_DEBUG is not set -# CONFIG_LEDS_OMAP is not set +CONFIG_LEDS_OMAP=y # CONFIG_LEDS_OMAP_PWM is not set # CONFIG_LEDS_PCA9532 is not set CONFIG_LEDS_GPIO=y @@ -1718,8 +1718,8 @@ CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y -# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set -# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index 986c39e52b..24613c8b39 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -10,11 +10,11 @@ DEFAULT_PREFERENCE_omap3evm = "1" DEFAULT_PREFERENCE_omap3-pandora = "1" -SRCREV = "0ec95b96fd77036a13398c66901e11cd301190d0" +SRCREV = "15f75b6226c2d3b82062bb721e7cb9a1d6f35efd" #PV = "2.6.27+2.6.28-rc8+${PR}+gitr${SRCREV}" PV = "2.6.28+${PR}+gitr${SRCREV}" -PR = "r8" +PR = "r9" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -50,6 +50,7 @@ SRC_URI_append = " \ file://0013-DSS-OMAPFB-remove-extra-spaces.patch;patch=1 \ file://0014-DSS-fix-clk_get_usecount.patch;patch=1 \ file://0001-ASoC-Add-support-for-OMAP3-EVM.patch;patch=1 \ + file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch;patch=1 \ " |