aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2010-08-08 20:31:45 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2010-08-08 20:34:28 +0200
commiteb1330165b3866f798985e7a71cabca012524321 (patch)
tree613e9cb92666b3aab37a2ad74fd6e56622f1e1d7
parent6548af38728b8929e773fbe86418b794def3c338 (diff)
downloadopenembedded-eb1330165b3866f798985e7a71cabca012524321.tar.gz
openembedded-eb1330165b3866f798985e7a71cabca012524321.tar.bz2
openembedded-eb1330165b3866f798985e7a71cabca012524321.zip
linux-leviathan: bump git revivion and PR
This new revision support a new procfs file that prints a resume reason. That is needed for resuming when we get a call. (this kernel is used on the htcdream,which is a phone)
-rw-r--r--recipes/linux/linux-leviathan/defconfig16
-rw-r--r--recipes/linux/linux-leviathan_git.bb4
2 files changed, 11 insertions, 9 deletions
diff --git a/recipes/linux/linux-leviathan/defconfig b/recipes/linux/linux-leviathan/defconfig
index 8440011255..c0f219f93e 100644
--- a/recipes/linux/linux-leviathan/defconfig
+++ b/recipes/linux/linux-leviathan/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Tue Jul 13 12:08:03 2010
+# Sun Aug 8 20:28:35 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -329,7 +329,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty1 no_console_suspend=1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M debug "
+CONFIG_CMDLINE="console=tty1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M quiet "
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
@@ -383,6 +383,7 @@ CONFIG_HAS_WAKELOCK=y
CONFIG_HAS_EARLYSUSPEND=y
CONFIG_WAKELOCK=y
CONFIG_WAKELOCK_STAT=y
+CONFIG_WAKELOCK_SUSPEND_RESUME=y
CONFIG_USER_WAKELOCK=y
CONFIG_EARLYSUSPEND=y
CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL=y
@@ -1317,7 +1318,7 @@ CONFIG_MMC_PARANOID_SD_INIT=y
# MMC/SD/SDIO Card Drivers
#
CONFIG_MMC_BLOCK=y
-# CONFIG_MMC_BLOCK_BOUNCE is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set
@@ -1325,7 +1326,8 @@ CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
#
# MMC/SD/SDIO Host Controller Drivers
#
-# CONFIG_MMC_SDHCI is not set
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
# CONFIG_MMC_AT91 is not set
# CONFIG_MMC_ATMELMCI is not set
CONFIG_MMC_MSM7X00A=y
@@ -1462,13 +1464,13 @@ CONFIG_ANDROID_TIMED_GPIO=y
#
CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
CONFIG_EXT2_FS_SECURITY=y
# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
CONFIG_EXT3_FS_SECURITY=y
# CONFIG_EXT4_FS is not set
CONFIG_JBD=y
@@ -1476,7 +1478,7 @@ CONFIG_JBD=y
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
+# CONFIG_FS_POSIX_ACL is not set
# CONFIG_XFS_FS is not set
# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
diff --git a/recipes/linux/linux-leviathan_git.bb b/recipes/linux/linux-leviathan_git.bb
index d3d9fc035c..288bb4deda 100644
--- a/recipes/linux/linux-leviathan_git.bb
+++ b/recipes/linux/linux-leviathan_git.bb
@@ -2,12 +2,12 @@ require linux.inc
DEPENDS += "android-image-utils-native"
PV = "2.6.32+${PR}+gitr${SRCREV}"
-PR = "r20"
+PR = "r21"
COMPATIBLE_MACHINE = "htcdream"
CMDLINE = "console=tty1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M"
-SRCREV = "1ee84e3fcdf91917842c150ded113c540ece1841"
+SRCREV = "013075354e0b533991650ec756605ad4731e6a0c"
SRC_URI = "\
git://gitorious.org/htc-msm-2-6-32/leviathan-incoming.git;protocol=git;branch=android-msm-2.6.32-rebase \