From f1fad244db6c58f88288d346a15684951f9a26ed Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 14 Jan 2010 20:36:20 +0100 Subject: linux-openmoko-shr-devel: apply shr-testing specific kernel config Signed-off-by: Sebastian Spaeth --- .../0001-defconfig-shr-testing-kernel-config.patch | 172 +++++++++++++++++++++ recipes/linux/linux-openmoko-shr-devel_git.bb | 4 +- 2 files changed, 174 insertions(+), 2 deletions(-) create mode 100644 recipes/linux/linux-openmoko-shr-devel/0001-defconfig-shr-testing-kernel-config.patch diff --git a/recipes/linux/linux-openmoko-shr-devel/0001-defconfig-shr-testing-kernel-config.patch b/recipes/linux/linux-openmoko-shr-devel/0001-defconfig-shr-testing-kernel-config.patch new file mode 100644 index 0000000000..bdff1fcefb --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-devel/0001-defconfig-shr-testing-kernel-config.patch @@ -0,0 +1,172 @@ +From 3b40ddc900965ac8a2f90fca933353790b055340 Mon Sep 17 00:00:00 2001 +From: Sebastian Spaeth +Date: Thu, 14 Jan 2010 18:42:41 +0100 +Subject: [PATCH] defconfig: shr-testing kernel config patch + +Signed-off-by: Sebastian Spaeth +--- + arch/arm/configs/gta02_packaging_defconfig | 74 ++++++++++++++-------------- + 1 files changed, 37 insertions(+), 37 deletions(-) + +diff --git a/arch/arm/configs/gta02_packaging_defconfig b/arch/arm/configs/gta02_packaging_defconfig +index 5b06e7a..58c1978 100644 +--- a/arch/arm/configs/gta02_packaging_defconfig ++++ b/arch/arm/configs/gta02_packaging_defconfig +@@ -97,7 +97,7 @@ CONFIG_SLAB=y + # CONFIG_SLUB is not set + # CONFIG_SLOB is not set + # CONFIG_PROFILING is not set +-CONFIG_HAVE_OPROFILE=y ++# CONFIG_HAVE_OPROFILE is not set + # CONFIG_KPROBES is not set + CONFIG_HAVE_KPROBES=y + CONFIG_HAVE_KRETPROBES=y +@@ -300,7 +300,7 @@ CONFIG_VMSPLIT_3G=y + # CONFIG_VMSPLIT_2G is not set + # CONFIG_VMSPLIT_1G is not set + CONFIG_PAGE_OFFSET=0xC0000000 +-CONFIG_PREEMPT=y ++# CONFIG_PREEMPT is not set + CONFIG_HZ=200 + CONFIG_AEABI=y + CONFIG_OABI_COMPAT=y +@@ -618,7 +618,7 @@ CONFIG_NET_SCH_HTB=m + CONFIG_NET_SCH_HFSC=m + CONFIG_NET_SCH_PRIO=m + # CONFIG_NET_SCH_MULTIQ is not set +-CONFIG_NET_SCH_RED=m ++# CONFIG_NET_SCH_RED is not set + CONFIG_NET_SCH_SFQ=m + CONFIG_NET_SCH_TEQL=m + CONFIG_NET_SCH_TBF=m +@@ -1302,7 +1302,7 @@ CONFIG_MFD_GLAMO_MCI=y + # + # Multimedia drivers + # +-CONFIG_DAB=y ++# CONFIG_DAB is not set + # CONFIG_USB_DABUSB is not set + + # +@@ -1382,10 +1382,10 @@ CONFIG_FONT_6x11=y + # CONFIG_FONT_10x18 is not set + # CONFIG_LOGO is not set + CONFIG_SOUND=y +-CONFIG_SOUND_OSS_CORE=y +-CONFIG_SND=m +-CONFIG_SND_TIMER=m +-CONFIG_SND_PCM=m ++# CONFIG_SOUND_OSS_CORE is not set ++CONFIG_SND=y ++CONFIG_SND_TIMER=y ++CONFIG_SND_PCM=y + CONFIG_SND_HWDEP=m + CONFIG_SND_RAWMIDI=m + # CONFIG_SND_SEQUENCER is not set +@@ -1410,7 +1410,7 @@ CONFIG_SND_ARM=y + CONFIG_SND_USB=y + CONFIG_SND_USB_AUDIO=m + # CONFIG_SND_USB_CAIAQ is not set +-CONFIG_SND_SOC=m ++CONFIG_SND_SOC=y + CONFIG_SND_S3C24XX_SOC=m + CONFIG_SND_S3C24XX_SOC_I2S=m + CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m +@@ -1648,7 +1648,7 @@ CONFIG_USB_MIDI_GADGET=m + # OTG and related infrastructure + # + # CONFIG_USB_GPIO_VBUS is not set +-CONFIG_AR6000_WLAN=m ++CONFIG_AR6000_WLAN=y + # CONFIG_AR6000_WLAN_DEBUG is not set + # CONFIG_AR6000_WLAN_RESET is not set + CONFIG_MMC=y +@@ -1986,50 +1986,50 @@ CONFIG_ENABLE_MUST_CHECK=y + CONFIG_FRAME_WARN=1024 + CONFIG_MAGIC_SYSRQ=y + # CONFIG_UNUSED_SYMBOLS is not set +-CONFIG_DEBUG_FS=y ++# CONFIG_DEBUG_FS is not set + # CONFIG_HEADERS_CHECK is not set +-CONFIG_DEBUG_KERNEL=y +-CONFIG_DEBUG_SHIRQ=y +-CONFIG_DETECT_SOFTLOCKUP=y +-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y ++# CONFIG_DEBUG_KERNEL is not set ++# CONFIG_DEBUG_SHIRQ is not set ++# CONFIG_DETECT_SOFTLOCKUP is not set ++# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set + CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1 +-CONFIG_SCHED_DEBUG=y +-CONFIG_SCHEDSTATS=y +-CONFIG_TIMER_STATS=y ++# CONFIG_SCHED_DEBUG is not set ++# CONFIG_SCHEDSTATS is not set ++# CONFIG_TIMER_STATS is not set + # CONFIG_DEBUG_OBJECTS is not set + # CONFIG_DEBUG_SLAB is not set +-CONFIG_DEBUG_PREEMPT=y ++# CONFIG_DEBUG_PREEMPT is not set + # CONFIG_DEBUG_RT_MUTEXES is not set + # CONFIG_RT_MUTEX_TESTER is not set +-CONFIG_DEBUG_SPINLOCK=y +-CONFIG_DEBUG_MUTEXES=y +-CONFIG_DEBUG_LOCK_ALLOC=y ++# CONFIG_DEBUG_SPINLOCK is not set ++# CONFIG_DEBUG_MUTEXES is not set ++# CONFIG_DEBUG_LOCK_ALLOC is not set + # CONFIG_PROVE_LOCKING is not set +-CONFIG_LOCKDEP=y +-CONFIG_LOCK_STAT=y +-CONFIG_DEBUG_LOCKDEP=y +-CONFIG_DEBUG_SPINLOCK_SLEEP=y ++# CONFIG_LOCKDEP is not set ++# CONFIG_LOCK_STAT is not set ++# CONFIG_DEBUG_LOCKDEP is not set ++# CONFIG_DEBUG_SPINLOCK_SLEEP is not set + # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +-CONFIG_STACKTRACE=y ++# CONFIG_STACKTRACE is not set + # CONFIG_DEBUG_KOBJECT is not set +-CONFIG_DEBUG_BUGVERBOSE=y +-CONFIG_DEBUG_INFO=y ++# CONFIG_DEBUG_BUGVERBOSE is not set ++# CONFIG_DEBUG_INFO is not set + # CONFIG_DEBUG_VM is not set + # CONFIG_DEBUG_WRITECOUNT is not set +-CONFIG_DEBUG_MEMORY_INIT=y ++# CONFIG_DEBUG_MEMORY_INIT is not set + # CONFIG_DEBUG_LIST is not set +-CONFIG_DEBUG_SG=y ++# CONFIG_DEBUG_SG is not set + # CONFIG_DEBUG_NOTIFIERS is not set +-CONFIG_FRAME_POINTER=y ++# CONFIG_FRAME_POINTER is not set + # CONFIG_BOOT_PRINTK_DELAY is not set + # CONFIG_RCU_TORTURE_TEST is not set +-CONFIG_RCU_CPU_STALL_DETECTOR=y ++# CONFIG_RCU_CPU_STALL_DETECTOR is not set + # CONFIG_BACKTRACE_SELF_TEST is not set + # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set + # CONFIG_FAULT_INJECTION is not set +-CONFIG_LATENCYTOP=y +-CONFIG_SYSCTL_SYSCALL_CHECK=y +-CONFIG_HAVE_FUNCTION_TRACER=y ++# CONFIG_LATENCYTOP is not set ++# CONFIG_SYSCTL_SYSCALL_CHECK is not set ++# CONFIG_HAVE_FUNCTION_TRACER is not set + + # + # Tracers +@@ -2046,7 +2046,7 @@ CONFIG_DYNAMIC_PRINTK_DEBUG=y + CONFIG_HAVE_ARCH_KGDB=y + # CONFIG_KGDB is not set + # CONFIG_DEBUG_USER is not set +-CONFIG_DEBUG_ERRORS=y ++# CONFIG_DEBUG_ERRORS is not set + # CONFIG_DEBUG_STACK_USAGE is not set + # CONFIG_DEBUG_LL is not set + CONFIG_DEBUG_S3C_UART=2 +-- +1.6.3.3 + diff --git a/recipes/linux/linux-openmoko-shr-devel_git.bb b/recipes/linux/linux-openmoko-shr-devel_git.bb index a0b209d02f..9b0620a151 100644 --- a/recipes/linux/linux-openmoko-shr-devel_git.bb +++ b/recipes/linux/linux-openmoko-shr-devel_git.bb @@ -8,12 +8,12 @@ KERNEL_VERSION = "2.6.29-rc3" OMV = "oe11" PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCPV}" -PR = "r6" +PR = "r6.1" SRC_URI = "\ git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \ file://fix-install.patch;patch=1 \ - file://0007-Enable-UBI-UBIFS.patch;patch=1 \ + file://0001-defconfig-shr-testing-kernel-config.patch;patch=1 \ " S = "${WORKDIR}/git" -- cgit 1.2.3-korg