aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2011-04-28 19:04:19 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2011-04-28 19:12:35 +0200
commit4dc381db40ecd82cf885515f3733767899948484 (patch)
tree8d03601da6343113f28ff1a812164ea1fa7abfa6
parent64931d5472aae33b6c606bb92c2c243a0db456da (diff)
downloadopenembedded-4dc381db40ecd82cf885515f3733767899948484.tar.gz
openembedded-4dc381db40ecd82cf885515f3733767899948484.tar.bz2
openembedded-4dc381db40ecd82cf885515f3733767899948484.zip
linux-nokia900-meego: update to last version
This version contains a working bq27x00 i2c driver Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-rw-r--r--conf/machine/nokia900.conf2
-rw-r--r--recipes/linux/linux-nokia900-meego/defconfig14
-rw-r--r--recipes/linux/linux-nokia900-meego_git.bb4
3 files changed, 12 insertions, 8 deletions
diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf
index c6813d11eb..67f955e589 100644
--- a/conf/machine/nokia900.conf
+++ b/conf/machine/nokia900.conf
@@ -97,4 +97,4 @@ module_autoload_isp1704_charger = "isp1704_charger"
# Copied from include/omap3.inc (as we do not use linux-omap recipes):
#
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r59"
+MACHINE_KERNEL_PR = "r60"
diff --git a/recipes/linux/linux-nokia900-meego/defconfig b/recipes/linux/linux-nokia900-meego/defconfig
index 076a53977b..64ad739153 100644
--- a/recipes/linux/linux-nokia900-meego/defconfig
+++ b/recipes/linux/linux-nokia900-meego/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.37 Kernel Configuration
-# Mon Mar 28 01:27:15 2011
+# Thu Apr 28 17:40:42 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -275,6 +275,7 @@ CONFIG_ARCH_OMAP2PLUS=y
#
# OMAP Feature Selections
#
+# CONFIG_OMAP_SMARTREFLEX is not set
CONFIG_OMAP_RESET_CLOCKS=y
CONFIG_OMAP_MUX=y
# CONFIG_OMAP_MUX_DEBUG is not set
@@ -481,6 +482,8 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_APM_EMULATION is not set
CONFIG_PM_RUNTIME=y
CONFIG_PM_OPS=y
+CONFIG_ARCH_HAS_OPP=y
+CONFIG_PM_OPP=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_NET=y
@@ -1211,10 +1214,14 @@ CONFIG_POWER_SUPPLY=m
# CONFIG_TEST_POWER is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_BQ20Z75 is not set
-# CONFIG_BATTERY_BQ27x00 is not set
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_BQ27X00_I2C=y
+# CONFIG_BATTERY_BQ27X00_PLATFORM is not set
# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
CONFIG_CHARGER_ISP1704=m
# CONFIG_CHARGER_TWL4030 is not set
+# CONFIG_CHARGER_GPIO is not set
CONFIG_HWMON=y
# CONFIG_HWMON_VID is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1530,9 +1537,6 @@ CONFIG_RADIO_SI4713=m
#
# CONFIG_DRM is not set
# CONFIG_PVR is not set
-# CONFIG_PVR_RELEASE is not set
-# CONFIG_PVR_DEBUG is not set
-# CONFIG_PVR_TIMING is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_FB=y
diff --git a/recipes/linux/linux-nokia900-meego_git.bb b/recipes/linux/linux-nokia900-meego_git.bb
index 14408aab74..187637aad1 100644
--- a/recipes/linux/linux-nokia900-meego_git.bb
+++ b/recipes/linux/linux-nokia900-meego_git.bb
@@ -3,10 +3,10 @@ require linux.inc
KERNEL_RELEASE = "2.6.37"
PV = "${KERNEL_RELEASE}+gitr${SRCPV}"
-SRCREV = "1c8a111c2041e8d240fcfb04d298a236af251d5d"
+SRCREV = "570058abb97844fd30c396772b1a078bf572dd0c"
SRC_URI = "\
- git://git.freesmartphone.org/linux-2.6.git;protocol=git;branch=nokia900/kernel-adaptation-n900-meego \
+ git://git.freesmartphone.org/linux-2.6.git;protocol=git;branch=nokia900/kernel-adaptation-n900-2.6.37-38.1 \
file://defconfig \
"
S = "${WORKDIR}/git"