Signed-off-by: Martin Jansa <[email protected]>
---
meta-openmoko/recipes-kernel/linux/linux-gta04/om-gta04/defconfig | 7 ++-----
meta-openmoko/recipes-kernel/linux/linux-gta04_git.bb | 6 +++---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/meta-openmoko/recipes-kernel/linux/linux-gta04/om-gta04/defconfig
b/meta-openmoko/recipes-kernel/linux/linux-gta04/om-gta04/defconfig
index 5c4a3a1..dd1de3a 100644
--- a/meta-openmoko/recipes-kernel/linux/linux-gta04/om-gta04/defconfig
+++ b/meta-openmoko/recipes-kernel/linux/linux-gta04/om-gta04/defconfig
@@ -20,7 +20,6 @@ CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_KALLSYMS_ALL=y
# CONFIG_ELF_CORE is not set
@@ -75,15 +74,13 @@ CONFIG_PREEMPT=y
CONFIG_LEDS=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyO2,115200n8 mpurate=800 vram=12M
omapfb.rotate_type=0 omapdss.def_disp=lcd root=/dev/mmcblk0p2 rw
rootfstype=ext4,ext3,btrfs,ubifs,jffs2 rootwait twl4030_charger.allow_usb=1
twl4030_charger.charge_backup=1 musb_hdrc.preserve_vbus=1 log_buf_len=8M
omapfb.vram=1:1200k,2:1200k"
+CONFIG_CMDLINE="console=ttyO2,115200n8 mpurate=800 vram=12M
omapfb.rotate_type=0 omapdss.def_disp=lcd
rootfstype=ext4,ext3,btrfs,ubifs,jffs2 rootwait twl4030_charger.allow_usb=1
twl4030_charger.charge_backup=1 musb_hdrc.preserve_vbus=1 log_buf_len=8M
omapfb.vram=1:1200k,2:1200k omapfb.vrfb=y"
CONFIG_CMDLINE_EXTEND=y
CONFIG_KEXEC=y
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_CPU_IDLE=y
CONFIG_BINFMT_AOUT=m
@@ -359,7 +356,6 @@ CONFIG_USB_OTG=y
# CONFIG_USB_OTG_WHITELIST is not set
CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_GADGET_VBUS_DRAW=100
CONFIG_USB_MUSB_HDRC=y
CONFIG_USB_MUSB_OMAP2PLUS=y
CONFIG_MUSB_PIO_ONLY=y
@@ -384,6 +380,7 @@ CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_TEST=m
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FS=y
+CONFIG_USB_GADGET_VBUS_DRAW=100
CONFIG_USB_GADGET_MUSB_HDRC=y
CONFIG_USB_ZERO=m
CONFIG_USB_ZERO_HNPTEST=y
diff --git a/meta-openmoko/recipes-kernel/linux/linux-gta04_git.bb
b/meta-openmoko/recipes-kernel/linux/linux-gta04_git.bb
index 97a55e6..694bb16 100644
--- a/meta-openmoko/recipes-kernel/linux/linux-gta04_git.bb
+++ b/meta-openmoko/recipes-kernel/linux/linux-gta04_git.bb
@@ -1,15 +1,15 @@
require recipes-kernel/linux/linux.inc
-KERNEL_RELEASE = "3.4.9"
+KERNEL_RELEASE = "3.7.10"
PV = "${KERNEL_RELEASE}+gitr${SRCPV}"
PE = "5"
# for bumping PR bump MACHINE_KERNEL_PR in the machine config
inherit machine_kernel_pr
-SRCREV = "5c4603590af40cccce1d75396d4cb3fdffe0fdef"
+SRCREV = "11d1c646b3ed1d08b9827f30484c5eb135f3814b"
SRC_URI = "\
-
git://github.com/shr-distribution/linux.git;protocol=git;branch=om-gta04/3.4/master;name=kernel
\
+
git://github.com/shr-distribution/linux.git;protocol=git;branch=om-gta04/3.7/master;name=kernel
\
file://defconfig \
"
S = "${WORKDIR}/git"
--
1.8.4.2
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
