From f917c733f3acb385d54c5e5d8070fcd81d25ecac Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Sat, 28 Mar 2009 23:43:32 +0100
Subject: linux-msm7xxx: add more useful options to htcraphael defconfig

---
 recipes/linux/linux-msm7xxxx/htcraphael/defconfig | 46 +++++++++++++----------
 recipes/linux/linux-msm7xxxx_git.bb               |  2 +-
 2 files changed, 27 insertions(+), 21 deletions(-)

(limited to 'recipes')

diff --git a/recipes/linux/linux-msm7xxxx/htcraphael/defconfig b/recipes/linux/linux-msm7xxxx/htcraphael/defconfig
index a30c37b9c4..88f9cd8e1e 100644
--- a/recipes/linux/linux-msm7xxxx/htcraphael/defconfig
+++ b/recipes/linux/linux-msm7xxxx/htcraphael/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.27
-# Thu Mar 19 20:02:34 2009
+# Sat Mar 28 01:05:54 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -38,8 +38,9 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
-# CONFIG_SYSVIPC is not set
-# CONFIG_POSIX_MQUEUE is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
@@ -57,6 +58,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
 # CONFIG_USER_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -201,7 +203,6 @@ CONFIG_MACH_HTCRAPHAEL=y
 CONFIG_MACH_HTCRAPHAEL_CDMA=y
 CONFIG_MACH_HTCDIAMOND=y
 CONFIG_MACH_HTCDIAMOND_CDMA=y
-# CONFIG_MACH_HTCBLACKSTONE is not set
 # CONFIG_TROUT_H2W is not set
 # CONFIG_TROUT_PWRSINK is not set
 CONFIG_MSM7X00A_USE_GP_TIMER=y
@@ -312,7 +313,21 @@ CONFIG_CMDLINE=" debug "
 #
 # CPU Frequency scaling
 #
-# CONFIG_CPU_FREQ is not set
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
 
 #
 # Floating point emulation
@@ -338,11 +353,7 @@ CONFIG_PM=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-CONFIG_HAS_WAKELOCK=y
-CONFIG_WAKELOCK=y
-# CONFIG_WAKELOCK_STAT is not set
-CONFIG_USER_WAKELOCK=y
-# CONFIG_EARLYSUSPEND is not set
+# CONFIG_WAKELOCK is not set
 # CONFIG_APM_EMULATION is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
@@ -572,7 +583,6 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 CONFIG_TOUCHSCREEN_MSM=y
 # CONFIG_MSM_VIRTUAL_KEYBOARD is not set
-# CONFIG_MSM_BLACKSTONE_PAD is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_ATI_REMOTE is not set
 # CONFIG_INPUT_ATI_REMOTE2 is not set
@@ -677,10 +687,7 @@ CONFIG_SENSORS_MICROP_KLT=y
 # CONFIG_I2C_DEBUG_CHIP is not set
 # CONFIG_SPI is not set
 # CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_WATCHDOG is not set
 
@@ -1094,18 +1101,18 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
-# CONFIG_TIMER_STATS is not set
+CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -1135,8 +1142,7 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_DEBUG_LL=y
-# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_LL is not set
 
 #
 # Security options
diff --git a/recipes/linux/linux-msm7xxxx_git.bb b/recipes/linux/linux-msm7xxxx_git.bb
index 7dd901daca..f124d7a874 100644
--- a/recipes/linux/linux-msm7xxxx_git.bb
+++ b/recipes/linux/linux-msm7xxxx_git.bb
@@ -3,7 +3,7 @@ require linux.inc
 PV = "2.6.25+${PR}+gitr${SRCREV}"
 PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}"
 PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone"
 
-- 
cgit v1.2.3