Permalink
Browse files

kernel: Bring up to date with Marvell's patches

Marvell keeps their own "stock" kernel that's diverged from
linux-next in several ways.  This patch brings linux-next into line
with Marvell's changes.
  • Loading branch information...
1 parent b5dbc85 commit 56093d4e2e5cc0cc860e79bbbd9258e5d2e2ada2 @torvalds torvalds committed with Sean Cross May 16, 2010
Showing 610 changed files with 197,212 additions and 3,171 deletions.
View
1,579 .config
Oops, something went wrong.
View
@@ -0,0 +1,121 @@
+ =============
+ A N D R O I D
+ =============
+
+Copyright (C) 2009 Google, Inc.
+Written by Mike Chan <mike@android.com>
+
+CONTENTS:
+---------
+
+1. Android
+ 1.1 Required enabled config options
+ 1.2 Required disabled config options
+ 1.3 Recommended enabled config options
+2. Contact
+
+
+1. Android
+==========
+
+Android (www.android.com) is an open source operating system for mobile devices.
+This document describes configurations needed to run the Android framework on
+top of the Linux kernel.
+
+To see a working defconfig look at msm_defconfig or goldfish_defconfig
+which can be found at http://android.git.kernel.org in kernel/common.git
+and kernel/msm.git
+
+
+1.1 Required enabled config options
+-----------------------------------
+After building a standard defconfig, ensure that these options are enabled in
+your .config or defconfig if they are not already. Based off the msm_defconfig.
+You should keep the rest of the default options enabled in the defconfig
+unless you know what you are doing.
+
+ANDROID_PARANOID_NETWORK
+ASHMEM
+CONFIG_FB_MODE_HELPERS
+CONFIG_FONT_8x16
+CONFIG_FONT_8x8
+CONFIG_YAFFS_SHORT_NAMES_IN_RAM
+DAB
+EARLYSUSPEND
+FB
+FB_CFB_COPYAREA
+FB_CFB_FILLRECT
+FB_CFB_IMAGEBLIT
+FB_DEFERRED_IO
+FB_TILEBLITTING
+HIGH_RES_TIMERS
+INOTIFY
+INOTIFY_USER
+INPUT_EVDEV
+INPUT_GPIO
+INPUT_MISC
+LEDS_CLASS
+LEDS_GPIO
+LOCK_KERNEL
+LkOGGER
+LOW_MEMORY_KILLER
+MISC_DEVICES
+NEW_LEDS
+NO_HZ
+POWER_SUPPLY
+PREEMPT
+RAMFS
+RTC_CLASS
+RTC_LIB
+SWITCH
+SWITCH_GPIO
+TMPFS
+UID_STAT
+UID16
+USB_FUNCTION
+USB_FUNCTION_ADB
+USER_WAKELOCK
+VIDEO_OUTPUT_CONTROL
+WAKELOCK
+YAFFS_AUTO_YAFFS2
+YAFFS_FS
+YAFFS_YAFFS1
+YAFFS_YAFFS2
+
+
+1.2 Required disabled config options
+------------------------------------
+CONFIG_YAFFS_DISABLE_LAZY_LOAD
+DNOTIFY
+
+
+1.3 Recommended enabled config options
+------------------------------
+ANDROID_PMEM
+ANDROID_RAM_CONSOLE
+ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+SCHEDSTATS
+DEBUG_PREEMPT
+DEBUG_MUTEXES
+DEBUG_SPINLOCK_SLEEP
+DEBUG_INFO
+FRAME_POINTER
+CPU_FREQ
+CPU_FREQ_TABLE
+CPU_FREQ_DEFAULT_GOV_ONDEMAND
+CPU_FREQ_GOV_ONDEMAND
+CRC_CCITT
+EMBEDDED
+INPUT_TOUCHSCREEN
+I2C
+I2C_BOARDINFO
+LOG_BUF_SHIFT=17
+SERIAL_CORE
+SERIAL_CORE_CONSOLE
+
+
+2. Contact
+==========
+website: http://android.git.kernel.org
+
+mailing-lists: android-kernel@googlegroups.com
View
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 34
-EXTRAVERSION = -rc7
+EXTRAVERSION =
NAME = Sheep on Meth
# *DOCUMENTATION*
View
@@ -18,6 +18,8 @@ config ARM
select HAVE_KPROBES if (!XIP_KERNEL)
select HAVE_KRETPROBES if (HAVE_KPROBES)
select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
+ select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL)
+ select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
select HAVE_GENERIC_DMA_COHERENT
select HAVE_KERNEL_GZIP
select HAVE_KERNEL_LZO
@@ -523,6 +525,7 @@ config ARCH_MMP
select GENERIC_CLOCKEVENTS
select TICK_ONESHOT
select PLAT_PXA
+ select PXA_SSP_LEGACY
help
Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.
@@ -1031,8 +1034,9 @@ source "arch/arm/common/Kconfig"
config FORCE_MAX_ZONEORDER
int
- depends on SA1111
- default "9"
+ depends on SA1111 || ARCH_MMP
+ default "9" if SA1111
+ default "15" if ARCH_MMP
menu "Bus support"
@@ -1058,7 +1062,7 @@ config ISA_DMA_API
bool
config PCI
- bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE
+ bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE || ARCH_MMP
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
@@ -1182,6 +1186,7 @@ config HZ
default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
default AT91_TIMER_HZ if ARCH_AT91
+ default 128 if ARCH_MMP && PXA_32KTIMER
default 100
config THUMB2_KERNEL
@@ -1645,6 +1650,94 @@ source "kernel/power/Kconfig"
config ARCH_SUSPEND_POSSIBLE
def_bool y
+config PM_PXA168
+ bool "PXA168 PM support (hibernate)"
+ depends on PM && CPU_PXA168
+ default y
+ help
+ Say 'Y' here if you want hibernate support
+
+config PM_PXA910
+ bool "PXA910 PM support"
+ depends on PM && CPU_PXA910
+ default y
+ help
+ Say 'Y' here if you want low power mode support
+
+config DVFM
+ bool "DVFM support"
+ depends on PM
+ default y
+ help
+ Say 'Y' here if you want Dynamic Voltage and Frequency Management
+
+config DVFM_PXA168
+ bool "PXA168 DVFM support"
+ depends on DVFM && CPU_PXA168
+ default y
+ help
+ Say 'Y' here if you want DVFM on PXA168 processor
+
+config DVFM_PXA168_LCDDMA_WR
+ bool "PXA168 DFC & LCD DMA confliction work around"
+ depends on DVFM_PXA168
+ default y
+ help
+ Say 'Y' here if you want add the DFC & LCD DAM confliction WR
+
+
+config DVFM_PXA910
+ bool "PXA910 DVFM support"
+ depends on DVFM && CPU_PXA910
+ default n
+ help
+ Say 'Y' here if you want DVFM on PXA910 processor
+
+config MSPM
+ bool "Marvell Scalable Power Management support"
+ depends on DVFM_PXA168 || DVFM_PXA910
+ default y
+ help
+ Say 'Y' here if you want Marvell Scalable Power Management
+
+config MSPM_PXA168
+ bool "PXA168 MSPM support"
+ depends on MSPM && DVFM_PXA168 && PM_PXA168
+ default y
+ help
+ Say 'Y' here if you want Marvell Scalable Power Management
+
+config MSPM_PXA168_STATS
+ bool "PXA168 MSPM Statistics support"
+ depends on MSPM && DVFM_PXA168 && PM_PXA168
+ select RELAY
+ select DEBUG_FS
+ default y
+ help
+ This is used to collect statistics during the dynamic frequency
+ and voltage changes
+
+config MSPM_PXA910
+ bool "PXA910 MSPM support"
+ depends on MSPM && DVFM_PXA910 && PM_PXA910
+ default y
+ help
+ Say 'Y' here if you want Marvell Scalable Power Management
+
+config PXA910_DVFM_STATS
+ bool "PXA910 DVFM STATS"
+ depends on MSPM_PXA910
+ default n
+ help
+ Say 'Y' here if you want DVFM STATS
+
+config PXA910_CLOCK_TRACE
+ bool "PXA910 ACTIVE CLOCK TRACE"
+ depends on MSPM_PXA910
+ default n
+ help
+ Say 'Y' here if you want DVFM STATS
+
endmenu
source "net/Kconfig"
View
@@ -20,6 +20,11 @@ GZFLAGS :=-9
#KBUILD_CFLAGS +=-pipe
# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
KBUILD_CFLAGS +=$(call cc-option,-marm,)
+MCOUNT = $(shell echo 'main(){}' | $(CC) -x c -S -o - - -pg | grep mcount | awk '{print $$2}')
+ifeq ("$(MCOUNT)", "__gnu_mcount_nc")
+ KBUILD_CFLAGS +=-DKBUILD_NEW_GNU_MCOUNT
+ KBUILD_AFLAGS +=-DKBUILD_NEW_GNU_MCOUNT
+endif
# Do not use arch/arm/defconfig - it's always outdated.
# Select a platform tht is kept up-to-date
@@ -697,6 +697,23 @@ proc_types:
W(b) __armv4_mmu_cache_off
W(b) __armv5tej_mmu_cache_flush
+#ifdef CONFIG_CPU_MOHAWK_OLD_ID
+ .word 0x41159260 @ ARM926T (Marvell Mohawk)
+ .word 0xfffffff0
+#else
+ .word 0x56158000
+ .word 0xfffff000
+#endif
+ b __armv4_mmu_cache_on
+ b __armv4_mmu_cache_off
+ b __armv5tej_mmu_cache_flush
+
+ .word 0x56056930
+ .word 0xff0ffff0 @ PXA935
+ b __armv4_mmu_cache_on
+ b __armv4_mmu_cache_off
+ b __armv4_mmu_cache_flush
+
.word 0x56050000 @ Feroceon
.word 0xff0f0000
W(b) __armv4_mmu_cache_on
@@ -69,6 +69,7 @@ CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
+CONFIG_ASHMEM=y
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_SLAB=y
# CONFIG_SLUB is not set
@@ -255,6 +256,7 @@ CONFIG_NET=y
CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
CONFIG_INET=y
+CONFIG_ANDROID_PARANOID_NETWORK=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_FIB_HASH=y
Oops, something went wrong.

0 comments on commit 56093d4

Please sign in to comment.