aboutsummaryrefslogtreecommitdiffstats
path: root/recipes
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-03-04 08:52:08 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2011-03-08 09:18:40 +0100
commit87e10a778024c206dc4727cd4389e8a7e7bb099f (patch)
tree814c0e52272889d390288d280e1c18d9572f7638 /recipes
parentd33d29aad7b03cdd6e1621cc7d99d5e2269a07eb (diff)
downloadopenembedded-87e10a778024c206dc4727cd4389e8a7e7bb099f.tar.gz
linux-kexecboot_git: upgrade to 2.6.38-rc8
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/linux/linux-kexecboot/spitz/defconfig11
-rw-r--r--recipes/linux/linux-kexecboot_git.bb4
2 files changed, 10 insertions, 5 deletions
diff --git a/recipes/linux/linux-kexecboot/spitz/defconfig b/recipes/linux/linux-kexecboot/spitz/defconfig
index 0faedb3542..8761ec12d3 100644
--- a/recipes/linux/linux-kexecboot/spitz/defconfig
+++ b/recipes/linux/linux-kexecboot/spitz/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 2.6.38-rc3 Kernel Configuration
-# Wed Feb 2 00:10:36 2011
+# Linux/arm 2.6.38-rc7 Kernel Configuration
+# Fri Mar 4 09:04:04 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -317,6 +317,10 @@ CONFIG_PXA_SHARP_Cxx00=y
CONFIG_SHARPSL_PM=y
CONFIG_SHARPSL_PM_MAX1111=y
CONFIG_PXA_SSP=y
+
+#
+# System MMU
+#
CONFIG_PLAT_PXA=y
#
@@ -406,7 +410,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 debug"
# CONFIG_CMDLINE_FORCE is not set
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
@@ -979,6 +983,7 @@ CONFIG_SENSORS_MAX1111=y
# CONFIG_SENSORS_W83627EHF is not set
# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_THERMAL is not set
# CONFIG_WATCHDOG is not set
CONFIG_SSB_POSSIBLE=y
diff --git a/recipes/linux/linux-kexecboot_git.bb b/recipes/linux/linux-kexecboot_git.bb
index 4640d433e6..2847974858 100644
--- a/recipes/linux/linux-kexecboot_git.bb
+++ b/recipes/linux/linux-kexecboot_git.bb
@@ -1,10 +1,10 @@
require linux-kexecboot.inc
-KERNEL_RELEASE = "2.6.38-rc7"
+KERNEL_RELEASE = "2.6.38-rc8"
OLD_KERNEL_RELEASE = "2.6.37"
PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}+gitr${SRCPV}"
-SRCREV = "b65a0e0c84cf489bfa00d6aa6c48abc5a237100f"
+SRCREV = "a5abba989deceb731047425812d268daf7536575"
SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \
file://defconfig"